From 2f790ba35a3728f198074aa577c47bb6acd611d1 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 18 Nov 2025 15:41:39 +0100 Subject: [PATCH 001/110] feat(fs): Enhance API for incremental build, add tracking readers/writers Cherry-picked from https://github.com/SAP/ui5-fs/commit/5651627b91109b8059d4c9401c192e6c9d757e60 JIRA: CPOUI5FOUNDATION-1174 --- packages/fs/lib/DuplexTracker.js | 84 ++++++++++++ .../fs/lib/ReaderCollectionPrioritized.js | 2 +- packages/fs/lib/Resource.js | 127 ++++++++++++++---- packages/fs/lib/ResourceFacade.js | 14 ++ packages/fs/lib/Tracker.js | 69 ++++++++++ packages/fs/lib/adapters/AbstractAdapter.js | 54 ++++++-- packages/fs/lib/adapters/FileSystem.js | 28 ++-- packages/fs/lib/adapters/Memory.js | 34 +---- packages/fs/lib/readers/Filter.js | 4 +- packages/fs/lib/readers/Link.js | 44 +++--- packages/fs/lib/resourceFactory.js | 24 +++- 11 files changed, 372 insertions(+), 112 deletions(-) create mode 100644 packages/fs/lib/DuplexTracker.js create mode 100644 packages/fs/lib/Tracker.js diff --git a/packages/fs/lib/DuplexTracker.js b/packages/fs/lib/DuplexTracker.js new file mode 100644 index 00000000000..2ccdb56b1a4 --- /dev/null +++ b/packages/fs/lib/DuplexTracker.js @@ -0,0 +1,84 @@ +import AbstractReaderWriter from "./AbstractReaderWriter.js"; + +// TODO: Alternative name: Inspector/Interceptor/... + +export default class Trace extends AbstractReaderWriter { + #readerWriter; + #sealed = false; + #pathsRead = []; + #patterns = []; + #resourcesRead = Object.create(null); + #resourcesWritten = Object.create(null); + + constructor(readerWriter) { + super(readerWriter.getName()); + this.#readerWriter = readerWriter; + } + + getResults() { + this.#sealed = true; + return { + requests: { + pathsRead: this.#pathsRead, + patterns: this.#patterns, + }, + resourcesRead: this.#resourcesRead, + resourcesWritten: this.#resourcesWritten, + }; + } + + async _byGlob(virPattern, options, trace) { + if (this.#sealed) { + throw new Error(`Unexpected read operation after reader has been sealed`); + } + if (this.#readerWriter.resolvePattern) { + const resolvedPattern = this.#readerWriter.resolvePattern(virPattern); + this.#patterns.push(resolvedPattern); + } else if (virPattern instanceof Array) { + for (const pattern of virPattern) { + this.#patterns.push(pattern); + } + } else { + this.#patterns.push(virPattern); + } + const resources = await this.#readerWriter._byGlob(virPattern, options, trace); + for (const resource of resources) { + if (!resource.getStatInfo()?.isDirectory()) { + this.#resourcesRead[resource.getOriginalPath()] = resource; + } + } + return resources; + } + + async _byPath(virPath, options, trace) { + if (this.#sealed) { + throw new Error(`Unexpected read operation after reader has been sealed`); + } + if (this.#readerWriter.resolvePath) { + const resolvedPath = this.#readerWriter.resolvePath(virPath); + if (resolvedPath) { + this.#pathsRead.push(resolvedPath); + } + } else { + this.#pathsRead.push(virPath); + } + const resource = await this.#readerWriter._byPath(virPath, options, trace); + if (resource) { + if (!resource.getStatInfo()?.isDirectory()) { + this.#resourcesRead[resource.getOriginalPath()] = resource; + } + } + return resource; + } + + async _write(resource, options) { + if (this.#sealed) { + throw new Error(`Unexpected write operation after writer has been sealed`); + } + if (!resource) { + throw new Error(`Cannot write undefined resource`); + } + this.#resourcesWritten[resource.getOriginalPath()] = resource; + return this.#readerWriter.write(resource, options); + } +} diff --git a/packages/fs/lib/ReaderCollectionPrioritized.js b/packages/fs/lib/ReaderCollectionPrioritized.js index 680b71357ca..8f235f22148 100644 --- a/packages/fs/lib/ReaderCollectionPrioritized.js +++ b/packages/fs/lib/ReaderCollectionPrioritized.js @@ -68,7 +68,7 @@ class ReaderCollectionPrioritized extends AbstractReader { * @returns {Promise<@ui5/fs/Resource|null>} * Promise resolving to a single resource or null if no resource is found */ - _byPath(virPath, options, trace) { + async _byPath(virPath, options, trace) { const that = this; const byPath = (i) => { if (i > this._readers.length - 1) { diff --git a/packages/fs/lib/Resource.js b/packages/fs/lib/Resource.js index c43edc2716f..1cefc2ce490 100644 --- a/packages/fs/lib/Resource.js +++ b/packages/fs/lib/Resource.js @@ -1,9 +1,8 @@ import stream from "node:stream"; +import crypto from "node:crypto"; import clone from "clone"; import posixPath from "node:path/posix"; -const fnTrue = () => true; -const fnFalse = () => false; const ALLOWED_SOURCE_METADATA_KEYS = ["adapter", "fsPath", "contentModified"]; /** @@ -100,24 +99,6 @@ class Resource { this.#project = project; - this.#statInfo = statInfo || { // TODO - isFile: fnTrue, - isDirectory: fnFalse, - isBlockDevice: fnFalse, - isCharacterDevice: fnFalse, - isSymbolicLink: fnFalse, - isFIFO: fnFalse, - isSocket: fnFalse, - atimeMs: new Date().getTime(), - mtimeMs: new Date().getTime(), - ctimeMs: new Date().getTime(), - birthtimeMs: new Date().getTime(), - atime: new Date(), - mtime: new Date(), - ctime: new Date(), - birthtime: new Date() - }; - if (createStream) { this.#createStream = createStream; } else if (stream) { @@ -130,6 +111,15 @@ class Resource { this.#setBuffer(Buffer.from(string, "utf8")); } + if (statInfo) { + this.#statInfo = parseStat(statInfo); + } else { + if (createStream || stream) { + throw new Error("Unable to create Resource: Please provide statInfo for stream content"); + } + this.#statInfo = createStat(this.#buffer.byteLength); + } + // Tracing: this.#collections = []; } @@ -164,6 +154,7 @@ class Resource { setBuffer(buffer) { this.#sourceMetadata.contentModified = true; this.#isModified = true; + this.#updateStatInfo(buffer); this.#setBuffer(buffer); } @@ -269,6 +260,21 @@ class Resource { this.#streamDrained = false; } + async getHash() { + if (this.#statInfo.isDirectory()) { + return; + } + const buffer = await this.getBuffer(); + return crypto.createHash("md5").update(buffer).digest("hex"); + } + + #updateStatInfo(buffer) { + const now = new Date(); + this.#statInfo.mtimeMs = now.getTime(); + this.#statInfo.mtime = now; + this.#statInfo.size = buffer.byteLength; + } + /** * Gets the virtual resources path * @@ -279,6 +285,10 @@ class Resource { return this.#path; } + getOriginalPath() { + return this.#path; + } + /** * Sets the virtual resources path * @@ -318,6 +328,10 @@ class Resource { return this.#statInfo; } + getLastModified() { + + } + /** * Size in bytes allocated by the underlying buffer. * @@ -325,12 +339,13 @@ class Resource { * @returns {Promise} size in bytes, 0 if there is no content yet */ async getSize() { - // if resource does not have any content it should have 0 bytes - if (!this.#buffer && !this.#createStream && !this.#stream) { - return 0; - } - const buffer = await this.getBuffer(); - return buffer.byteLength; + return this.#statInfo.size; + // // if resource does not have any content it should have 0 bytes + // if (!this.#buffer && !this.#createStream && !this.#stream) { + // return 0; + // } + // const buffer = await this.getBuffer(); + // return buffer.byteLength; } /** @@ -356,7 +371,7 @@ class Resource { async #getCloneOptions() { const options = { path: this.#path, - statInfo: clone(this.#statInfo), + statInfo: this.#statInfo, // Will be cloned in constructor sourceMetadata: clone(this.#sourceMetadata) }; @@ -495,4 +510,62 @@ class Resource { } } +const fnTrue = function() { + return true; +}; +const fnFalse = function() { + return false; +}; + +/** + * Parses a Node.js stat object to a UI5 Tooling stat object + * + * @param {fs.Stats} statInfo Node.js stat + * @returns {object} UI5 Tooling stat +*/ +function parseStat(statInfo) { + return { + isFile: statInfo.isFile.bind(statInfo), + isDirectory: statInfo.isDirectory.bind(statInfo), + isBlockDevice: statInfo.isBlockDevice.bind(statInfo), + isCharacterDevice: statInfo.isCharacterDevice.bind(statInfo), + isSymbolicLink: statInfo.isSymbolicLink.bind(statInfo), + isFIFO: statInfo.isFIFO.bind(statInfo), + isSocket: statInfo.isSocket.bind(statInfo), + ino: statInfo.ino, + size: statInfo.size, + atimeMs: statInfo.atimeMs, + mtimeMs: statInfo.mtimeMs, + ctimeMs: statInfo.ctimeMs, + birthtimeMs: statInfo.birthtimeMs, + atime: statInfo.atime, + mtime: statInfo.mtime, + ctime: statInfo.ctime, + birthtime: statInfo.birthtime, + }; +} + +function createStat(size) { + const now = new Date(); + return { + isFile: fnTrue, + isDirectory: fnFalse, + isBlockDevice: fnFalse, + isCharacterDevice: fnFalse, + isSymbolicLink: fnFalse, + isFIFO: fnFalse, + isSocket: fnFalse, + ino: 0, + size, + atimeMs: now.getTime(), + mtimeMs: now.getTime(), + ctimeMs: now.getTime(), + birthtimeMs: now.getTime(), + atime: now, + mtime: now, + ctime: now, + birthtime: now, + }; +} + export default Resource; diff --git a/packages/fs/lib/ResourceFacade.js b/packages/fs/lib/ResourceFacade.js index 58ba37b2a4d..9604b56acd1 100644 --- a/packages/fs/lib/ResourceFacade.js +++ b/packages/fs/lib/ResourceFacade.js @@ -45,6 +45,16 @@ class ResourceFacade { return this.#path; } + /** + * Gets the resources path + * + * @public + * @returns {string} (Virtual) path of the resource + */ + getOriginalPath() { + return this.#resource.getPath(); + } + /** * Gets the resource name * @@ -150,6 +160,10 @@ class ResourceFacade { return this.#resource.setStream(stream); } + getHash() { + return this.#resource.getHash(); + } + /** * Gets the resources stat info. * Note that a resources stat information is not updated when the resource is being modified. diff --git a/packages/fs/lib/Tracker.js b/packages/fs/lib/Tracker.js new file mode 100644 index 00000000000..ed19019e364 --- /dev/null +++ b/packages/fs/lib/Tracker.js @@ -0,0 +1,69 @@ +import AbstractReader from "./AbstractReader.js"; + +export default class Trace extends AbstractReader { + #reader; + #sealed = false; + #pathsRead = []; + #patterns = []; + #resourcesRead = Object.create(null); + + constructor(reader) { + super(reader.getName()); + this.#reader = reader; + } + + getResults() { + this.#sealed = true; + return { + requests: { + pathsRead: this.#pathsRead, + patterns: this.#patterns, + }, + resourcesRead: this.#resourcesRead, + }; + } + + async _byGlob(virPattern, options, trace) { + if (this.#sealed) { + throw new Error(`Unexpected read operation after reader has been sealed`); + } + if (this.#reader.resolvePattern) { + const resolvedPattern = this.#reader.resolvePattern(virPattern); + this.#patterns.push(resolvedPattern); + } else if (virPattern instanceof Array) { + for (const pattern of virPattern) { + this.#patterns.push(pattern); + } + } else { + this.#patterns.push(virPattern); + } + const resources = await this.#reader._byGlob(virPattern, options, trace); + for (const resource of resources) { + if (!resource.getStatInfo()?.isDirectory()) { + this.#resourcesRead[resource.getOriginalPath()] = resource; + } + } + return resources; + } + + async _byPath(virPath, options, trace) { + if (this.#sealed) { + throw new Error(`Unexpected read operation after reader has been sealed`); + } + if (this.#reader.resolvePath) { + const resolvedPath = this.#reader.resolvePath(virPath); + if (resolvedPath) { + this.#pathsRead.push(resolvedPath); + } + } else { + this.#pathsRead.push(virPath); + } + const resource = await this.#reader._byPath(virPath, options, trace); + if (resource) { + if (!resource.getStatInfo()?.isDirectory()) { + this.#resourcesRead[resource.getOriginalPath()] = resource; + } + } + return resource; + } +} diff --git a/packages/fs/lib/adapters/AbstractAdapter.js b/packages/fs/lib/adapters/AbstractAdapter.js index 96cf4154250..4d2387de80b 100644 --- a/packages/fs/lib/adapters/AbstractAdapter.js +++ b/packages/fs/lib/adapters/AbstractAdapter.js @@ -17,20 +17,20 @@ import Resource from "../Resource.js"; */ class AbstractAdapter extends AbstractReaderWriter { /** - * The constructor * * @public * @param {object} parameters Parameters + * @param {string} parameters.name * @param {string} parameters.virBasePath * Virtual base path. Must be absolute, POSIX-style, and must end with a slash * @param {string[]} [parameters.excludes] List of glob patterns to exclude * @param {object} [parameters.project] Experimental, internal parameter. Do not use */ - constructor({virBasePath, excludes = [], project}) { + constructor({name, virBasePath, excludes = [], project}) { if (new.target === AbstractAdapter) { throw new TypeError("Class 'AbstractAdapter' is abstract"); } - super(); + super(name); if (!virBasePath) { throw new Error(`Unable to create adapter: Missing parameter 'virBasePath'`); @@ -81,17 +81,7 @@ class AbstractAdapter extends AbstractReaderWriter { if (patterns[i] && idx !== -1 && idx < this._virBaseDir.length) { const subPath = patterns[i]; return [ - this._createResource({ - statInfo: { // TODO: make closer to fs stat info - isDirectory: function() { - return true; - } - }, - source: { - adapter: "Abstract" - }, - path: subPath - }) + this._createDirectoryResource(subPath) ]; } } @@ -201,6 +191,10 @@ class AbstractAdapter extends AbstractReaderWriter { if (this._project) { parameters.project = this._project; } + if (!parameters.source) { + parameters.source = Object.create(null); + } + parameters.source.adapter = this.constructor.name; return new Resource(parameters); } @@ -289,6 +283,38 @@ class AbstractAdapter extends AbstractReaderWriter { const relPath = virPath.substr(this._virBasePath.length); return relPath; } + + _createDirectoryResource(dirPath) { + const now = new Date(); + const fnFalse = function() { + return false; + }; + const fnTrue = function() { + return true; + }; + const statInfo = { + isFile: fnFalse, + isDirectory: fnTrue, + isBlockDevice: fnFalse, + isCharacterDevice: fnFalse, + isSymbolicLink: fnFalse, + isFIFO: fnFalse, + isSocket: fnFalse, + size: 0, + atimeMs: now.getTime(), + mtimeMs: now.getTime(), + ctimeMs: now.getTime(), + birthtimeMs: now.getTime(), + atime: now, + mtime: now, + ctime: now, + birthtime: now, + }; + return this._createResource({ + statInfo: statInfo, + path: dirPath, + }); + } } export default AbstractAdapter; diff --git a/packages/fs/lib/adapters/FileSystem.js b/packages/fs/lib/adapters/FileSystem.js index d086fac40dd..284d95d84a4 100644 --- a/packages/fs/lib/adapters/FileSystem.js +++ b/packages/fs/lib/adapters/FileSystem.js @@ -12,7 +12,7 @@ import {PassThrough} from "node:stream"; import AbstractAdapter from "./AbstractAdapter.js"; const READ_ONLY_MODE = 0o444; -const ADAPTER_NAME = "FileSystem"; + /** * File system resource adapter * @@ -23,9 +23,9 @@ const ADAPTER_NAME = "FileSystem"; */ class FileSystem extends AbstractAdapter { /** - * The Constructor. * * @param {object} parameters Parameters + * @param {string} parameters.name * @param {string} parameters.virBasePath * Virtual base path. Must be absolute, POSIX-style, and must end with a slash * @param {string} parameters.fsBasePath @@ -35,8 +35,8 @@ class FileSystem extends AbstractAdapter { * Whether to apply any excludes defined in an optional .gitignore in the given fsBasePath directory * @param {@ui5/project/specifications/Project} [parameters.project] Project this adapter belongs to (if any) */ - constructor({virBasePath, project, fsBasePath, excludes, useGitignore=false}) { - super({virBasePath, project, excludes}); + constructor({name, virBasePath, project, fsBasePath, excludes, useGitignore=false}) { + super({name, virBasePath, project, excludes}); if (!fsBasePath) { throw new Error(`Unable to create adapter: Missing parameter 'fsBasePath'`); @@ -80,7 +80,7 @@ class FileSystem extends AbstractAdapter { statInfo: stat, path: this._virBaseDir, sourceMetadata: { - adapter: ADAPTER_NAME, + adapter: this.constructor.name, fsPath: this._fsBasePath }, createStream: () => { @@ -124,7 +124,7 @@ class FileSystem extends AbstractAdapter { statInfo: stat, path: virPath, sourceMetadata: { - adapter: ADAPTER_NAME, + adapter: this.constructor.name, fsPath: fsPath }, createStream: () => { @@ -158,16 +158,8 @@ class FileSystem extends AbstractAdapter { // Neither starts with basePath, nor equals baseDirectory if (!options.nodir && this._virBasePath.startsWith(virPath)) { // Create virtual directories for the virtual base path (which has to exist) - // TODO: Maybe improve this by actually matching the base paths segments to the virPath - return this._createResource({ - project: this._project, - statInfo: { // TODO: make closer to fs stat info - isDirectory: function() { - return true; - } - }, - path: virPath - }); + // FUTURE: Maybe improve this by actually matching the base paths segments to the virPath + return this._createDirectoryResource(virPath); } else { return null; } @@ -200,7 +192,7 @@ class FileSystem extends AbstractAdapter { statInfo, path: virPath, sourceMetadata: { - adapter: ADAPTER_NAME, + adapter: this.constructor.name, fsPath } }; @@ -260,7 +252,7 @@ class FileSystem extends AbstractAdapter { await mkdir(dirPath, {recursive: true}); const sourceMetadata = resource.getSourceMetadata(); - if (sourceMetadata && sourceMetadata.adapter === ADAPTER_NAME && sourceMetadata.fsPath) { + if (sourceMetadata && sourceMetadata.adapter === this.constructor.name && sourceMetadata.fsPath) { // Resource has been created by FileSystem adapter. This means it might require special handling /* The following code covers these four conditions: diff --git a/packages/fs/lib/adapters/Memory.js b/packages/fs/lib/adapters/Memory.js index 35be99cf953..7215e2ab189 100644 --- a/packages/fs/lib/adapters/Memory.js +++ b/packages/fs/lib/adapters/Memory.js @@ -3,8 +3,6 @@ const log = getLogger("resources:adapters:Memory"); import micromatch from "micromatch"; import AbstractAdapter from "./AbstractAdapter.js"; -const ADAPTER_NAME = "Memory"; - /** * Virtual resource Adapter * @@ -15,17 +13,17 @@ const ADAPTER_NAME = "Memory"; */ class Memory extends AbstractAdapter { /** - * The constructor. * * @public * @param {object} parameters Parameters + * @param {string} parameters.name * @param {string} parameters.virBasePath * Virtual base path. Must be absolute, POSIX-style, and must end with a slash * @param {string[]} [parameters.excludes] List of glob patterns to exclude * @param {@ui5/project/specifications/Project} [parameters.project] Project this adapter belongs to (if any) */ - constructor({virBasePath, project, excludes}) { - super({virBasePath, project, excludes}); + constructor({name, virBasePath, project, excludes}) { + super({name, virBasePath, project, excludes}); this._virFiles = Object.create(null); // map full of files this._virDirs = Object.create(null); // map full of directories } @@ -72,18 +70,7 @@ class Memory extends AbstractAdapter { async _runGlob(patterns, options = {nodir: true}, trace) { if (patterns[0] === "" && !options.nodir) { // Match virtual root directory return [ - this._createResource({ - project: this._project, - statInfo: { // TODO: make closer to fs stat info - isDirectory: function() { - return true; - } - }, - sourceMetadata: { - adapter: ADAPTER_NAME - }, - path: this._virBasePath.slice(0, -1) - }) + this._createDirectoryResource(this._virBasePath.slice(0, -1)) ]; } @@ -157,18 +144,7 @@ class Memory extends AbstractAdapter { for (let i = pathSegments.length - 1; i >= 0; i--) { const segment = pathSegments[i]; if (!this._virDirs[segment]) { - this._virDirs[segment] = this._createResource({ - project: this._project, - sourceMetadata: { - adapter: ADAPTER_NAME - }, - statInfo: { // TODO: make closer to fs stat info - isDirectory: function() { - return true; - } - }, - path: this._virBasePath + segment - }); + this._virDirs[segment] = this._createDirectoryResource(this._virBasePath + segment); } } } diff --git a/packages/fs/lib/readers/Filter.js b/packages/fs/lib/readers/Filter.js index b95654daa29..1e4cf31e727 100644 --- a/packages/fs/lib/readers/Filter.js +++ b/packages/fs/lib/readers/Filter.js @@ -27,8 +27,8 @@ class Filter extends AbstractReader { * @param {@ui5/fs/readers/Filter~callback} parameters.callback * Filter function. Will be called for every resource read through this reader. */ - constructor({reader, callback}) { - super(); + constructor({name, reader, callback}) { + super(name); if (!reader) { throw new Error(`Missing parameter "reader"`); } diff --git a/packages/fs/lib/readers/Link.js b/packages/fs/lib/readers/Link.js index dd2d40b3ce3..dd6c56dd16d 100644 --- a/packages/fs/lib/readers/Link.js +++ b/packages/fs/lib/readers/Link.js @@ -44,8 +44,8 @@ class Link extends AbstractReader { * @param {@ui5/fs/AbstractReader} parameters.reader The resource reader or collection to wrap * @param {@ui5/fs/readers/Link/PathMapping} parameters.pathMapping */ - constructor({reader, pathMapping}) { - super(); + constructor({name, reader, pathMapping}) { + super(name); if (!reader) { throw new Error(`Missing parameter "reader"`); } @@ -57,17 +57,7 @@ class Link extends AbstractReader { Link._validatePathMapping(pathMapping); } - /** - * Locates resources by glob. - * - * @private - * @param {string|string[]} patterns glob pattern as string or an array of - * glob patterns for virtual directory structure - * @param {object} options glob options - * @param {@ui5/fs/tracing/Trace} trace Trace instance - * @returns {Promise<@ui5/fs/Resource[]>} Promise resolving to list of resources - */ - async _byGlob(patterns, options, trace) { + resolvePattern(patterns) { if (!(patterns instanceof Array)) { patterns = [patterns]; } @@ -79,7 +69,29 @@ class Link extends AbstractReader { }); // Flatten prefixed patterns - patterns = Array.prototype.concat.apply([], patterns); + return Array.prototype.concat.apply([], patterns); + } + + resolvePath(virPath) { + if (!virPath.startsWith(this._pathMapping.linkPath)) { + return null; + } + const targetPath = this._pathMapping.targetPath + virPath.substr(this._pathMapping.linkPath.length); + return targetPath; + } + + /** + * Locates resources by glob. + * + * @private + * @param {string|string[]} patterns glob pattern as string or an array of + * glob patterns for virtual directory structure + * @param {object} options glob options + * @param {@ui5/fs/tracing/Trace} trace Trace instance + * @returns {Promise<@ui5/fs/Resource[]>} Promise resolving to list of resources + */ + async _byGlob(patterns, options, trace) { + patterns = this.resolvePattern(patterns); // Keep resource's internal path unchanged for now const resources = await this._reader._byGlob(patterns, options, trace); @@ -104,10 +116,10 @@ class Link extends AbstractReader { * @returns {Promise<@ui5/fs/Resource>} Promise resolving to a single resource */ async _byPath(virPath, options, trace) { - if (!virPath.startsWith(this._pathMapping.linkPath)) { + const targetPath = this.resolvePath(virPath); + if (!targetPath) { return null; } - const targetPath = this._pathMapping.targetPath + virPath.substr(this._pathMapping.linkPath.length); log.silly(`byPath: Rewriting virtual path ${virPath} to ${targetPath}`); const resource = await this._reader._byPath(targetPath, options, trace); diff --git a/packages/fs/lib/resourceFactory.js b/packages/fs/lib/resourceFactory.js index da1b4063a2e..88050085bb1 100644 --- a/packages/fs/lib/resourceFactory.js +++ b/packages/fs/lib/resourceFactory.js @@ -9,6 +9,8 @@ import Resource from "./Resource.js"; import WriterCollection from "./WriterCollection.js"; import Filter from "./readers/Filter.js"; import Link from "./readers/Link.js"; +import Tracker from "./Tracker.js"; +import DuplexTracker from "./DuplexTracker.js"; import {getLogger} from "@ui5/logger"; const log = getLogger("resources:resourceFactory"); @@ -26,6 +28,7 @@ const log = getLogger("resources:resourceFactory"); * * @public * @param {object} parameters Parameters + * @param {string} parameters.name * @param {string} parameters.virBasePath Virtual base path. Must be absolute, POSIX-style, and must end with a slash * @param {string} [parameters.fsBasePath] * File System base path. @@ -38,11 +41,11 @@ const log = getLogger("resources:resourceFactory"); * @param {@ui5/project/specifications/Project} [parameters.project] Project this adapter belongs to (if any) * @returns {@ui5/fs/adapters/FileSystem|@ui5/fs/adapters/Memory} File System- or Virtual Adapter */ -export function createAdapter({fsBasePath, virBasePath, project, excludes, useGitignore}) { +export function createAdapter({name, fsBasePath, virBasePath, project, excludes, useGitignore}) { if (fsBasePath) { - return new FsAdapter({fsBasePath, virBasePath, project, excludes, useGitignore}); + return new FsAdapter({name, fsBasePath, virBasePath, project, excludes, useGitignore}); } else { - return new MemAdapter({virBasePath, project, excludes}); + return new MemAdapter({name, virBasePath, project, excludes}); } } @@ -178,15 +181,17 @@ export function createResource(parameters) { export function createWorkspace({reader, writer, virBasePath = "/", name = "workspace"}) { if (!writer) { writer = new MemAdapter({ + name: `Workspace writer for ${name}`, virBasePath }); } - return new DuplexCollection({ + const d = new DuplexCollection({ reader, writer, name }); + return d; } /** @@ -242,12 +247,14 @@ export function createLinkReader(parameters) { * * @public * @param {object} parameters + * @param {string} parameters.name * @param {@ui5/fs/AbstractReader} parameters.reader Single reader or collection of readers * @param {string} parameters.namespace Project namespace * @returns {@ui5/fs/readers/Link} Reader instance */ -export function createFlatReader({reader, namespace}) { +export function createFlatReader({name, reader, namespace}) { return new Link({ + name, reader: reader, pathMapping: { linkPath: `/`, @@ -256,6 +263,13 @@ export function createFlatReader({reader, namespace}) { }); } +export function createTracker(readerWriter) { + if (readerWriter instanceof DuplexCollection) { + return new DuplexTracker(readerWriter); + } + return new Tracker(readerWriter); +} + /** * Normalizes virtual glob patterns by prefixing them with * a given virtual base directory path From dc037e8acc12509e7ef8ae7e4de7b6233f19ee89 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 18 Nov 2025 15:43:27 +0100 Subject: [PATCH 002/110] feat(server): Use incremental build in server Cherry-picked from: https://github.com/SAP/ui5-fs/commit/5651627b91109b8059d4c9401c192e6c9d757e60 JIRA: CPOUI5FOUNDATION-1174 --- .../lib/middleware/MiddlewareManager.js | 2 +- packages/server/lib/server.js | 71 +++++++++++++------ 2 files changed, 49 insertions(+), 24 deletions(-) diff --git a/packages/server/lib/middleware/MiddlewareManager.js b/packages/server/lib/middleware/MiddlewareManager.js index 36894892e4d..a06a2475300 100644 --- a/packages/server/lib/middleware/MiddlewareManager.js +++ b/packages/server/lib/middleware/MiddlewareManager.js @@ -218,7 +218,7 @@ class MiddlewareManager { }); await this.addMiddleware("serveResources"); await this.addMiddleware("testRunner"); - await this.addMiddleware("serveThemes"); + // await this.addMiddleware("serveThemes"); await this.addMiddleware("versionInfo", { mountPath: "/resources/sap-ui-version.json" }); diff --git a/packages/server/lib/server.js b/packages/server/lib/server.js index 3b108a551d7..ea9c544019d 100644 --- a/packages/server/lib/server.js +++ b/packages/server/lib/server.js @@ -1,7 +1,8 @@ import express from "express"; import portscanner from "portscanner"; +import path from "node:path/posix"; import MiddlewareManager from "./middleware/MiddlewareManager.js"; -import {createReaderCollection} from "@ui5/fs/resourceFactory"; +import {createAdapter, createReaderCollection} from "@ui5/fs/resourceFactory"; import ReaderCollectionPrioritized from "@ui5/fs/ReaderCollectionPrioritized"; import {getLogger} from "@ui5/logger"; @@ -136,34 +137,58 @@ export async function serve(graph, { port: requestedPort, changePortIfInUse = false, h2 = false, key, cert, acceptRemoteConnections = false, sendSAPTargetCSP = false, simpleIndex = false, serveCSPReports = false }) { - const rootProject = graph.getRoot(); + // const rootReader = createAdapter({ + // virBasePath: "/", + // }); + // const dependencies = createAdapter({ + // virBasePath: "/", + // }); - const readers = []; - await graph.traverseBreadthFirst(async function({project: dep}) { - if (dep.getName() === rootProject.getName()) { - // Ignore root project - return; - } - readers.push(dep.getReader({style: "runtime"})); + const rootProject = graph.getRoot(); + const watchHandler = await graph.build({ + cacheDir: path.join(rootProject.getRootPath(), ".ui5-cache"), + includedDependencies: ["*"], + watch: true, }); - const dependencies = createReaderCollection({ - name: `Dependency reader collection for project ${rootProject.getName()}`, - readers - }); + async function createReaders() { + const readers = []; + await graph.traverseBreadthFirst(async function({project: dep}) { + if (dep.getName() === rootProject.getName()) { + // Ignore root project + return; + } + readers.push(dep.getReader({style: "runtime"})); + }); - const rootReader = rootProject.getReader({style: "runtime"}); + const dependencies = createReaderCollection({ + name: `Dependency reader collection for project ${rootProject.getName()}`, + readers + }); + + const rootReader = rootProject.getReader({style: "runtime"}); + // TODO change to ReaderCollection once duplicates are sorted out + const combo = new ReaderCollectionPrioritized({ + name: "server - prioritize workspace over dependencies", + readers: [rootReader, dependencies] + }); + const resources = { + rootProject: rootReader, + dependencies: dependencies, + all: combo + }; + return resources; + } + + const resources = await createReaders(); - // TODO change to ReaderCollection once duplicates are sorted out - const combo = new ReaderCollectionPrioritized({ - name: "server - prioritize workspace over dependencies", - readers: [rootReader, dependencies] + watchHandler.on("buildUpdated", async () => { + const newResources = await createReaders(); + // Patch resources + resources.rootProject = newResources.rootProject; + resources.dependencies = newResources.dependencies; + resources.all = newResources.all; }); - const resources = { - rootProject: rootReader, - dependencies: dependencies, - all: combo - }; const middlewareManager = new MiddlewareManager({ graph, From 6f56f13d0b38456a730db60cc2cf89d98e64d81c Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 18 Nov 2025 15:46:24 +0100 Subject: [PATCH 003/110] feat(builder): Adapt tasks for incremental build Cherry-picked from: https://github.com/SAP/ui5-builder/commit/ef5a3b2f6ca0339a8ff8c30997e884e462fa6ab9 JIRA: CPOUI5FOUNDATION-1174 --- .../builder/lib/processors/nonAsciiEscaper.js | 2 +- .../builder/lib/processors/stringReplacer.js | 3 +- .../lib/tasks/escapeNonAsciiCharacters.js | 11 ++++-- packages/builder/lib/tasks/minify.js | 14 +++++-- .../builder/lib/tasks/replaceBuildtime.js | 36 +++++++++--------- .../builder/lib/tasks/replaceCopyright.js | 37 ++++++++++--------- packages/builder/lib/tasks/replaceVersion.js | 35 ++++++++++-------- 7 files changed, 80 insertions(+), 58 deletions(-) diff --git a/packages/builder/lib/processors/nonAsciiEscaper.js b/packages/builder/lib/processors/nonAsciiEscaper.js index 4548967db5d..88261ddac47 100644 --- a/packages/builder/lib/processors/nonAsciiEscaper.js +++ b/packages/builder/lib/processors/nonAsciiEscaper.js @@ -83,8 +83,8 @@ async function nonAsciiEscaper({resources, options: {encoding}}) { // only modify the resource's string if it was changed if (escaped.modified) { resource.setString(escaped.string); + return resource; } - return resource; } return Promise.all(resources.map(processResource)); diff --git a/packages/builder/lib/processors/stringReplacer.js b/packages/builder/lib/processors/stringReplacer.js index 2485032cc76..5002d426239 100644 --- a/packages/builder/lib/processors/stringReplacer.js +++ b/packages/builder/lib/processors/stringReplacer.js @@ -23,7 +23,8 @@ export default function({resources, options: {pattern, replacement}}) { const newContent = content.replaceAll(pattern, replacement); if (content !== newContent) { resource.setString(newContent); + return resource; } - return resource; + // return resource; })); } diff --git a/packages/builder/lib/tasks/escapeNonAsciiCharacters.js b/packages/builder/lib/tasks/escapeNonAsciiCharacters.js index 53cb3e8d9f3..73943c04a34 100644 --- a/packages/builder/lib/tasks/escapeNonAsciiCharacters.js +++ b/packages/builder/lib/tasks/escapeNonAsciiCharacters.js @@ -19,12 +19,17 @@ import nonAsciiEscaper from "../processors/nonAsciiEscaper.js"; * @param {string} parameters.options.encoding source file encoding either "UTF-8" or "ISO-8859-1" * @returns {Promise} Promise resolving with undefined once data has been written */ -export default async function({workspace, options: {pattern, encoding}}) { +export default async function({workspace, invalidatedResources, options: {pattern, encoding}}) { if (!encoding) { throw new Error("[escapeNonAsciiCharacters] Mandatory option 'encoding' not provided"); } - const allResources = await workspace.byGlob(pattern); + let allResources; + if (invalidatedResources) { + allResources = await Promise.all(invalidatedResources.map((resource) => workspace.byPath(resource))); + } else { + allResources = await workspace.byGlob(pattern); + } const processedResources = await nonAsciiEscaper({ resources: allResources, @@ -33,5 +38,5 @@ export default async function({workspace, options: {pattern, encoding}}) { } }); - await Promise.all(processedResources.map((resource) => workspace.write(resource))); + await Promise.all(processedResources.map((resource) => resource && workspace.write(resource))); } diff --git a/packages/builder/lib/tasks/minify.js b/packages/builder/lib/tasks/minify.js index 2969ca688dc..f79c3391cd6 100644 --- a/packages/builder/lib/tasks/minify.js +++ b/packages/builder/lib/tasks/minify.js @@ -26,9 +26,17 @@ import fsInterface from "@ui5/fs/fsInterface"; * @returns {Promise} Promise resolving with undefined once data has been written */ export default async function({ - workspace, taskUtil, options: {pattern, omitSourceMapResources = false, useInputSourceMaps = true - }}) { - const resources = await workspace.byGlob(pattern); + workspace, taskUtil, buildCache, + options: {pattern, omitSourceMapResources = false, useInputSourceMaps = true} +}) { + let resources = await workspace.byGlob(pattern); + if (buildCache.hasCache()) { + const changedPaths = buildCache.getChangedProjectResourcePaths(); + resources = resources.filter((resource) => changedPaths.has(resource.getPath())); + } + if (resources.length === 0) { + return; + } const processedResources = await minifier({ resources, fs: fsInterface(workspace), diff --git a/packages/builder/lib/tasks/replaceBuildtime.js b/packages/builder/lib/tasks/replaceBuildtime.js index f4093c0b732..2a3ff1caf22 100644 --- a/packages/builder/lib/tasks/replaceBuildtime.js +++ b/packages/builder/lib/tasks/replaceBuildtime.js @@ -32,22 +32,24 @@ function getTimestamp() { * @param {string} parameters.options.pattern Pattern to locate the files to be processed * @returns {Promise} Promise resolving with undefined once data has been written */ -export default function({workspace, options: {pattern}}) { - const timestamp = getTimestamp(); +export default async function({workspace, buildCache, options: {pattern}}) { + let resources = await workspace.byGlob(pattern); - return workspace.byGlob(pattern) - .then((processedResources) => { - return stringReplacer({ - resources: processedResources, - options: { - pattern: "${buildtime}", - replacement: timestamp - } - }); - }) - .then((processedResources) => { - return Promise.all(processedResources.map((resource) => { - return workspace.write(resource); - })); - }); + if (buildCache.hasCache()) { + const changedPaths = buildCache.getChangedProjectResourcePaths(); + resources = resources.filter((resource) => changedPaths.has(resource.getPath())); + } + const timestamp = getTimestamp(); + const processedResources = await stringReplacer({ + resources, + options: { + pattern: "${buildtime}", + replacement: timestamp + } + }); + return Promise.all(processedResources.map((resource) => { + if (resource) { + return workspace.write(resource); + } + })); } diff --git a/packages/builder/lib/tasks/replaceCopyright.js b/packages/builder/lib/tasks/replaceCopyright.js index 2ccb6a596df..09cd302d9f0 100644 --- a/packages/builder/lib/tasks/replaceCopyright.js +++ b/packages/builder/lib/tasks/replaceCopyright.js @@ -29,27 +29,30 @@ import stringReplacer from "../processors/stringReplacer.js"; * @param {string} parameters.options.pattern Pattern to locate the files to be processed * @returns {Promise} Promise resolving with undefined once data has been written */ -export default function({workspace, options: {copyright, pattern}}) { +export default async function({workspace, buildCache, options: {copyright, pattern}}) { if (!copyright) { - return Promise.resolve(); + return; } // Replace optional placeholder ${currentYear} with the current year copyright = copyright.replace(/(?:\$\{currentYear\})/, new Date().getFullYear()); - return workspace.byGlob(pattern) - .then((processedResources) => { - return stringReplacer({ - resources: processedResources, - options: { - pattern: /(?:\$\{copyright\}|@copyright@)/g, - replacement: copyright - } - }); - }) - .then((processedResources) => { - return Promise.all(processedResources.map((resource) => { - return workspace.write(resource); - })); - }); + let resources = await workspace.byGlob(pattern); + if (buildCache.hasCache()) { + const changedPaths = buildCache.getChangedProjectResourcePaths(); + resources = resources.filter((resource) => changedPaths.has(resource.getPath())); + } + + const processedResources = await stringReplacer({ + resources, + options: { + pattern: /(?:\$\{copyright\}|@copyright@)/g, + replacement: copyright + } + }); + return Promise.all(processedResources.map((resource) => { + if (resource) { + return workspace.write(resource); + } + })); } diff --git a/packages/builder/lib/tasks/replaceVersion.js b/packages/builder/lib/tasks/replaceVersion.js index 699a6221a95..7d1a56ffed1 100644 --- a/packages/builder/lib/tasks/replaceVersion.js +++ b/packages/builder/lib/tasks/replaceVersion.js @@ -19,20 +19,23 @@ import stringReplacer from "../processors/stringReplacer.js"; * @param {string} parameters.options.version Replacement version * @returns {Promise} Promise resolving with undefined once data has been written */ -export default function({workspace, options: {pattern, version}}) { - return workspace.byGlob(pattern) - .then((allResources) => { - return stringReplacer({ - resources: allResources, - options: { - pattern: /\$\{(?:project\.)?version\}/g, - replacement: version - } - }); - }) - .then((processedResources) => { - return Promise.all(processedResources.map((resource) => { - return workspace.write(resource); - })); - }); +export default async function({workspace, buildCache, options: {pattern, version}}) { + let resources = await workspace.byGlob(pattern); + + if (buildCache.hasCache()) { + const changedPaths = buildCache.getChangedProjectResourcePaths(); + resources = resources.filter((resource) => changedPaths.has(resource.getPath())); + } + const processedResources = await stringReplacer({ + resources, + options: { + pattern: /\$\{(?:project\.)?version\}/g, + replacement: version + } + }); + await Promise.all(processedResources.map((resource) => { + if (resource) { + return workspace.write(resource); + } + })); } From fa3442e8c61209ca41411e708c7253b4718567f0 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 18 Nov 2025 15:55:28 +0100 Subject: [PATCH 004/110] refactor(project): Align getReader API internals with ComponentProjects Cherry-picked from: https://github.com/SAP/ui5-project/commit/82b20eea1fc5cec4026f8d077cc194408e34d9e7 JIRA: CPOUI5FOUNDATION-1174 --- .../lib/specifications/types/Module.js | 41 +++++++++------- .../lib/specifications/types/ThemeLibrary.js | 48 +++++++++++-------- 2 files changed, 50 insertions(+), 39 deletions(-) diff --git a/packages/project/lib/specifications/types/Module.js b/packages/project/lib/specifications/types/Module.js index 69c5987c9d8..a0741f27491 100644 --- a/packages/project/lib/specifications/types/Module.js +++ b/packages/project/lib/specifications/types/Module.js @@ -69,25 +69,10 @@ class Module extends Project { // Apply builder excludes to all styles but "runtime" const excludes = style === "runtime" ? [] : this.getBuilderResourcesExcludes(); - const readers = this._paths.map(({name, virBasePath, fsBasePath}) => { - return resourceFactory.createReader({ - name, - virBasePath, - fsBasePath, - project: this, - excludes - }); - }); - if (readers.length === 1) { - return readers[0]; - } - const readerCollection = resourceFactory.createReaderCollection({ - name: `Reader collection for module project ${this.getName()}`, - readers - }); + const reader = this._getReader(excludes); return resourceFactory.createReaderCollectionPrioritized({ name: `Reader/Writer collection for project ${this.getName()}`, - readers: [this._getWriter(), readerCollection] + readers: [this._getWriter(), reader] }); } @@ -98,7 +83,8 @@ class Module extends Project { * @returns {@ui5/fs/ReaderCollection} A reader collection instance */ getWorkspace() { - const reader = this.getReader(); + const excludes = this.getBuilderResourcesExcludes(); + const reader = this._getReader(excludes); const writer = this._getWriter(); return resourceFactory.createWorkspace({ @@ -107,6 +93,25 @@ class Module extends Project { }); } + _getReader(excludes) { + const readers = this._paths.map(({name, virBasePath, fsBasePath}) => { + return resourceFactory.createReader({ + name, + virBasePath, + fsBasePath, + project: this, + excludes + }); + }); + if (readers.length === 1) { + return readers[0]; + } + return resourceFactory.createReaderCollection({ + name: `Reader collection for module project ${this.getName()}`, + readers + }); + } + _getWriter() { if (!this._writer) { this._writer = resourceFactory.createAdapter({ diff --git a/packages/project/lib/specifications/types/ThemeLibrary.js b/packages/project/lib/specifications/types/ThemeLibrary.js index 398e570cdfb..51bf5a3ab4a 100644 --- a/packages/project/lib/specifications/types/ThemeLibrary.js +++ b/packages/project/lib/specifications/types/ThemeLibrary.js @@ -76,26 +76,7 @@ class ThemeLibrary extends Project { // Apply builder excludes to all styles but "runtime" const excludes = style === "runtime" ? [] : this.getBuilderResourcesExcludes(); - let reader = resourceFactory.createReader({ - fsBasePath: this.getSourcePath(), - virBasePath: "/resources/", - name: `Runtime resources reader for theme-library project ${this.getName()}`, - project: this, - excludes - }); - if (this._testPathExists) { - const testReader = resourceFactory.createReader({ - fsBasePath: fsPath.join(this.getRootPath(), this._testPath), - virBasePath: "/test-resources/", - name: `Runtime test-resources reader for theme-library project ${this.getName()}`, - project: this, - excludes - }); - reader = resourceFactory.createReaderCollection({ - name: `Reader collection for theme-library project ${this.getName()}`, - readers: [reader, testReader] - }); - } + const reader = this._getReader(excludes); const writer = this._getWriter(); return resourceFactory.createReaderCollectionPrioritized({ @@ -115,7 +96,8 @@ class ThemeLibrary extends Project { * @returns {@ui5/fs/DuplexCollection} DuplexCollection */ getWorkspace() { - const reader = this.getReader(); + const excludes = this.getBuilderResourcesExcludes(); + const reader = this._getReader(excludes); const writer = this._getWriter(); return resourceFactory.createWorkspace({ @@ -124,6 +106,30 @@ class ThemeLibrary extends Project { }); } + _getReader(excludes) { + let reader = resourceFactory.createReader({ + fsBasePath: this.getSourcePath(), + virBasePath: "/resources/", + name: `Runtime resources reader for theme-library project ${this.getName()}`, + project: this, + excludes + }); + if (this._testPathExists) { + const testReader = resourceFactory.createReader({ + fsBasePath: fsPath.join(this.getRootPath(), this._testPath), + virBasePath: "/test-resources/", + name: `Runtime test-resources reader for theme-library project ${this.getName()}`, + project: this, + excludes + }); + reader = resourceFactory.createReaderCollection({ + name: `Reader collection for theme-library project ${this.getName()}`, + readers: [reader, testReader] + }); + } + return reader; + } + _getWriter() { if (!this._writer) { this._writer = resourceFactory.createAdapter({ From f67c0b87f635f1e629604344db2ce788675a2537 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 18 Nov 2025 15:56:27 +0100 Subject: [PATCH 005/110] refactor(project): Refactor specification-internal workspace handling Prerequisite for versioning support Cherry-picked from: https://github.com/SAP/ui5-project/commit/83b5c4f12dc545357e36366846ad1f6fe94a70e3 JIRA: CPOUI5FOUNDATION-1174 --- .../lib/specifications/ComponentProject.js | 132 +++++++----------- .../project/lib/specifications/Project.js | 89 ++++++++++-- .../lib/specifications/types/Module.js | 72 +++------- .../lib/specifications/types/ThemeLibrary.js | 83 +++-------- 4 files changed, 166 insertions(+), 210 deletions(-) diff --git a/packages/project/lib/specifications/ComponentProject.js b/packages/project/lib/specifications/ComponentProject.js index 337b3652e29..e40f8a9228b 100644 --- a/packages/project/lib/specifications/ComponentProject.js +++ b/packages/project/lib/specifications/ComponentProject.js @@ -91,39 +91,7 @@ class ComponentProject extends Project { /* === Resource Access === */ - /** - * Get a [ReaderCollection]{@link @ui5/fs/ReaderCollection} for accessing all resources of the - * project in the specified "style": - * - *
    - *
  • buildtime: Resource paths are always prefixed with /resources/ - * or /test-resources/ followed by the project's namespace. - * Any configured build-excludes are applied
    • - *
  • dist: Resource paths always match with what the UI5 runtime expects. - * This means that paths generally depend on the project type. Applications for example use a "flat"-like - * structure, while libraries use a "buildtime"-like structure. - * Any configured build-excludes are applied
    • - *
  • runtime: Resource paths always match with what the UI5 runtime expects. - * This means that paths generally depend on the project type. Applications for example use a "flat"-like - * structure, while libraries use a "buildtime"-like structure. - * This style is typically used for serving resources directly. Therefore, build-excludes are not applied
    • - *
  • flat: Resource paths are never prefixed and namespaces are omitted if possible. Note that - * project types like "theme-library", which can have multiple namespaces, can't omit them. - * Any configured build-excludes are applied
    • - *
- * - * If project resources have been changed through the means of a workspace, those changes - * are reflected in the provided reader too. - * - * Resource readers always use POSIX-style paths. - * - * @public - * @param {object} [options] - * @param {string} [options.style=buildtime] Path style to access resources. - * Can be "buildtime", "dist", "runtime" or "flat" - * @returns {@ui5/fs/ReaderCollection} A reader collection instance - */ - getReader({style = "buildtime"} = {}) { + _getStyledReader(style) { // TODO: Additional style 'ABAP' using "sap.platform.abap".uri from manifest.json? // Apply builder excludes to all styles but "runtime" @@ -161,7 +129,7 @@ class ComponentProject extends Project { throw new Error(`Unknown path mapping style ${style}`); } - reader = this._addWriter(reader, style); + // reader = this._addWriter(reader, style, writer); return reader; } @@ -183,52 +151,49 @@ class ComponentProject extends Project { throw new Error(`_getTestReader must be implemented by subclass ${this.constructor.name}`); } - /** - * Get a resource reader/writer for accessing and modifying a project's resources - * - * @public - * @returns {@ui5/fs/ReaderCollection} A reader collection instance - */ - getWorkspace() { - // Workspace is always of style "buildtime" - // Therefore builder resource-excludes are always to be applied - const excludes = this.getBuilderResourcesExcludes(); - return resourceFactory.createWorkspace({ - name: `Workspace for project ${this.getName()}`, - reader: this._getReader(excludes), - writer: this._getWriter().collection - }); - } + // /** + // * Get a resource reader/writer for accessing and modifying a project's resources + // * + // * @public + // * @returns {@ui5/fs/ReaderCollection} A reader collection instance + // */ + // getWorkspace() { + // // Workspace is always of style "buildtime" + // // Therefore builder resource-excludes are always to be applied + // const excludes = this.getBuilderResourcesExcludes(); + // return resourceFactory.createWorkspace({ + // name: `Workspace for project ${this.getName()}`, + // reader: this._getPlainReader(excludes), + // writer: this._getWriter().collection + // }); + // } _getWriter() { - if (!this._writers) { - // writer is always of style "buildtime" - const namespaceWriter = resourceFactory.createAdapter({ - virBasePath: "/", - project: this - }); + // writer is always of style "buildtime" + const namespaceWriter = resourceFactory.createAdapter({ + virBasePath: "/", + project: this + }); - const generalWriter = resourceFactory.createAdapter({ - virBasePath: "/", - project: this - }); + const generalWriter = resourceFactory.createAdapter({ + virBasePath: "/", + project: this + }); - const collection = resourceFactory.createWriterCollection({ - name: `Writers for project ${this.getName()}`, - writerMapping: { - [`/resources/${this._namespace}/`]: namespaceWriter, - [`/test-resources/${this._namespace}/`]: namespaceWriter, - [`/`]: generalWriter - } - }); + const collection = resourceFactory.createWriterCollection({ + name: `Writers for project ${this.getName()}`, + writerMapping: { + [`/resources/${this._namespace}/`]: namespaceWriter, + [`/test-resources/${this._namespace}/`]: namespaceWriter, + [`/`]: generalWriter + } + }); - this._writers = { - namespaceWriter, - generalWriter, - collection - }; - } - return this._writers; + return { + namespaceWriter, + generalWriter, + collection + }; } _getReader(excludes) { @@ -243,15 +208,15 @@ class ComponentProject extends Project { return reader; } - _addWriter(reader, style) { - const {namespaceWriter, generalWriter} = this._getWriter(); + _addReadersFromWriter(style, readers, writer) { + const {namespaceWriter, generalWriter} = writer; if ((style === "runtime" || style === "dist") && this._isRuntimeNamespaced) { // If the project's type requires a namespace at runtime, the // dist- and runtime-style paths are identical to buildtime-style paths style = "buildtime"; } - const readers = []; + switch (style) { case "buildtime": // Writer already uses buildtime style @@ -279,12 +244,13 @@ class ComponentProject extends Project { default: throw new Error(`Unknown path mapping style ${style}`); } - readers.push(reader); + // return readers; + // readers.push(reader); - return resourceFactory.createReaderCollectionPrioritized({ - name: `Reader/Writer collection for project ${this.getName()}`, - readers - }); + // return resourceFactory.createReaderCollectionPrioritized({ + // name: `Reader/Writer collection for project ${this.getName()}`, + // readers + // }); } /* === Internals === */ diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index 98cbf29da1d..9c7c7e00f6a 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -1,5 +1,6 @@ import Specification from "./Specification.js"; import ResourceTagCollection from "@ui5/fs/internal/ResourceTagCollection"; +import {createWorkspace, createReaderCollectionPrioritized} from "@ui5/fs/resourceFactory"; /** * Project @@ -12,6 +13,12 @@ import ResourceTagCollection from "@ui5/fs/internal/ResourceTagCollection"; * @hideconstructor */ class Project extends Specification { + #latestWriter; + #latestWorkspace; + #latestReader = new Map(); + #writerVersions = []; + #workspaceSealed = false; + constructor(parameters) { super(parameters); if (new.target === Project) { @@ -220,6 +227,7 @@ class Project extends Specification { } /* === Resource Access === */ + /** * Get a [ReaderCollection]{@link @ui5/fs/ReaderCollection} for accessing all resources of the * project in the specified "style": @@ -241,38 +249,93 @@ class Project extends Specification { * Any configured build-excludes are applied * * + * If project resources have been changed through the means of a workspace, those changes + * are reflected in the provided reader too. + * * Resource readers always use POSIX-style paths. * * @public * @param {object} [options] * @param {string} [options.style=buildtime] Path style to access resources. * Can be "buildtime", "dist", "runtime" or "flat" - * @returns {@ui5/fs/ReaderCollection} Reader collection allowing access to all resources of the project + * @returns {@ui5/fs/ReaderCollection} A reader collection instance */ - getReader(options) { - throw new Error(`getReader must be implemented by subclass ${this.constructor.name}`); + getReader({style = "buildtime"} = {}) { + let reader = this.#latestReader.get(style); + if (reader) { + return reader; + } + const readers = []; + this._addReadersFromWriter(style, readers, this.getWriter()); + readers.push(this._getStyledReader(style)); + reader = createReaderCollectionPrioritized({ + name: `Reader collection for project ${this.getName()}`, + readers + }); + this.#latestReader.set(style, reader); + return reader; } - getResourceTagCollection() { - if (!this._resourceTagCollection) { - this._resourceTagCollection = new ResourceTagCollection({ - allowedTags: ["ui5:IsDebugVariant", "ui5:HasDebugVariant"], - allowedNamespaces: ["project"], - tags: this.getBuildManifest()?.tags - }); - } - return this._resourceTagCollection; + getWriter() { + return this.#latestWriter || this.createNewWriterVersion(); + } + + createNewWriterVersion() { + const writer = this._getWriter(); + this.#writerVersions.push(writer); + this.#latestWriter = writer; + + // Invalidate dependents + this.#latestWorkspace = null; + this.#latestReader = new Map(); + + return writer; } /** * Get a [DuplexCollection]{@link @ui5/fs/DuplexCollection} for accessing and modifying a * project's resources. This is always of style buildtime. * + * Once a project has finished building, this method will throw to prevent further modifications + * since those would have no effect. Use the getReader method to access the project's (modified) resources + * * @public * @returns {@ui5/fs/DuplexCollection} DuplexCollection */ getWorkspace() { - throw new Error(`getWorkspace must be implemented by subclass ${this.constructor.name}`); + if (this.#workspaceSealed) { + throw new Error( + `Workspace of project ${this.getName()} has been sealed. Use method #getReader for read-only access`); + } + if (this.#latestWorkspace) { + return this.#latestWorkspace; + } + const excludes = this.getBuilderResourcesExcludes(); // TODO: Do not apply in server context + const writer = this.getWriter(); + this.#latestWorkspace = createWorkspace({ + reader: this._getReader(excludes), + writer: writer.collection || writer + }); + return this.#latestWorkspace; + } + + sealWorkspace() { + this.#workspaceSealed = true; + } + + _addReadersFromWriter(style, readers, writer) { + readers.push(writer); + } + + getResourceTagCollection() { + if (!this._resourceTagCollection) { + this._resourceTagCollection = new ResourceTagCollection({ + allowedTags: ["ui5:IsDebugVariant", "ui5:HasDebugVariant"], + allowedNamespaces: ["project"], + tags: this.getBuildManifest()?.tags + }); + } + return this._resourceTagCollection; } /* === Internals === */ diff --git a/packages/project/lib/specifications/types/Module.js b/packages/project/lib/specifications/types/Module.js index a0741f27491..a59c464f94a 100644 --- a/packages/project/lib/specifications/types/Module.js +++ b/packages/project/lib/specifications/types/Module.js @@ -33,65 +33,29 @@ class Module extends Project { /* === Resource Access === */ - /** - * Get a [ReaderCollection]{@link @ui5/fs/ReaderCollection} for accessing all resources of the - * project in the specified "style": - * - *
    - *
  • buildtime: Resource paths are always prefixed with /resources/ - * or /test-resources/ followed by the project's namespace. - * Any configured build-excludes are applied
    • - *
  • dist: Resource paths always match with what the UI5 runtime expects. - * This means that paths generally depend on the project type. Applications for example use a "flat"-like - * structure, while libraries use a "buildtime"-like structure. - * Any configured build-excludes are applied
    • - *
  • runtime: Resource paths always match with what the UI5 runtime expects. - * This means that paths generally depend on the project type. Applications for example use a "flat"-like - * structure, while libraries use a "buildtime"-like structure. - * This style is typically used for serving resources directly. Therefore, build-excludes are not applied
    • - *
  • flat: Resource paths are never prefixed and namespaces are omitted if possible. Note that - * project types like "theme-library", which can have multiple namespaces, can't omit them. - * Any configured build-excludes are applied
    • - *
- * - * If project resources have been changed through the means of a workspace, those changes - * are reflected in the provided reader too. - * - * Resource readers always use POSIX-style paths. - * - * @public - * @param {object} [options] - * @param {string} [options.style=buildtime] Path style to access resources. - * Can be "buildtime", "dist", "runtime" or "flat" - * @returns {@ui5/fs/ReaderCollection} A reader collection instance - */ - getReader({style = "buildtime"} = {}) { + _getStyledReader(style) { // Apply builder excludes to all styles but "runtime" const excludes = style === "runtime" ? [] : this.getBuilderResourcesExcludes(); - const reader = this._getReader(excludes); - return resourceFactory.createReaderCollectionPrioritized({ - name: `Reader/Writer collection for project ${this.getName()}`, - readers: [this._getWriter(), reader] - }); + return this._getReader(excludes); } - /** - * Get a resource reader/writer for accessing and modifying a project's resources - * - * @public - * @returns {@ui5/fs/ReaderCollection} A reader collection instance - */ - getWorkspace() { - const excludes = this.getBuilderResourcesExcludes(); - const reader = this._getReader(excludes); - - const writer = this._getWriter(); - return resourceFactory.createWorkspace({ - reader, - writer - }); - } + // /** + // * Get a resource reader/writer for accessing and modifying a project's resources + // * + // * @public + // * @returns {@ui5/fs/ReaderCollection} A reader collection instance + // */ + // getWorkspace() { + // const excludes = this.getBuilderResourcesExcludes(); + // const reader = this._getReader(excludes); + + // const writer = this._getWriter(); + // return resourceFactory.createWorkspace({ + // reader, + // writer + // }); + // } _getReader(excludes) { const readers = this._paths.map(({name, virBasePath, fsBasePath}) => { diff --git a/packages/project/lib/specifications/types/ThemeLibrary.js b/packages/project/lib/specifications/types/ThemeLibrary.js index 51bf5a3ab4a..d4644c78885 100644 --- a/packages/project/lib/specifications/types/ThemeLibrary.js +++ b/packages/project/lib/specifications/types/ThemeLibrary.js @@ -40,71 +40,34 @@ class ThemeLibrary extends Project { } /* === Resource Access === */ - /** - * Get a [ReaderCollection]{@link @ui5/fs/ReaderCollection} for accessing all resources of the - * project in the specified "style": - * - *
    - *
  • buildtime: Resource paths are always prefixed with /resources/ - * or /test-resources/ followed by the project's namespace. - * Any configured build-excludes are applied
    • - *
  • dist: Resource paths always match with what the UI5 runtime expects. - * This means that paths generally depend on the project type. Applications for example use a "flat"-like - * structure, while libraries use a "buildtime"-like structure. - * Any configured build-excludes are applied
    • - *
  • runtime: Resource paths always match with what the UI5 runtime expects. - * This means that paths generally depend on the project type. Applications for example use a "flat"-like - * structure, while libraries use a "buildtime"-like structure. - * This style is typically used for serving resources directly. Therefore, build-excludes are not applied
    • - *
  • flat: Resource paths are never prefixed and namespaces are omitted if possible. Note that - * project types like "theme-library", which can have multiple namespaces, can't omit them. - * Any configured build-excludes are applied
    • - *
- * - * If project resources have been changed through the means of a workspace, those changes - * are reflected in the provided reader too. - * - * Resource readers always use POSIX-style paths. - * - * @public - * @param {object} [options] - * @param {string} [options.style=buildtime] Path style to access resources. - * Can be "buildtime", "dist", "runtime" or "flat" - * @returns {@ui5/fs/ReaderCollection} A reader collection instance - */ - getReader({style = "buildtime"} = {}) { + + _getStyledReader(style) { // Apply builder excludes to all styles but "runtime" const excludes = style === "runtime" ? [] : this.getBuilderResourcesExcludes(); - const reader = this._getReader(excludes); - const writer = this._getWriter(); - - return resourceFactory.createReaderCollectionPrioritized({ - name: `Reader/Writer collection for project ${this.getName()}`, - readers: [writer, reader] - }); + return this._getReader(excludes); } - /** - * Get a [DuplexCollection]{@link @ui5/fs/DuplexCollection} for accessing and modifying a - * project's resources. - * - * This is always of style buildtime, wich for theme libraries is identical to style - * runtime. - * - * @public - * @returns {@ui5/fs/DuplexCollection} DuplexCollection - */ - getWorkspace() { - const excludes = this.getBuilderResourcesExcludes(); - const reader = this._getReader(excludes); - - const writer = this._getWriter(); - return resourceFactory.createWorkspace({ - reader, - writer - }); - } + // /** + // * Get a [DuplexCollection]{@link @ui5/fs/DuplexCollection} for accessing and modifying a + // * project's resources. + // * + // * This is always of style buildtime, which for theme libraries is identical to style + // * runtime. + // * + // * @public + // * @returns {@ui5/fs/DuplexCollection} DuplexCollection + // */ + // getWorkspace() { + // const excludes = this.getBuilderResourcesExcludes(); + // const reader = this._getReader(excludes); + + // const writer = this._getWriter(); + // return resourceFactory.createWorkspace({ + // reader, + // writer + // }); + // } _getReader(excludes) { let reader = resourceFactory.createReader({ From 4532892f87b8eb224464c754ffb8dc769dcc590f Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 18 Nov 2025 15:57:13 +0100 Subject: [PATCH 006/110] refactor(project): Implement basic incremental build functionality Cherry-picked from: https://github.com/SAP/ui5-project/commit/cb4e858a630fe673cdaf3f991fa8fb6272e45ea2 JIRA: CPOUI5FOUNDATION-1174 --- packages/project/lib/build/ProjectBuilder.js | 144 +++++- packages/project/lib/build/TaskRunner.js | 63 ++- .../project/lib/build/cache/BuildTaskCache.js | 193 ++++++++ .../lib/build/cache/ProjectBuildCache.js | 433 ++++++++++++++++++ .../project/lib/build/helpers/BuildContext.js | 39 +- .../lib/build/helpers/ProjectBuildContext.js | 110 ++++- .../project/lib/build/helpers/WatchHandler.js | 135 ++++++ .../lib/build/helpers/createBuildManifest.js | 89 +++- packages/project/lib/graph/ProjectGraph.js | 88 +++- .../lib/specifications/ComponentProject.js | 17 +- .../project/lib/specifications/Project.js | 291 ++++++++++-- .../lib/specifications/types/Application.js | 25 +- .../lib/specifications/types/Library.js | 43 +- .../lib/specifications/types/Module.js | 10 +- .../lib/specifications/types/ThemeLibrary.js | 23 +- .../project/test/lib/build/ProjectBuilder.js | 2 + packages/project/test/lib/build/TaskRunner.js | 174 +++---- .../lib/build/helpers/ProjectBuildContext.js | 6 +- 18 files changed, 1695 insertions(+), 190 deletions(-) create mode 100644 packages/project/lib/build/cache/BuildTaskCache.js create mode 100644 packages/project/lib/build/cache/ProjectBuildCache.js create mode 100644 packages/project/lib/build/helpers/WatchHandler.js diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 4a805d8a385..88e92cd75e4 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -139,9 +139,11 @@ class ProjectBuilder { async build({ destPath, cleanDest = false, includedDependencies = [], excludedDependencies = [], - dependencyIncludes + dependencyIncludes, + cacheDir, + watch, }) { - if (!destPath) { + if (!destPath && !watch) { throw new Error(`Missing parameter 'destPath'`); } if (dependencyIncludes) { @@ -177,12 +179,15 @@ class ProjectBuilder { } } - const projectBuildContexts = await this._createRequiredBuildContexts(requestedProjects); + const projectBuildContexts = await this._createRequiredBuildContexts(requestedProjects, cacheDir); const cleanupSigHooks = this._registerCleanupSigHooks(); - const fsTarget = resourceFactory.createAdapter({ - fsBasePath: destPath, - virBasePath: "/" - }); + let fsTarget; + if (destPath) { + fsTarget = resourceFactory.createAdapter({ + fsBasePath: destPath, + virBasePath: "/" + }); + } const queue = []; const alreadyBuilt = []; @@ -196,7 +201,7 @@ class ProjectBuilder { // => This project needs to be built or, in case it has already // been built, it's build result needs to be written out (if requested) queue.push(projectBuildContext); - if (!projectBuildContext.requiresBuild()) { + if (!await projectBuildContext.requiresBuild()) { alreadyBuilt.push(projectName); } } @@ -220,8 +225,12 @@ class ProjectBuilder { let msg; if (alreadyBuilt.includes(projectName)) { const buildMetadata = projectBuildContext.getBuildMetadata(); - const ts = new Date(buildMetadata.timestamp).toUTCString(); - msg = `*> ${projectName} /// already built at ${ts}`; + let buildAt = ""; + if (buildMetadata) { + const ts = new Date(buildMetadata.timestamp).toUTCString(); + buildAt = ` at ${ts}`; + } + msg = `*> ${projectName} /// already built${buildAt}`; } else { msg = `=> ${projectName}`; } @@ -231,7 +240,7 @@ class ProjectBuilder { } } - if (cleanDest) { + if (destPath && cleanDest) { this.#log.info(`Cleaning target directory...`); await rmrf(destPath); } @@ -239,8 +248,9 @@ class ProjectBuilder { try { const pWrites = []; for (const projectBuildContext of queue) { - const projectName = projectBuildContext.getProject().getName(); - const projectType = projectBuildContext.getProject().getType(); + const project = projectBuildContext.getProject(); + const projectName = project.getName(); + const projectType = project.getType(); this.#log.verbose(`Processing project ${projectName}...`); // Only build projects that are not already build (i.e. provide a matching build manifest) @@ -248,7 +258,9 @@ class ProjectBuilder { this.#log.skipProjectBuild(projectName, projectType); } else { this.#log.startProjectBuild(projectName, projectType); + project.newVersion(); await projectBuildContext.getTaskRunner().runTasks(); + project.sealWorkspace(); this.#log.endProjectBuild(projectName, projectType); } if (!requestedProjects.includes(projectName) || !!process.env.UI5_BUILD_NO_WRITE_DEST) { @@ -257,8 +269,15 @@ class ProjectBuilder { continue; } - this.#log.verbose(`Writing out files...`); - pWrites.push(this._writeResults(projectBuildContext, fsTarget)); + if (fsTarget) { + this.#log.verbose(`Writing out files...`); + pWrites.push(this._writeResults(projectBuildContext, fsTarget)); + } + + if (cacheDir && !alreadyBuilt.includes(projectName)) { + this.#log.verbose(`Serializing cache...`); + pWrites.push(projectBuildContext.getBuildCache().serializeToDisk()); + } } await Promise.all(pWrites); this.#log.info(`Build succeeded in ${this._getElapsedTime(startTime)}`); @@ -269,9 +288,91 @@ class ProjectBuilder { this._deregisterCleanupSigHooks(cleanupSigHooks); await this._executeCleanupTasks(); } + + if (watch) { + const relevantProjects = queue.map((projectBuildContext) => { + return projectBuildContext.getProject(); + }); + const watchHandler = this._buildContext.initWatchHandler(relevantProjects, async () => { + await this.#update(projectBuildContexts, requestedProjects, fsTarget, cacheDir); + }); + return watchHandler; + + // Register change handler + // this._buildContext.onSourceFileChange(async (event) => { + // await this.#update(projectBuildContexts, requestedProjects, + // fsTarget, + // targetWriterProject, targetWriterDependencies); + // updateOnChange(event); + // }, (err) => { + // updateOnChange(err); + // }); + + // // Start watching + // for (const projectBuildContext of queue) { + // await projectBuildContext.watchFileChanges(); + // } + } + } + + async #update(projectBuildContexts, requestedProjects, fsTarget, cacheDir) { + const queue = []; + await this._graph.traverseDepthFirst(async ({project}) => { + const projectName = project.getName(); + const projectBuildContext = projectBuildContexts.get(projectName); + if (projectBuildContext) { + // Build context exists + // => This project needs to be built or, in case it has already + // been built, it's build result needs to be written out (if requested) + // if (await projectBuildContext.requiresBuild()) { + queue.push(projectBuildContext); + // } + } + }); + + this.#log.setProjects(queue.map((projectBuildContext) => { + return projectBuildContext.getProject().getName(); + })); + + const pWrites = []; + for (const projectBuildContext of queue) { + const project = projectBuildContext.getProject(); + const projectName = project.getName(); + const projectType = project.getType(); + this.#log.verbose(`Updating project ${projectName}...`); + + if (!await projectBuildContext.requiresBuild()) { + this.#log.skipProjectBuild(projectName, projectType); + continue; + } + + this.#log.startProjectBuild(projectName, projectType); + project.newVersion(); + await projectBuildContext.runTasks(); + project.sealWorkspace(); + this.#log.endProjectBuild(projectName, projectType); + if (!requestedProjects.includes(projectName)) { + // Project has not been requested + // => Its resources shall not be part of the build result + continue; + } + + if (fsTarget) { + this.#log.verbose(`Writing out files...`); + pWrites.push(this._writeResults(projectBuildContext, fsTarget)); + } + + if (cacheDir) { + this.#log.verbose(`Updating cache...`); + // TODO: Only serialize if cache has changed + // TODO: Serialize lazily, or based on memory pressure + pWrites.push(projectBuildContext.getBuildCache().serializeToDisk()); + } + } + await Promise.all(pWrites); } - async _createRequiredBuildContexts(requestedProjects) { + async _createRequiredBuildContexts(requestedProjects, cacheDir) { const requiredProjects = new Set(this._graph.getProjectNames().filter((projectName) => { return requestedProjects.includes(projectName); })); @@ -280,13 +381,14 @@ class ProjectBuilder { for (const projectName of requiredProjects) { this.#log.verbose(`Creating build context for project ${projectName}...`); - const projectBuildContext = this._buildContext.createProjectContext({ - project: this._graph.getProject(projectName) + const projectBuildContext = await this._buildContext.createProjectContext({ + project: this._graph.getProject(projectName), + cacheDir, }); projectBuildContexts.set(projectName, projectBuildContext); - if (projectBuildContext.requiresBuild()) { + if (await projectBuildContext.requiresBuild()) { const taskRunner = projectBuildContext.getTaskRunner(); const requiredDependencies = await taskRunner.getRequiredDependencies(); @@ -389,7 +491,9 @@ class ProjectBuilder { const { default: createBuildManifest } = await import("./helpers/createBuildManifest.js"); - const metadata = await createBuildManifest(project, buildConfig, this._buildContext.getTaskRepository()); + const metadata = await createBuildManifest( + project, this._graph, buildConfig, this._buildContext.getTaskRepository(), + projectBuildContext.getBuildCache()); await target.write(resourceFactory.createResource({ path: `/.ui5/build-manifest.json`, string: JSON.stringify(metadata, null, "\t") diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index 0f5677170a3..08473e39b2b 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -1,6 +1,6 @@ import {getLogger} from "@ui5/logger"; import composeTaskList from "./helpers/composeTaskList.js"; -import {createReaderCollection} from "@ui5/fs/resourceFactory"; +import {createReaderCollection, createTracker} from "@ui5/fs/resourceFactory"; /** * TaskRunner @@ -21,8 +21,8 @@ class TaskRunner { * @param {@ui5/project/build/ProjectBuilder~BuildConfiguration} parameters.buildConfig * Build configuration */ - constructor({graph, project, log, taskUtil, taskRepository, buildConfig}) { - if (!graph || !project || !log || !taskUtil || !taskRepository || !buildConfig) { + constructor({graph, project, log, cache, taskUtil, taskRepository, buildConfig}) { + if (!graph || !project || !log || !cache || !taskUtil || !taskRepository || !buildConfig) { throw new Error("TaskRunner: One or more mandatory parameters not provided"); } this._project = project; @@ -31,6 +31,7 @@ class TaskRunner { this._taskRepository = taskRepository; this._buildConfig = buildConfig; this._log = log; + this._cache = cache; this._directDependencies = new Set(this._taskUtil.getDependencies()); } @@ -190,20 +191,62 @@ class TaskRunner { options.projectName = this._project.getName(); options.projectNamespace = this._project.getNamespace(); + // TODO: Apply cache and stage handling for custom tasks as well + this._project.useStage(taskName); + + // Check whether any of the relevant resources have changed + if (this._cache.hasCacheForTask(taskName)) { + await this._cache.validateChangedProjectResources( + taskName, this._project.getReader(), this._allDependenciesReader); + if (this._cache.hasValidCacheForTask(taskName)) { + this._log.skipTask(taskName); + return; + } + } + this._log.info( + `Executing task ${taskName} for project ${this._project.getName()}`); + const workspace = createTracker(this._project.getWorkspace()); const params = { - workspace: this._project.getWorkspace(), + workspace, taskUtil: this._taskUtil, - options + options, + buildCache: { + // TODO: Create a proper interface for this + hasCache: () => { + return this._cache.hasCacheForTask(taskName); + }, + getChangedProjectResourcePaths: () => { + return this._cache.getChangedProjectResourcePaths(taskName); + }, + getChangedDependencyResourcePaths: () => { + return this._cache.getChangedDependencyResourcePaths(taskName); + }, + } }; + // const invalidatedResources = this._cache.getDepsOfInvalidatedResourcesForTask(taskName); + // if (invalidatedResources) { + // params.invalidatedResources = invalidatedResources; + // } + let dependencies; if (requiresDependencies) { - params.dependencies = this._allDependenciesReader; + dependencies = createTracker(this._allDependenciesReader); + params.dependencies = dependencies; } if (!taskFunction) { taskFunction = (await this._taskRepository.getTask(taskName)).task; } - return taskFunction(params); + + this._log.startTask(taskName); + this._taskStart = performance.now(); + await taskFunction(params); + if (this._log.isLevelEnabled("perf")) { + this._log.perf( + `Task ${taskName} finished in ${Math.round((performance.now() - this._taskStart))} ms`); + } + this._log.endTask(taskName); + await this._cache.updateTaskResult(taskName, workspace, dependencies); }; } this._tasks[taskName] = { @@ -445,13 +488,15 @@ class TaskRunner { * @returns {Promise} Resolves when task has finished */ async _executeTask(taskName, taskFunction, taskParams) { - this._log.startTask(taskName); + if (this._cache.hasValidCacheForTask(taskName)) { + this._log.skipTask(taskName); + return; + } this._taskStart = performance.now(); await taskFunction(taskParams, this._log); if (this._log.isLevelEnabled("perf")) { this._log.perf(`Task ${taskName} finished in ${Math.round((performance.now() - this._taskStart))} ms`); } - this._log.endTask(taskName); } async _createDependenciesReader(requiredDirectDependencies) { diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js new file mode 100644 index 00000000000..1927b33e58c --- /dev/null +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -0,0 +1,193 @@ +import micromatch from "micromatch"; +import {getLogger} from "@ui5/logger"; +const log = getLogger("build:cache:BuildTaskCache"); + +function unionArray(arr, items) { + for (const item of items) { + if (!arr.includes(item)) { + arr.push(item); + } + } +} +function unionObject(target, obj) { + for (const key in obj) { + if (Object.prototype.hasOwnProperty.call(obj, key)) { + target[key] = obj[key]; + } + } +} + +async function createMetadataForResources(resourceMap) { + const metadata = Object.create(null); + await Promise.all(Object.keys(resourceMap).map(async (resourcePath) => { + const resource = resourceMap[resourcePath]; + if (resource.hash) { + // Metadata object + metadata[resourcePath] = resource; + return; + } + // Resource instance + metadata[resourcePath] = { + hash: await resource.getHash(), + lastModified: resource.getStatInfo()?.mtimeMs, + }; + })); + return metadata; +} + +export default class BuildTaskCache { + #projectName; + #taskName; + + // Track which resource paths (and patterns) the task reads + // This is used to check whether a resource change *might* invalidates the task + #projectRequests; + #dependencyRequests; + + // Track metadata for the actual resources the task has read and written + // This is used to check whether a resource has actually changed from the last time the task has been executed (and + // its result has been cached) + // Per resource path, this reflects the last known state of the resource (a task might be executed multiple times, + // i.e. with a small delta of changed resources) + // This map can contain either a resource instance (if the cache has been filled during this session) or an object + // containing the last modified timestamp and an md5 hash of the resource (if the cache has been loaded from disk) + #resourcesRead; + #resourcesWritten; + + constructor(projectName, taskName, {projectRequests, dependencyRequests, resourcesRead, resourcesWritten}) { + this.#projectName = projectName; + this.#taskName = taskName; + + this.#projectRequests = projectRequests ?? { + pathsRead: [], + patterns: [], + }; + + this.#dependencyRequests = dependencyRequests ?? { + pathsRead: [], + patterns: [], + }; + this.#resourcesRead = resourcesRead ?? Object.create(null); + this.#resourcesWritten = resourcesWritten ?? Object.create(null); + } + + getTaskName() { + return this.#taskName; + } + + updateResources(projectRequests, dependencyRequests, resourcesRead, resourcesWritten) { + unionArray(this.#projectRequests.pathsRead, projectRequests.pathsRead); + unionArray(this.#projectRequests.patterns, projectRequests.patterns); + + if (dependencyRequests) { + unionArray(this.#dependencyRequests.pathsRead, dependencyRequests.pathsRead); + unionArray(this.#dependencyRequests.patterns, dependencyRequests.patterns); + } + + unionObject(this.#resourcesRead, resourcesRead); + unionObject(this.#resourcesWritten, resourcesWritten); + } + + async toObject() { + return { + taskName: this.#taskName, + resourceMetadata: { + projectRequests: this.#projectRequests, + dependencyRequests: this.#dependencyRequests, + resourcesRead: await createMetadataForResources(this.#resourcesRead), + resourcesWritten: await createMetadataForResources(this.#resourcesWritten) + } + }; + } + + checkPossiblyInvalidatesTask(projectResourcePaths, dependencyResourcePaths) { + if (this.#isRelevantResourceChange(this.#projectRequests, projectResourcePaths)) { + log.verbose( + `Build cache for task ${this.#taskName} of project ${this.#projectName} possibly invalidated ` + + `by changes made to the following resources ${Array.from(projectResourcePaths).join(", ")}`); + return true; + } + + if (this.#isRelevantResourceChange(this.#dependencyRequests, dependencyResourcePaths)) { + log.verbose( + `Build cache for task ${this.#taskName} of project ${this.#projectName} possibly invalidated ` + + `by changes made to the following resources: ${Array.from(dependencyResourcePaths).join(", ")}`); + return true; + } + + return false; + } + + getReadResourceCacheEntry(searchResourcePath) { + return this.#resourcesRead[searchResourcePath]; + } + + getWrittenResourceCache(searchResourcePath) { + return this.#resourcesWritten[searchResourcePath]; + } + + async isResourceInReadCache(resource) { + const cachedResource = this.#resourcesRead[resource.getPath()]; + if (!cachedResource) { + return false; + } + if (cachedResource.hash) { + return this.#isResourceFingerprintEqual(resource, cachedResource); + } else { + return this.#isResourceEqual(resource, cachedResource); + } + } + + async isResourceInWriteCache(resource) { + const cachedResource = this.#resourcesWritten[resource.getPath()]; + if (!cachedResource) { + return false; + } + if (cachedResource.hash) { + return this.#isResourceFingerprintEqual(resource, cachedResource); + } else { + return this.#isResourceEqual(resource, cachedResource); + } + } + + async #isResourceEqual(resourceA, resourceB) { + if (!resourceA || !resourceB) { + throw new Error("Cannot compare undefined resources"); + } + if (resourceA === resourceB) { + return true; + } + if (resourceA.getStatInfo()?.mtimeMs !== resourceA.getStatInfo()?.mtimeMs) { + return false; + } + if (await resourceA.getString() === await resourceB.getString()) { + return true; + } + return false; + } + + async #isResourceFingerprintEqual(resourceA, resourceBMetadata) { + if (!resourceA || !resourceBMetadata) { + throw new Error("Cannot compare undefined resources"); + } + if (resourceA.getStatInfo()?.mtimeMs !== resourceBMetadata.lastModified) { + return false; + } + if (await resourceA.getHash() === resourceBMetadata.hash) { + return true; + } + return false; + } + + #isRelevantResourceChange({pathsRead, patterns}, changedResourcePaths) { + for (const resourcePath of changedResourcePaths) { + if (pathsRead.includes(resourcePath)) { + return true; + } + if (patterns.length && micromatch.isMatch(resourcePath, patterns)) { + return true; + } + } + return false; + } +} diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js new file mode 100644 index 00000000000..3fc87b06afe --- /dev/null +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -0,0 +1,433 @@ +import path from "node:path"; +import {stat} from "node:fs/promises"; +import {createResource, createAdapter} from "@ui5/fs/resourceFactory"; +import {getLogger} from "@ui5/logger"; +import BuildTaskCache from "./BuildTaskCache.js"; +const log = getLogger("build:cache:ProjectBuildCache"); + +/** + * A project's build cache can have multiple states + * - Initial build without existing build manifest or cache: + * * No build manifest + * * Tasks are unknown + * * Resources are unknown + * * No persistence of workspaces + * - Build of project with build manifest + * * (a valid build manifest implies that the project will not be built initially) + * * Tasks are known + * * Resources required and produced by tasks are known + * * No persistence of workspaces + * * => In case of a rebuild, all tasks need to be executed once to restore the workspaces + * - Build of project with build manifest and cache + * * Tasks are known + * * Resources required and produced by tasks are known + * * Workspaces can be restored from cache + */ + +export default class ProjectBuildCache { + #taskCache = new Map(); + #project; + #cacheKey; + #cacheDir; + #cacheRoot; + + #invalidatedTasks = new Map(); + #updatedResources = new Set(); + #restoreFailed = false; + + /** + * + * @param {Project} project Project instance + * @param {string} cacheKey Cache key + * @param {string} [cacheDir] Cache directory + */ + constructor(project, cacheKey, cacheDir) { + this.#project = project; + this.#cacheKey = cacheKey; + this.#cacheDir = cacheDir; + this.#cacheRoot = cacheDir && createAdapter({ + fsBasePath: cacheDir, + virBasePath: "/" + }); + } + + async updateTaskResult(taskName, workspaceTracker, dependencyTracker) { + const projectTrackingResults = workspaceTracker.getResults(); + const dependencyTrackingResults = dependencyTracker?.getResults(); + + const resourcesRead = projectTrackingResults.resourcesRead; + if (dependencyTrackingResults) { + for (const [resourcePath, resource] of Object.entries(dependencyTrackingResults.resourcesRead)) { + resourcesRead[resourcePath] = resource; + } + } + const resourcesWritten = projectTrackingResults.resourcesWritten; + + if (this.#taskCache.has(taskName)) { + log.verbose(`Updating build cache with results of task ${taskName} in project ${this.#project.getName()}`); + const taskCache = this.#taskCache.get(taskName); + + const writtenResourcePaths = Object.keys(resourcesWritten); + if (writtenResourcePaths.length) { + log.verbose(`Task ${taskName} produced ${writtenResourcePaths.length} resources`); + + const changedPaths = new Set((await Promise.all(writtenResourcePaths + .map(async (resourcePath) => { + // Check whether resource content actually changed + if (await taskCache.isResourceInWriteCache(resourcesWritten[resourcePath])) { + return undefined; + } + return resourcePath; + }))).filter((resourcePath) => resourcePath !== undefined)); + + if (!changedPaths.size) { + log.verbose( + `Resources produced by task ${taskName} match with cache from previous executions. ` + + `This task will not invalidate any other tasks`); + return; + } + log.verbose( + `Task ${taskName} produced ${changedPaths.size} resources that might invalidate other tasks`); + for (const resourcePath of changedPaths) { + this.#updatedResources.add(resourcePath); + } + // Check whether other tasks need to be invalidated + const allTasks = Array.from(this.#taskCache.keys()); + const taskIndex = allTasks.indexOf(taskName); + const emptySet = new Set(); + for (let i = taskIndex + 1; i < allTasks.length; i++) { + const nextTaskName = allTasks[i]; + if (!this.#taskCache.get(nextTaskName).checkPossiblyInvalidatesTask(changedPaths, emptySet)) { + continue; + } + if (this.#invalidatedTasks.has(taskName)) { + const {changedDependencyResourcePaths} = + this.#invalidatedTasks.get(taskName); + for (const resourcePath of changedPaths) { + changedDependencyResourcePaths.add(resourcePath); + } + } else { + this.#invalidatedTasks.set(taskName, { + changedProjectResourcePaths: changedPaths, + changedDependencyResourcePaths: emptySet + }); + } + } + } + taskCache.updateResources( + projectTrackingResults.requests, + dependencyTrackingResults?.requests, + resourcesRead, + resourcesWritten + ); + } else { + log.verbose(`Initializing build cache for task ${taskName} in project ${this.#project.getName()}`); + this.#taskCache.set(taskName, + new BuildTaskCache(this.#project.getName(), taskName, { + projectRequests: projectTrackingResults.requests, + dependencyRequests: dependencyTrackingResults?.requests, + resourcesRead, + resourcesWritten + }) + ); + } + + if (this.#invalidatedTasks.has(taskName)) { + this.#invalidatedTasks.delete(taskName); + } + } + + harvestUpdatedResources() { + const updatedResources = new Set(this.#updatedResources); + this.#updatedResources.clear(); + return updatedResources; + } + + resourceChanged(projectResourcePaths, dependencyResourcePaths) { + let taskInvalidated = false; + for (const [taskName, taskCache] of this.#taskCache) { + if (!taskCache.checkPossiblyInvalidatesTask(projectResourcePaths, dependencyResourcePaths)) { + continue; + } + taskInvalidated = true; + if (this.#invalidatedTasks.has(taskName)) { + const {changedProjectResourcePaths, changedDependencyResourcePaths} = + this.#invalidatedTasks.get(taskName); + for (const resourcePath of projectResourcePaths) { + changedProjectResourcePaths.add(resourcePath); + } + for (const resourcePath of dependencyResourcePaths) { + changedDependencyResourcePaths.add(resourcePath); + } + } else { + this.#invalidatedTasks.set(taskName, { + changedProjectResourcePaths: new Set(projectResourcePaths), + changedDependencyResourcePaths: new Set(dependencyResourcePaths) + }); + } + } + return taskInvalidated; + } + + async validateChangedProjectResources(taskName, workspace, dependencies) { + // Check whether the supposedly changed resources for the task have actually changed + if (!this.#invalidatedTasks.has(taskName)) { + return; + } + const {changedProjectResourcePaths, changedDependencyResourcePaths} = this.#invalidatedTasks.get(taskName); + await this._validateChangedResources(taskName, workspace, changedProjectResourcePaths); + await this._validateChangedResources(taskName, dependencies, changedDependencyResourcePaths); + + if (!changedProjectResourcePaths.size && !changedDependencyResourcePaths.size) { + // Task is no longer invalidated + this.#invalidatedTasks.delete(taskName); + } + } + + async _validateChangedResources(taskName, reader, changedResourcePaths) { + for (const resourcePath of changedResourcePaths) { + const resource = await reader.byPath(resourcePath); + if (!resource) { + // Resource was deleted, no need to check further + continue; + } + + const taskCache = this.#taskCache.get(taskName); + if (!taskCache) { + throw new Error(`Failed to validate changed resources for task ${taskName}: Task cache not found`); + } + if (await taskCache.isResourceInReadCache(resource)) { + log.verbose(`Resource content has not changed for task ${taskName}, ` + + `removing ${resourcePath} from set of changed resource paths`); + changedResourcePaths.delete(resourcePath); + } + } + } + + getChangedProjectResourcePaths(taskName) { + return this.#invalidatedTasks.get(taskName)?.changedProjectResourcePaths ?? new Set(); + } + + getChangedDependencyResourcePaths(taskName) { + return this.#invalidatedTasks.get(taskName)?.changedDependencyResourcePaths ?? new Set(); + } + + hasCache() { + return this.#taskCache.size > 0; + } + + /* + Check whether the project's build cache has an entry for the given stage. + This means that the cache has been filled with the output of the given stage. + */ + hasCacheForTask(taskName) { + return this.#taskCache.has(taskName); + } + + hasValidCacheForTask(taskName) { + return this.#taskCache.has(taskName) && !this.#invalidatedTasks.has(taskName); + } + + getCacheForTask(taskName) { + return this.#taskCache.get(taskName); + } + + requiresBuild() { + return !this.hasCache() || this.#invalidatedTasks.size > 0; + } + + async toObject() { + // const globalResourceIndex = Object.create(null); + // function addResourcesToIndex(taskName, resourceMap) { + // for (const resourcePath of Object.keys(resourceMap)) { + // const resource = resourceMap[resourcePath]; + // const resourceKey = `${resourcePath}:${resource.hash}`; + // if (!globalResourceIndex[resourceKey]) { + // globalResourceIndex[resourceKey] = { + // hash: resource.hash, + // lastModified: resource.lastModified, + // tasks: [taskName] + // }; + // } else if (!globalResourceIndex[resourceKey].tasks.includes(taskName)) { + // globalResourceIndex[resourceKey].tasks.push(taskName); + // } + // } + // } + const taskCache = []; + for (const cache of this.#taskCache.values()) { + const cacheObject = await cache.toObject(); + taskCache.push(cacheObject); + // addResourcesToIndex(taskName, cacheObject.resources.project.resourcesRead); + // addResourcesToIndex(taskName, cacheObject.resources.project.resourcesWritten); + // addResourcesToIndex(taskName, cacheObject.resources.dependencies.resourcesRead); + } + // Collect metadata for all relevant source files + const sourceReader = this.#project.getSourceReader(); + // const resourceMetadata = await Promise.all(Array.from(relevantSourceFiles).map(async (resourcePath) => { + const resources = await sourceReader.byGlob("/**/*"); + const sourceMetadata = Object.create(null); + await Promise.all(resources.map(async (resource) => { + sourceMetadata[resource.getOriginalPath()] = { + lastModified: resource.getStatInfo()?.mtimeMs, + hash: await resource.getHash(), + }; + })); + + return { + timestamp: Date.now(), + cacheKey: this.#cacheKey, + taskCache, + sourceMetadata, + // globalResourceIndex, + }; + } + + async #serializeMetadata() { + const serializedCache = await this.toObject(); + const cacheContent = JSON.stringify(serializedCache, null, 2); + const res = createResource({ + path: `/cache-info.json`, + string: cacheContent, + }); + await this.#cacheRoot.write(res); + } + + async #serializeTaskOutputs() { + log.info(`Serializing task outputs for project ${this.#project.getName()}`); + const stageCache = await Promise.all(Array.from(this.#taskCache.keys()).map(async (taskName, idx) => { + const reader = this.#project.getDeltaReader(taskName); + if (!reader) { + log.verbose( + `Skipping serialization of empty writer for task ${taskName} in project ${this.#project.getName()}` + ); + return; + } + const resources = await reader.byGlob("/**/*"); + + const target = createAdapter({ + fsBasePath: path.join(this.#cacheDir, "taskCache", `${idx}-${taskName}`), + virBasePath: "/" + }); + + for (const res of resources) { + await target.write(res); + } + return { + reader: target, + stage: taskName + }; + })); + // Re-import cache as base layer to reduce memory pressure + this.#project.importCachedStages(stageCache.filter((entry) => entry)); + } + + async #checkSourceChanges(sourceMetadata) { + log.verbose(`Checking for source changes for project ${this.#project.getName()}`); + const sourceReader = this.#project.getSourceReader(); + const resources = await sourceReader.byGlob("/**/*"); + const changedResources = new Set(); + for (const resource of resources) { + const resourcePath = resource.getOriginalPath(); + const resourceMetadata = sourceMetadata[resourcePath]; + if (!resourceMetadata) { + // New resource + log.verbose(`New resource: ${resourcePath}`); + changedResources.add(resourcePath); + continue; + } + if (resourceMetadata.lastModified !== resource.getStatInfo()?.mtimeMs) { + log.verbose(`Resource changed: ${resourcePath}`); + changedResources.add(resourcePath); + } + // TODO: Hash-based check can be requested by user and per project + // The performance impact can be quite high for large projects + /* + if (someFlag) { + const currentHash = await resource.getHash(); + if (currentHash !== resourceMetadata.hash) { + log.verbose(`Resource changed: ${resourcePath}`); + changedResources.add(resourcePath); + } + }*/ + } + if (changedResources.size) { + const tasksInvalidated = this.resourceChanged(changedResources, new Set()); + if (tasksInvalidated) { + log.info(`Invalidating tasks due to changed resources for project ${this.#project.getName()}`); + } + } + } + + async #deserializeWriter() { + const cachedStages = await Promise.all(Array.from(this.#taskCache.keys()).map(async (taskName, idx) => { + const fsBasePath = path.join(this.#cacheDir, "taskCache", `${idx}-${taskName}`); + let cacheReader; + if (await exists(fsBasePath)) { + cacheReader = createAdapter({ + name: `Cache reader for task ${taskName} in project ${this.#project.getName()}`, + fsBasePath, + virBasePath: "/", + project: this.#project, + }); + } + + return { + stage: taskName, + reader: cacheReader + }; + })); + this.#project.importCachedStages(cachedStages); + } + + async serializeToDisk() { + if (!this.#cacheRoot) { + log.error("Cannot save cache to disk: No cache persistence available"); + return; + } + await Promise.all([ + await this.#serializeTaskOutputs(), + await this.#serializeMetadata() + ]); + } + + async attemptDeserializationFromDisk() { + if (this.#restoreFailed || !this.#cacheRoot) { + return; + } + const res = await this.#cacheRoot.byPath(`/cache-info.json`); + if (!res) { + this.#restoreFailed = true; + return; + } + const cacheContent = JSON.parse(await res.getString()); + try { + const projectName = this.#project.getName(); + for (const {taskName, resourceMetadata} of cacheContent.taskCache) { + this.#taskCache.set(taskName, new BuildTaskCache(projectName, taskName, resourceMetadata)); + } + await Promise.all([ + this.#checkSourceChanges(cacheContent.sourceMetadata), + this.#deserializeWriter() + ]); + } catch (err) { + throw new Error( + `Failed to restore cache from disk for project ${this.#project.getName()}: ${err.message}`, { + cause: err + }); + } + } +} + +async function exists(filePath) { + try { + await stat(filePath); + return true; + } catch (err) { + // "File or directory does not exist" + if (err.code === "ENOENT") { + return false; + } else { + throw err; + } + } +} diff --git a/packages/project/lib/build/helpers/BuildContext.js b/packages/project/lib/build/helpers/BuildContext.js index 8d8d1e1a329..063aaf30e21 100644 --- a/packages/project/lib/build/helpers/BuildContext.js +++ b/packages/project/lib/build/helpers/BuildContext.js @@ -1,5 +1,8 @@ +import path from "node:path"; import ProjectBuildContext from "./ProjectBuildContext.js"; import OutputStyleEnum from "./ProjectBuilderOutputStyle.js"; +import {createCacheKey} from "./createBuildManifest.js"; +import WatchHandler from "./WatchHandler.js"; /** * Context of a build process @@ -8,11 +11,14 @@ import OutputStyleEnum from "./ProjectBuilderOutputStyle.js"; * @memberof @ui5/project/build/helpers */ class BuildContext { + #watchHandler; + constructor(graph, taskRepository, { // buildConfig selfContained = false, cssVariables = false, jsdoc = false, createBuildManifest = false, + useCache = false, outputStyle = OutputStyleEnum.Default, includedTasks = [], excludedTasks = [], } = {}) { @@ -67,6 +73,7 @@ class BuildContext { outputStyle, includedTasks, excludedTasks, + useCache, }; this._taskRepository = taskRepository; @@ -97,15 +104,43 @@ class BuildContext { return this._graph; } - createProjectContext({project}) { + async createProjectContext({project, cacheDir}) { + const cacheKey = await this.#createCacheKeyForProject(project); + if (cacheDir) { + cacheDir = path.join(cacheDir, cacheKey); + } const projectBuildContext = new ProjectBuildContext({ buildContext: this, - project + project, + cacheKey, + cacheDir, }); this._projectBuildContexts.push(projectBuildContext); return projectBuildContext; } + initWatchHandler(projects, updateBuildResult) { + const watchHandler = new WatchHandler(this, updateBuildResult); + watchHandler.watch(projects); + this.#watchHandler = watchHandler; + return watchHandler; + } + + getWatchHandler() { + return this.#watchHandler; + } + + async #createCacheKeyForProject(project) { + return createCacheKey(project, this._graph, + this.getBuildConfig(), this.getTaskRepository()); + } + + getBuildContext(projectName) { + if (projectName) { + return this._projectBuildContexts.find((ctx) => ctx.getProject().getName() === projectName); + } + } + async executeCleanupTasks(force = false) { await Promise.all(this._projectBuildContexts.map((ctx) => { return ctx.executeCleanupTasks(force); diff --git a/packages/project/lib/build/helpers/ProjectBuildContext.js b/packages/project/lib/build/helpers/ProjectBuildContext.js index 10eb2a67a83..20a9e668150 100644 --- a/packages/project/lib/build/helpers/ProjectBuildContext.js +++ b/packages/project/lib/build/helpers/ProjectBuildContext.js @@ -2,6 +2,7 @@ import ResourceTagCollection from "@ui5/fs/internal/ResourceTagCollection"; import ProjectBuildLogger from "@ui5/logger/internal/loggers/ProjectBuild"; import TaskUtil from "./TaskUtil.js"; import TaskRunner from "../TaskRunner.js"; +import ProjectBuildCache from "../cache/ProjectBuildCache.js"; /** * Build context of a single project. Always part of an overall @@ -11,7 +12,16 @@ import TaskRunner from "../TaskRunner.js"; * @memberof @ui5/project/build/helpers */ class ProjectBuildContext { - constructor({buildContext, project}) { + /** + * + * @param {object} parameters Parameters + * @param {object} parameters.buildContext The build context. + * @param {object} parameters.project The project instance. + * @param {string} parameters.cacheKey The cache key. + * @param {string} parameters.cacheDir The cache directory. + * @throws {Error} Throws an error if 'buildContext' or 'project' is missing. + */ + constructor({buildContext, project, cacheKey, cacheDir}) { if (!buildContext) { throw new Error(`Missing parameter 'buildContext'`); } @@ -25,6 +35,8 @@ class ProjectBuildContext { projectName: project.getName(), projectType: project.getType() }); + this._cacheKey = cacheKey; + this._cache = new ProjectBuildCache(this._project, cacheKey, cacheDir); this._queues = { cleanup: [] }; @@ -33,6 +45,10 @@ class ProjectBuildContext { allowedTags: ["ui5:OmitFromBuildResult", "ui5:IsBundle"], allowedNamespaces: ["build"] }); + const buildManifest = this.#getBuildManifest(); + if (buildManifest) { + this._cache.deserialize(buildManifest.buildManifest.cache); + } } isRootProject() { @@ -111,6 +127,7 @@ class ProjectBuildContext { this._taskRunner = new TaskRunner({ project: this._project, log: this._log, + cache: this._cache, taskUtil: this.getTaskUtil(), graph: this._buildContext.getGraph(), taskRepository: this._buildContext.getTaskRepository(), @@ -126,23 +143,106 @@ class ProjectBuildContext { * * @returns {boolean} True if the project needs to be built */ - requiresBuild() { - return !this._project.getBuildManifest(); + async requiresBuild() { + if (this.#getBuildManifest()) { + return false; + } + + if (!this._cache.hasCache()) { + await this._cache.attemptDeserializationFromDisk(); + } + + return this._cache.requiresBuild(); + } + + async runTasks() { + await this.getTaskRunner().runTasks(); + const updatedResourcePaths = this._cache.harvestUpdatedResources(); + + if (updatedResourcePaths.size === 0) { + return; + } + this._log.verbose( + `Project ${this._project.getName()} updated resources: ${Array.from(updatedResourcePaths).join(", ")}`); + const graph = this._buildContext.getGraph(); + const emptySet = new Set(); + + // Propagate changes to all dependents of the project + for (const {project: dep} of graph.traverseDependents(this._project.getName())) { + const projectBuildContext = this._buildContext.getBuildContext(dep.getName()); + projectBuildContext.getBuildCache().resourceChanged(emptySet, updatedResourcePaths); + } + } + + #getBuildManifest() { + const manifest = this._project.getBuildManifest(); + if (!manifest) { + return; + } + // Check whether the manifest can be used for this build + if (manifest.buildManifest.manifestVersion === "0.1" || manifest.buildManifest.manifestVersion === "0.2") { + // Manifest version 0.1 and 0.2 are always used without further checks for legacy reasons + return manifest; + } + if (manifest.buildManifest.manifestVersion === "0.3" && + manifest.buildManifest.cacheKey === this.getCacheKey()) { + // Manifest version 0.3 is used with a matching cache key + return manifest; + } + // Unknown manifest version can't be used + return; } getBuildMetadata() { - const buildManifest = this._project.getBuildManifest(); + const buildManifest = this.#getBuildManifest(); if (!buildManifest) { return null; } const timeDiff = (new Date().getTime() - new Date(buildManifest.timestamp).getTime()); - // TODO: Format age properly via a new @ui5/logger util module + // TODO: Format age properly return { timestamp: buildManifest.timestamp, age: timeDiff / 1000 + " seconds" }; } + + getBuildCache() { + return this._cache; + } + + getCacheKey() { + return this._cacheKey; + } + + // async watchFileChanges() { + // // const paths = this._project.getSourcePaths(); + // // this._log.verbose(`Watching source paths: ${paths.join(", ")}`); + // // const {default: chokidar} = await import("chokidar"); + // // const watcher = chokidar.watch(paths, { + // // ignoreInitial: true, + // // persistent: false, + // // }); + // // watcher.on("add", async (filePath) => { + // // }); + // // watcher.on("change", async (filePath) => { + // // const resourcePath = this._project.getVirtualPath(filePath); + // // this._log.info(`File changed: ${resourcePath} (${filePath})`); + // // // Inform cache + // // this._cache.fileChanged(resourcePath); + // // // Inform dependents + // // for (const dependent of this._buildContext.getGraph().getTransitiveDependents(this._project.getName())) { + // // await this._buildContext.getProjectBuildContext(dependent).dependencyFileChanged(resourcePath); + // // } + // // // Inform build context + // // await this._buildContext.fileChanged(this._project.getName(), resourcePath); + // // }); + // } + + // dependencyFileChanged(resourcePath) { + // this._log.info(`Dependency file changed: ${resourcePath}`); + // this._cache.fileChanged(resourcePath); + // } } export default ProjectBuildContext; diff --git a/packages/project/lib/build/helpers/WatchHandler.js b/packages/project/lib/build/helpers/WatchHandler.js new file mode 100644 index 00000000000..0a5510a7eba --- /dev/null +++ b/packages/project/lib/build/helpers/WatchHandler.js @@ -0,0 +1,135 @@ +import EventEmitter from "node:events"; +import path from "node:path"; +import {watch} from "node:fs/promises"; +import {getLogger} from "@ui5/logger"; +const log = getLogger("build:helpers:WatchHandler"); + +/** + * Context of a build process + * + * @private + * @memberof @ui5/project/build/helpers + */ +class WatchHandler extends EventEmitter { + #buildContext; + #updateBuildResult; + #abortControllers = []; + #sourceChanges = new Map(); + #fileChangeHandlerTimeout; + + constructor(buildContext, updateBuildResult) { + super(); + this.#buildContext = buildContext; + this.#updateBuildResult = updateBuildResult; + } + + watch(projects) { + for (const project of projects) { + const paths = project.getSourcePaths(); + log.verbose(`Watching source paths: ${paths.join(", ")}`); + + for (const sourceDir of paths) { + const ac = new AbortController(); + const watcher = watch(sourceDir, { + persistent: true, + recursive: true, + signal: ac.signal, + }); + + this.#abortControllers.push(ac); + this.#handleWatchEvents(watcher, sourceDir, project); // Do not await as this would block the loop + } + } + } + + stop() { + for (const ac of this.#abortControllers) { + ac.abort(); + } + } + + async #handleWatchEvents(watcher, basePath, project) { + try { + for await (const {eventType, filename} of watcher) { + log.verbose(`File changed: ${eventType} ${filename}`); + if (filename) { + await this.#fileChanged(project, path.join(basePath, filename.toString())); + } + } + } catch (err) { + if (err.name === "AbortError") { + return; + } + throw err; + } + } + + async #fileChanged(project, filePath) { + // Collect changes (grouped by project), then trigger callbacks (debounced) + const resourcePath = project.getVirtualPath(filePath); + if (!this.#sourceChanges.has(project)) { + this.#sourceChanges.set(project, new Set()); + } + this.#sourceChanges.get(project).add(resourcePath); + + // Trigger callbacks debounced + if (!this.#fileChangeHandlerTimeout) { + this.#fileChangeHandlerTimeout = setTimeout(async () => { + await this.#handleResourceChanges(); + this.#fileChangeHandlerTimeout = null; + }, 100); + } else { + clearTimeout(this.#fileChangeHandlerTimeout); + this.#fileChangeHandlerTimeout = setTimeout(async () => { + await this.#handleResourceChanges(); + this.#fileChangeHandlerTimeout = null; + }, 100); + } + } + + async #handleResourceChanges() { + // Reset file changes before processing + const sourceChanges = this.#sourceChanges; + this.#sourceChanges = new Map(); + const dependencyChanges = new Map(); + let someProjectTasksInvalidated = false; + + const graph = this.#buildContext.getGraph(); + for (const [project, changedResourcePaths] of sourceChanges) { + // Propagate changes to dependents of the project + for (const {project: dep} of graph.traverseDependents(project.getName())) { + const depChanges = dependencyChanges.get(dep); + if (!depChanges) { + dependencyChanges.set(dep, new Set(changedResourcePaths)); + continue; + } + for (const res of changedResourcePaths) { + depChanges.add(res); + } + } + } + + await graph.traverseDepthFirst(({project}) => { + if (!sourceChanges.has(project) && !dependencyChanges.has(project)) { + return; + } + const projectSourceChanges = sourceChanges.get(project) ?? new Set(); + const projectDependencyChanges = dependencyChanges.get(project) ?? new Set(); + const projectBuildContext = this.#buildContext.getBuildContext(project.getName()); + const tasksInvalidated = + projectBuildContext.getBuildCache().resourceChanged(projectSourceChanges, projectDependencyChanges); + + if (tasksInvalidated) { + someProjectTasksInvalidated = true; + } + }); + + if (someProjectTasksInvalidated) { + this.emit("projectInvalidated"); + await this.#updateBuildResult(); + this.emit("buildUpdated"); + } + } +} + +export default WatchHandler; diff --git a/packages/project/lib/build/helpers/createBuildManifest.js b/packages/project/lib/build/helpers/createBuildManifest.js index 998935b3c05..ba19023d54f 100644 --- a/packages/project/lib/build/helpers/createBuildManifest.js +++ b/packages/project/lib/build/helpers/createBuildManifest.js @@ -1,4 +1,5 @@ import {createRequire} from "node:module"; +import crypto from "node:crypto"; // Using CommonsJS require since JSON module imports are still experimental const require = createRequire(import.meta.url); @@ -16,16 +17,33 @@ function getSortedTags(project) { return Object.fromEntries(entities); } -export default async function(project, buildConfig, taskRepository) { +async function collectDepInfo(graph, project) { + const transitiveDependencyInfo = Object.create(null); + for (const depName of graph.getTransitiveDependencies(project.getName())) { + const dep = graph.getProject(depName); + transitiveDependencyInfo[depName] = { + version: dep.getVersion() + }; + } + return transitiveDependencyInfo; +} + +export default async function(project, graph, buildConfig, taskRepository, transitiveDependencyInfo, buildCache) { if (!project) { throw new Error(`Missing parameter 'project'`); } + if (!graph) { + throw new Error(`Missing parameter 'graph'`); + } if (!buildConfig) { throw new Error(`Missing parameter 'buildConfig'`); } if (!taskRepository) { throw new Error(`Missing parameter 'taskRepository'`); } + if (!buildCache) { + throw new Error(`Missing parameter 'buildCache'`); + } const projectName = project.getName(); const type = project.getType(); @@ -44,8 +62,21 @@ export default async function(project, buildConfig, taskRepository) { `Unable to create archive metadata for project ${project.getName()}: ` + `Project type ${type} is currently not supported`); } + let buildManifest; + if (project.isFrameworkProject()) { + buildManifest = await createFrameworkManifest(project, buildConfig, taskRepository); + } else { + buildManifest = { + manifestVersion: "0.3", + timestamp: new Date().toISOString(), + dependencies: collectDepInfo(graph, project), + version: project.getVersion(), + namespace: project.getNamespace(), + tags: getSortedTags(project), + cacheKey: createCacheKey(project, graph, buildConfig, taskRepository), + }; + } - const {builderVersion, fsVersion: builderFsVersion} = await taskRepository.getVersions(); const metadata = { project: { specVersion: project.getSpecVersion().toString(), @@ -59,27 +90,49 @@ export default async function(project, buildConfig, taskRepository) { } } }, - buildManifest: { - manifestVersion: "0.2", - timestamp: new Date().toISOString(), - versions: { - builderVersion: builderVersion, - projectVersion: await getVersion("@ui5/project"), - fsVersion: await getVersion("@ui5/fs"), - }, - buildConfig, - version: project.getVersion(), - namespace: project.getNamespace(), - tags: getSortedTags(project) - } + buildManifest, + buildCache: await buildCache.serialize(), }; - if (metadata.buildManifest.versions.fsVersion !== builderFsVersion) { + return metadata; +} + +async function createFrameworkManifest(project, buildConfig, taskRepository) { + // Use legacy manifest version for framework libraries to ensure compatibility + const {builderVersion, fsVersion: builderFsVersion} = await taskRepository.getVersions(); + const buildManifest = { + manifestVersion: "0.2", + timestamp: new Date().toISOString(), + versions: { + builderVersion: builderVersion, + projectVersion: await getVersion("@ui5/project"), + fsVersion: await getVersion("@ui5/fs"), + }, + buildConfig, + version: project.getVersion(), + namespace: project.getNamespace(), + tags: getSortedTags(project) + }; + + if (buildManifest.versions.fsVersion !== builderFsVersion) { // Added in manifestVersion 0.2: // @ui5/project and @ui5/builder use different versions of @ui5/fs. // This should be mentioned in the build manifest: - metadata.buildManifest.versions.builderFsVersion = builderFsVersion; + buildManifest.versions.builderFsVersion = builderFsVersion; } + return buildManifest; +} - return metadata; +export async function createCacheKey(project, graph, buildConfig, taskRepository) { + const depInfo = collectDepInfo(graph, project); + const {builderVersion, fsVersion: builderFsVersion} = await taskRepository.getVersions(); + const projectVersion = await getVersion("@ui5/project"); + const fsVersion = await getVersion("@ui5/fs"); + + const key = `${builderVersion}-${projectVersion}-${fsVersion}-${builderFsVersion}-` + + `${JSON.stringify(buildConfig)}-${JSON.stringify(depInfo)}`; + const hash = crypto.createHash("sha256").update(key).digest("hex"); + + // Create a hash from the cache key + return `${project.getName()}-${project.getVersion()}-${hash}`; } diff --git a/packages/project/lib/graph/ProjectGraph.js b/packages/project/lib/graph/ProjectGraph.js index ba6967154e6..0d15174e3b3 100644 --- a/packages/project/lib/graph/ProjectGraph.js +++ b/packages/project/lib/graph/ProjectGraph.js @@ -284,6 +284,40 @@ class ProjectGraph { processDependency(projectName); return Array.from(dependencies); } + + getDependents(projectName) { + if (!this._projects.has(projectName)) { + throw new Error( + `Failed to get dependents for project ${projectName}: ` + + `Unable to find project in project graph`); + } + const dependents = []; + for (const [fromProjectName, adjacencies] of this._adjList) { + if (adjacencies.has(projectName)) { + dependents.push(fromProjectName); + } + } + return dependents; + } + + getTransitiveDependents(projectName) { + const dependents = new Set(); + if (!this._projects.has(projectName)) { + throw new Error( + `Failed to get transitive dependents for project ${projectName}: ` + + `Unable to find project in project graph`); + } + const addDependents = (projectName) => { + const projectDependents = this.getDependents(projectName); + projectDependents.forEach((dependent) => { + dependents.add(dependent); + addDependents(dependent); + }); + }; + addDependents(projectName); + return Array.from(dependents); + } + /** * Checks whether a dependency is optional or not. * Currently only used in tests. @@ -475,6 +509,54 @@ class ProjectGraph { })(); } + * traverseDependents(startName, includeStartModule = false) { + if (typeof startName === "boolean") { + includeStartModule = startName; + startName = undefined; + } + if (!startName) { + startName = this._rootProjectName; + } else if (!this.getProject(startName)) { + throw new Error(`Failed to start graph traversal: Could not find project ${startName} in project graph`); + } + + const queue = [{ + projectNames: [startName], + ancestors: [] + }]; + + const visited = Object.create(null); + + while (queue.length) { + const {projectNames, ancestors} = queue.shift(); // Get and remove first entry from queue + + for (const projectName of projectNames) { + this._checkCycle(ancestors, projectName); + if (visited[projectName]) { + continue; + } + + visited[projectName] = true; + + const newAncestors = [...ancestors, projectName]; + const dependents = this.getDependents(projectName); + + queue.push({ + projectNames: dependents, + ancestors: newAncestors + }); + + if (includeStartModule || projectName !== startName) { + // Do not yield the start module itself + yield { + project: this.getProject(projectName), + dependents + }; + } + } + } + } + /** * Join another project graph into this one. * Projects and extensions which already exist in this graph will cause an error to be thrown @@ -558,7 +640,8 @@ class ProjectGraph { dependencyIncludes, selfContained = false, cssVariables = false, jsdoc = false, createBuildManifest = false, includedTasks = [], excludedTasks = [], - outputStyle = OutputStyleEnum.Default + outputStyle = OutputStyleEnum.Default, + cacheDir, watch, }) { this.seal(); // Do not allow further changes to the graph if (this._built) { @@ -579,10 +662,11 @@ class ProjectGraph { includedTasks, excludedTasks, outputStyle, } }); - await builder.build({ + return await builder.build({ destPath, cleanDest, includedDependencies, excludedDependencies, dependencyIncludes, + cacheDir, watch, }); } diff --git a/packages/project/lib/specifications/ComponentProject.js b/packages/project/lib/specifications/ComponentProject.js index e40f8a9228b..34e1fd852ba 100644 --- a/packages/project/lib/specifications/ComponentProject.js +++ b/packages/project/lib/specifications/ComponentProject.js @@ -164,24 +164,26 @@ class ComponentProject extends Project { // return resourceFactory.createWorkspace({ // name: `Workspace for project ${this.getName()}`, // reader: this._getPlainReader(excludes), - // writer: this._getWriter().collection + // writer: this._createWriter().collection // }); // } - _getWriter() { + _createWriter() { // writer is always of style "buildtime" const namespaceWriter = resourceFactory.createAdapter({ + name: `Namespace writer for project ${this.getName()} (${this.getCurrentStage()} stage)`, virBasePath: "/", project: this }); const generalWriter = resourceFactory.createAdapter({ + name: `General writer for project ${this.getName()} (${this.getCurrentStage()} stage)`, virBasePath: "/", project: this }); const collection = resourceFactory.createWriterCollection({ - name: `Writers for project ${this.getName()}`, + name: `Writers for project ${this.getName()} (${this.getCurrentStage()} stage)`, writerMapping: { [`/resources/${this._namespace}/`]: namespaceWriter, [`/test-resources/${this._namespace}/`]: namespaceWriter, @@ -208,8 +210,13 @@ class ComponentProject extends Project { return reader; } - _addReadersFromWriter(style, readers, writer) { - const {namespaceWriter, generalWriter} = writer; + _addWriterToReaders(style, readers, writer) { + let {namespaceWriter, generalWriter} = writer; + if (!namespaceWriter || !generalWriter) { + // TODO: Too hacky + namespaceWriter = writer; + generalWriter = writer; + } if ((style === "runtime" || style === "dist") && this._isRuntimeNamespaced) { // If the project's type requires a namespace at runtime, the diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index 9c7c7e00f6a..5cdd01e6629 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -13,11 +13,15 @@ import {createWorkspace, createReaderCollectionPrioritized} from "@ui5/fs/resour * @hideconstructor */ class Project extends Specification { - #latestWriter; - #latestWorkspace; - #latestReader = new Map(); - #writerVersions = []; - #workspaceSealed = false; + #currentWriter; + #currentWorkspace; + #currentReader = new Map(); + #currentStage; + #currentVersion = 0; // Writer version (0 is reserved for a possible imported writer cache) + + #stages = [""]; // Stages in order of creation + #writers = new Map(); // Maps stage to a set of writer versions (possibly sparse array) + #workspaceSealed = true; // Project starts as being sealed. Needs to be unsealed using newVersion() constructor(parameters) { super(parameters); @@ -94,6 +98,14 @@ class Project extends Specification { throw new Error(`getSourcePath must be implemented by subclass ${this.constructor.name}`); } + getSourcePaths() { + throw new Error(`getSourcePaths must be implemented by subclass ${this.constructor.name}`); + } + + getVirtualPath() { + throw new Error(`getVirtualPath must be implemented by subclass ${this.constructor.name}`); + } + /** * Get the project's framework name configuration * @@ -261,37 +273,68 @@ class Project extends Specification { * @returns {@ui5/fs/ReaderCollection} A reader collection instance */ getReader({style = "buildtime"} = {}) { - let reader = this.#latestReader.get(style); + let reader = this.#currentReader.get(style); if (reader) { + // Use cached reader return reader; } - const readers = []; - this._addReadersFromWriter(style, readers, this.getWriter()); - readers.push(this._getStyledReader(style)); - reader = createReaderCollectionPrioritized({ - name: `Reader collection for project ${this.getName()}`, - readers - }); - this.#latestReader.set(style, reader); + // const readers = []; + // this._addWriterToReaders(style, readers, this.getWriter()); + // readers.push(this._getStyledReader(style)); + // reader = createReaderCollectionPrioritized({ + // name: `Reader collection for project ${this.getName()}`, + // readers + // }); + reader = this.#getReader(this.#currentStage, this.#currentVersion, style); + this.#currentReader.set(style, reader); return reader; } - getWriter() { - return this.#latestWriter || this.createNewWriterVersion(); + // getCacheReader({style = "buildtime"} = {}) { + // return this.#getReader(this.#currentStage, style, true); + // } + + getSourceReader(style = "buildtime") { + return this._getStyledReader(style); } - createNewWriterVersion() { - const writer = this._getWriter(); - this.#writerVersions.push(writer); - this.#latestWriter = writer; + #getWriter() { + if (this.#currentWriter) { + return this.#currentWriter; + } + + const stage = this.#currentStage; + const currentVersion = this.#currentVersion; - // Invalidate dependents - this.#latestWorkspace = null; - this.#latestReader = new Map(); + if (!this.#writers.has(stage)) { + this.#writers.set(stage, []); + } + const versions = this.#writers.get(stage); + let writer; + if (versions[currentVersion]) { + writer = versions[currentVersion]; + } else { + // Create new writer + writer = this._createWriter(); + versions[currentVersion] = writer; + } + this.#currentWriter = writer; return writer; } + // #createNewWriterStage(stageId) { + // const writer = this._createWriter(); + // this.#writers.set(stageId, writer); + // this.#currentWriter = writer; + + // // Invalidate dependents + // this.#currentWorkspace = null; + // this.#currentReader = new Map(); + + // return writer; + // } + /** * Get a [DuplexCollection]{@link @ui5/fs/DuplexCollection} for accessing and modifying a * project's resources. This is always of style buildtime. @@ -305,25 +348,209 @@ class Project extends Specification { getWorkspace() { if (this.#workspaceSealed) { throw new Error( - `Workspace of project ${this.getName()} has been sealed. Use method #getReader for read-only access`); + `Workspace of project ${this.getName()} has been sealed. This indicates that the project already ` + + `finished building and its content must not be modified further. ` + + `Use method 'getReader' for read-only access`); } - if (this.#latestWorkspace) { - return this.#latestWorkspace; + if (this.#currentWorkspace) { + return this.#currentWorkspace; } - const excludes = this.getBuilderResourcesExcludes(); // TODO: Do not apply in server context - const writer = this.getWriter(); - this.#latestWorkspace = createWorkspace({ - reader: this._getReader(excludes), + const writer = this.#getWriter(); + + // if (this.#stageCacheReaders.has(this.getCurrentStage())) { + // reader = createReaderCollectionPrioritized({ + // name: `Reader collection for project ${this.getName()} stage ${this.getCurrentStage()}`, + // readers: [ + // this.#stageCacheReaders.get(this.getCurrentStage()), + // reader, + // ] + // }); + // } + this.#currentWorkspace = createWorkspace({ + reader: this.getReader(), writer: writer.collection || writer }); - return this.#latestWorkspace; + return this.#currentWorkspace; } + // getWorkspaceForVersion(version) { + // return createWorkspace({ + // reader: this.#getReader(version), + // writer: this.#writerVersions[version].collection || this.#writerVersions[version] + // }); + // } + sealWorkspace() { this.#workspaceSealed = true; + this.useFinalStage(); + } + + newVersion() { + this.#workspaceSealed = false; + this.#currentVersion++; + this.useInitialStage(); + } + + revertToLastVersion() { + if (this.#currentVersion === 0) { + throw new Error(`Unable to revert to previous version: No previous version available`); + } + this.#currentVersion--; + this.useInitialStage(); + + // Remove writer version from all stages + for (const writerVersions of this.#writers.values()) { + if (writerVersions[this.#currentVersion]) { + delete writerVersions[this.#currentVersion]; + } + } + } + + #getReader(stage, version, style = "buildtime") { + const readers = []; + + // Add writers for previous stages as readers + const stageIdx = this.#stages.indexOf(stage); + if (stageIdx > 0) { // Stage 0 has no previous stage + // Collect writers from all preceding stages + for (let i = stageIdx - 1; i >= 0; i--) { + const stageWriters = this.#getWriters(this.#stages[i], version, style); + if (stageWriters) { + readers.push(stageWriters); + } + } + } + + // Always add source reader + readers.push(this._getStyledReader(style)); + + return createReaderCollectionPrioritized({ + name: `Reader collection for stage '${stage}' of project ${this.getName()}`, + readers: readers + }); + } + + useStage(stageId, newWriter = false) { + // if (newWriter && this.#writers.has(stageId)) { + // this.#writers.delete(stageId); + // } + if (stageId === this.#currentStage) { + return; + } + if (!this.#stages.includes(stageId)) { + // Add new stage + this.#stages.push(stageId); + } + + this.#currentStage = stageId; + + // Unset "current" reader/writer + this.#currentReader = new Map(); + this.#currentWriter = null; + this.#currentWorkspace = null; + } + + useInitialStage() { + this.useStage(""); + } + + useFinalStage() { + this.useStage(""); + } + + #getWriters(stage, version, style = "buildtime") { + const readers = []; + const stageWriters = this.#writers.get(stage); + if (!stageWriters?.length) { + return null; + } + for (let i = version; i >= 0; i--) { + if (!stageWriters[i]) { + // Writers is a sparse array, some stages might skip a version + continue; + } + this._addWriterToReaders(style, readers, stageWriters[i]); + } + + return createReaderCollectionPrioritized({ + name: `Collection of all writers for stage '${stage}', version ${version} of project ${this.getName()}`, + readers + }); + } + + getDeltaReader(stage) { + const readers = []; + const stageWriters = this.#writers.get(stage); + if (!stageWriters?.length) { + return null; + } + const version = this.#currentVersion; + for (let i = version; i >= 1; i--) { // Skip version 0 (possibly containing cached writers) + if (!stageWriters[i]) { + // Writers is a sparse array, some stages might skip a version + continue; + } + this._addWriterToReaders("buildtime", readers, stageWriters[i]); + } + + const reader = createReaderCollectionPrioritized({ + name: `Collection of new writers for stage '${stage}', version ${version} of project ${this.getName()}`, + readers + }); + + + // Condense writer versions (TODO: this step is optional but might improve memory consumption) + // this.#condenseVersions(reader); + return reader; + } + + // #condenseVersions(reader) { + // for (const stage of this.#stages) { + // const stageWriters = this.#writers.get(stage); + // if (!stageWriters) { + // continue; + // } + // const condensedWriter = this._createWriter(); + + // for (let i = 1; i < stageWriters.length; i++) { + // if (stageWriters[i]) { + + // } + // } + + // // eslint-disable-next-line no-sparse-arrays + // const newWriters = [, condensedWriter]; + // if (stageWriters[0]) { + // newWriters[0] = stageWriters[0]; + // } + // this.#writers.set(stage, newWriters); + // } + // } + + importCachedStages(stages) { + if (!this.#workspaceSealed) { + throw new Error(`Unable to import cached stages: Workspace is not sealed`); + } + for (const {stage, reader} of stages) { + if (!this.#stages.includes(stage)) { + this.#stages.push(stage); + } + if (reader) { + this.#writers.set(stage, [reader]); + } else { + this.#writers.set(stage, []); + } + } + this.#currentVersion = 0; + this.useFinalStage(); + } + + getCurrentStage() { + return this.#currentStage; } - _addReadersFromWriter(style, readers, writer) { + /* Overwritten in ComponentProject subclass */ + _addWriterToReaders(style, readers, writer) { readers.push(writer); } diff --git a/packages/project/lib/specifications/types/Application.js b/packages/project/lib/specifications/types/Application.js index 1dc17b4bc1c..44f39b4ef6d 100644 --- a/packages/project/lib/specifications/types/Application.js +++ b/packages/project/lib/specifications/types/Application.js @@ -45,6 +45,21 @@ class Application extends ComponentProject { return fsPath.join(this.getRootPath(), this._webappPath); } + getSourcePaths() { + return [this.getSourcePath()]; + } + + getVirtualPath(sourceFilePath) { + const sourcePath = this.getSourcePath(); + if (sourceFilePath.startsWith(sourcePath)) { + const relSourceFilePath = fsPath.relative(sourcePath, sourceFilePath); + return `/resources/${this._namespace}/${relSourceFilePath}`; + } + + throw new Error( + `Unable to convert source path ${sourceFilePath} to virtual path for project ${this.getName()}`); + } + /* === Resource Access === */ /** * Get a resource reader for the sources of the project (excluding any test resources) @@ -107,13 +122,13 @@ class Application extends ComponentProject { /** * @private * @param {object} config Configuration object - * @param {object} buildDescription Cache metadata object + * @param {object} buildManifest Cache metadata object */ - async _parseConfiguration(config, buildDescription) { - await super._parseConfiguration(config, buildDescription); + async _parseConfiguration(config, buildManifest) { + await super._parseConfiguration(config, buildManifest); - if (buildDescription) { - this._namespace = buildDescription.namespace; + if (buildManifest) { + this._namespace = buildManifest.namespace; return; } this._namespace = await this._getNamespace(); diff --git a/packages/project/lib/specifications/types/Library.js b/packages/project/lib/specifications/types/Library.js index d3d2059a055..e118f39e6b6 100644 --- a/packages/project/lib/specifications/types/Library.js +++ b/packages/project/lib/specifications/types/Library.js @@ -56,6 +56,39 @@ class Library extends ComponentProject { return fsPath.join(this.getRootPath(), this._srcPath); } + getSourcePaths() { + const paths = [this.getSourcePath()]; + if (this._testPathExists) { + paths.push(fsPath.join(this.getRootPath(), this._testPath)); + } + return paths; + } + + getVirtualPath(sourceFilePath) { + const sourcePath = this.getSourcePath(); + if (sourceFilePath.startsWith(sourcePath)) { + const relSourceFilePath = fsPath.relative(sourcePath, sourceFilePath); + let virBasePath = "/resources/"; + if (!this._isSourceNamespaced) { + virBasePath += `${this._namespace}/`; + } + return posixPath.join(virBasePath, relSourceFilePath); + } + + const testPath = fsPath.join(this.getRootPath(), this._testPath); + if (sourceFilePath.startsWith(testPath)) { + const relSourceFilePath = fsPath.relative(testPath, sourceFilePath); + let virBasePath = "/test-resources/"; + if (!this._isSourceNamespaced) { + virBasePath += `${this._namespace}/`; + } + return posixPath.join(virBasePath, relSourceFilePath); + } + + throw new Error( + `Unable to convert source path ${sourceFilePath} to virtual path for project ${this.getName()}`); + } + /* === Resource Access === */ /** * Get a resource reader for the sources of the project (excluding any test resources) @@ -156,13 +189,13 @@ class Library extends ComponentProject { /** * @private * @param {object} config Configuration object - * @param {object} buildDescription Cache metadata object + * @param {object} buildManifest Cache metadata object */ - async _parseConfiguration(config, buildDescription) { - await super._parseConfiguration(config, buildDescription); + async _parseConfiguration(config, buildManifest) { + await super._parseConfiguration(config, buildManifest); - if (buildDescription) { - this._namespace = buildDescription.namespace; + if (buildManifest) { + this._namespace = buildManifest.namespace; return; } diff --git a/packages/project/lib/specifications/types/Module.js b/packages/project/lib/specifications/types/Module.js index a59c464f94a..dcd3a9a2176 100644 --- a/packages/project/lib/specifications/types/Module.js +++ b/packages/project/lib/specifications/types/Module.js @@ -31,6 +31,12 @@ class Module extends Project { throw new Error(`Projects of type module have more than one source path`); } + getSourcePaths() { + return this._paths.map(({fsBasePath}) => { + return fsBasePath; + }); + } + /* === Resource Access === */ _getStyledReader(style) { @@ -50,7 +56,7 @@ class Module extends Project { // const excludes = this.getBuilderResourcesExcludes(); // const reader = this._getReader(excludes); - // const writer = this._getWriter(); + // const writer = this._createWriter(); // return resourceFactory.createWorkspace({ // reader, // writer @@ -76,7 +82,7 @@ class Module extends Project { }); } - _getWriter() { + _createWriter() { if (!this._writer) { this._writer = resourceFactory.createAdapter({ virBasePath: "/" diff --git a/packages/project/lib/specifications/types/ThemeLibrary.js b/packages/project/lib/specifications/types/ThemeLibrary.js index d4644c78885..9412975721e 100644 --- a/packages/project/lib/specifications/types/ThemeLibrary.js +++ b/packages/project/lib/specifications/types/ThemeLibrary.js @@ -39,6 +39,25 @@ class ThemeLibrary extends Project { return fsPath.join(this.getRootPath(), this._srcPath); } + getSourcePaths() { + return [this.getSourcePath()]; + } + + getVirtualPath(sourceFilePath) { + const sourcePath = this.getSourcePath(); + if (sourceFilePath.startsWith(sourcePath)) { + const relSourceFilePath = fsPath.relative(sourcePath, sourceFilePath); + let virBasePath = "/resources/"; + if (!this._isSourceNamespaced) { + virBasePath += `${this._namespace}/`; + } + return `${virBasePath}${relSourceFilePath}`; + } + + throw new Error( + `Unable to convert source path ${sourceFilePath} to virtual path for project ${this.getName()}`); + } + /* === Resource Access === */ _getStyledReader(style) { @@ -62,7 +81,7 @@ class ThemeLibrary extends Project { // const excludes = this.getBuilderResourcesExcludes(); // const reader = this._getReader(excludes); - // const writer = this._getWriter(); + // const writer = this._createWriter(); // return resourceFactory.createWorkspace({ // reader, // writer @@ -93,7 +112,7 @@ class ThemeLibrary extends Project { return reader; } - _getWriter() { + _createWriter() { if (!this._writer) { this._writer = resourceFactory.createAdapter({ virBasePath: "/", diff --git a/packages/project/test/lib/build/ProjectBuilder.js b/packages/project/test/lib/build/ProjectBuilder.js index 64b36ab85e9..548703e5e32 100644 --- a/packages/project/test/lib/build/ProjectBuilder.js +++ b/packages/project/test/lib/build/ProjectBuilder.js @@ -16,6 +16,8 @@ function getMockProject(type, id = "b") { getVersion: noop, getReader: () => "reader", getWorkspace: () => "workspace", + sealWorkspace: noop, + createNewWorkspaceVersion: noop, }; } diff --git a/packages/project/test/lib/build/TaskRunner.js b/packages/project/test/lib/build/TaskRunner.js index 84b46bb9bbe..a93b1eebc02 100644 --- a/packages/project/test/lib/build/TaskRunner.js +++ b/packages/project/test/lib/build/TaskRunner.js @@ -58,7 +58,9 @@ function getMockProject(type) { getCustomTasks: () => [], hasBuildManifest: () => false, getWorkspace: () => "workspace", - isFrameworkProject: () => false + isFrameworkProject: () => false, + sealWorkspace: noop, + createNewWorkspaceVersion: noop, }; } @@ -118,6 +120,10 @@ test.beforeEach(async (t) => { isLevelEnabled: sinon.stub().returns(true), }; + t.context.cache = { + setTasks: sinon.stub(), + }; + t.context.resourceFactory = { createReaderCollection: sinon.stub() .returns("reader collection") @@ -134,7 +140,7 @@ test.afterEach.always((t) => { }); test("Missing parameters", (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; t.throws(() => { new TaskRunner({ graph, @@ -152,6 +158,7 @@ test("Missing parameters", (t) => { taskUtil, taskRepository, log: projectBuildLogger, + cache, buildConfig }); }, { @@ -163,6 +170,7 @@ test("Missing parameters", (t) => { graph, taskRepository, log: projectBuildLogger, + cache, buildConfig }); }, { @@ -174,6 +182,7 @@ test("Missing parameters", (t) => { graph, taskUtil, log: projectBuildLogger, + cache, buildConfig }); }, { @@ -197,6 +206,7 @@ test("Missing parameters", (t) => { taskUtil, taskRepository, log: projectBuildLogger, + cache, }); }, { message: "TaskRunner: One or more mandatory parameters not provided" @@ -228,9 +238,9 @@ test("_initTasks: Project of type 'application'", async (t) => { }); test("_initTasks: Project of type 'library'", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskRunner = new TaskRunner({ - project: getMockProject("library"), graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project: getMockProject("library"), graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -254,13 +264,13 @@ test("_initTasks: Project of type 'library'", async (t) => { }); test("_initTasks: Project of type 'library' (framework project)", async (t) => { - const {graph, taskUtil, taskRepository, projectBuildLogger, TaskRunner} = t.context; + const {graph, taskUtil, taskRepository, projectBuildLogger, TaskRunner, cache} = t.context; const project = getMockProject("library"); project.isFrameworkProject = () => true; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -284,9 +294,9 @@ test("_initTasks: Project of type 'library' (framework project)", async (t) => { }); test("_initTasks: Project of type 'theme-library'", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskRunner = new TaskRunner({ - project: getMockProject("theme-library"), graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project: getMockProject("theme-library"), graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -300,13 +310,13 @@ test("_initTasks: Project of type 'theme-library'", async (t) => { }); test("_initTasks: Project of type 'theme-library' (framework project)", async (t) => { - const {graph, taskUtil, taskRepository, projectBuildLogger, TaskRunner} = t.context; + const {graph, taskUtil, taskRepository, projectBuildLogger, cache, TaskRunner} = t.context; const project = getMockProject("theme-library"); project.isFrameworkProject = () => true; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -320,9 +330,9 @@ test("_initTasks: Project of type 'theme-library' (framework project)", async (t }); test("_initTasks: Project of type 'module'", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskRunner = new TaskRunner({ - project: getMockProject("module"), graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project: getMockProject("module"), graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -330,9 +340,9 @@ test("_initTasks: Project of type 'module'", async (t) => { }); test("_initTasks: Unknown project type", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskRunner = new TaskRunner({ - project: getMockProject("pony"), graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project: getMockProject("pony"), graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); const err = await t.throwsAsync(taskRunner._initTasks()); @@ -340,14 +350,14 @@ test("_initTasks: Unknown project type", async (t) => { }); test("_initTasks: Custom tasks", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("application"); project.getCustomTasks = () => [ {name: "myTask", afterTask: "minify"}, {name: "myOtherTask", beforeTask: "replaceVersion"} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); t.deepEqual(taskRunner._taskExecutionOrder, [ @@ -371,14 +381,14 @@ test("_initTasks: Custom tasks", async (t) => { }); test("_initTasks: Custom tasks with no standard tasks", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("module"); project.getCustomTasks = () => [ {name: "myTask"}, {name: "myOtherTask", beforeTask: "myTask"} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); t.deepEqual(taskRunner._taskExecutionOrder, [ @@ -388,14 +398,14 @@ test("_initTasks: Custom tasks with no standard tasks", async (t) => { }); test("_initTasks: Custom tasks with no standard tasks and second task defining no before-/afterTask", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("module"); project.getCustomTasks = () => [ {name: "myTask"}, {name: "myOtherTask"} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); const err = await t.throwsAsync(async () => { await taskRunner._initTasks(); @@ -407,13 +417,13 @@ test("_initTasks: Custom tasks with no standard tasks and second task defining n }); test("_initTasks: Custom tasks with both, before- and afterTask reference", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("application"); project.getCustomTasks = () => [ {name: "myTask", beforeTask: "minify", afterTask: "replaceVersion"} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); const err = await t.throwsAsync(async () => { await taskRunner._initTasks(); @@ -425,13 +435,13 @@ test("_initTasks: Custom tasks with both, before- and afterTask reference", asyn }); test("_initTasks: Custom tasks with no before-/afterTask reference", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("application"); project.getCustomTasks = () => [ {name: "myTask"} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); const err = await t.throwsAsync(async () => { await taskRunner._initTasks(); @@ -443,13 +453,13 @@ test("_initTasks: Custom tasks with no before-/afterTask reference", async (t) = }); test("_initTasks: Custom tasks without name", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("application"); project.getCustomTasks = () => [ {name: ""} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); const err = await t.throwsAsync(async () => { await taskRunner._initTasks(); @@ -460,13 +470,13 @@ test("_initTasks: Custom tasks without name", async (t) => { }); test("_initTasks: Custom task with name of standard tasks", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("application"); project.getCustomTasks = () => [ {name: "replaceVersion", afterTask: "minify"} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); const err = await t.throwsAsync(async () => { await taskRunner._initTasks(); @@ -478,7 +488,7 @@ test("_initTasks: Custom task with name of standard tasks", async (t) => { }); test("_initTasks: Multiple custom tasks with same name", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("application"); project.getCustomTasks = () => [ {name: "myTask", afterTask: "minify"}, @@ -486,7 +496,7 @@ test("_initTasks: Multiple custom tasks with same name", async (t) => { {name: "myTask", afterTask: "minify"} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); t.deepEqual(taskRunner._taskExecutionOrder, [ @@ -511,13 +521,13 @@ test("_initTasks: Multiple custom tasks with same name", async (t) => { }); test("_initTasks: Custom tasks with unknown beforeTask", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("application"); project.getCustomTasks = () => [ {name: "myTask", beforeTask: "unknownTask"} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); const err = await t.throwsAsync(async () => { await taskRunner._initTasks(); @@ -529,13 +539,13 @@ test("_initTasks: Custom tasks with unknown beforeTask", async (t) => { }); test("_initTasks: Custom tasks with unknown afterTask", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("application"); project.getCustomTasks = () => [ {name: "myTask", afterTask: "unknownTask"} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); const err = await t.throwsAsync(async () => { await taskRunner._initTasks(); @@ -547,14 +557,14 @@ test("_initTasks: Custom tasks with unknown afterTask", async (t) => { }); test("_initTasks: Custom tasks is unknown", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; graph.getExtension.returns(undefined); const project = getMockProject("application"); project.getCustomTasks = () => [ {name: "myTask", afterTask: "minify"} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); const err = await t.throwsAsync(async () => { await taskRunner._initTasks(); @@ -566,13 +576,13 @@ test("_initTasks: Custom tasks is unknown", async (t) => { }); test("_initTasks: Custom tasks with removed beforeTask", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("application"); project.getCustomTasks = () => [ {name: "myTask", beforeTask: "removedTask"} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); const err = await t.throwsAsync(async () => { await taskRunner._initTasks(); @@ -585,10 +595,10 @@ test("_initTasks: Custom tasks with removed beforeTask", async (t) => { }); test("_initTasks: Create dependencies reader for all dependencies", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, resourceFactory, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, resourceFactory, projectBuildLogger, cache} = t.context; const project = getMockProject("application"); const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); t.is(graph.traverseBreadthFirst.callCount, 1, "ProjectGraph#traverseBreadthFirst called once"); @@ -631,7 +641,7 @@ test("_initTasks: Create dependencies reader for all dependencies", async (t) => }); test("Custom task is called correctly", async (t) => { - const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskStub = sinon.stub(); const specVersionGteStub = sinon.stub().returns(false); const mockSpecVersion = { @@ -652,7 +662,7 @@ test("Custom task is called correctly", async (t) => { ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -692,7 +702,7 @@ test("Custom task is called correctly", async (t) => { }); test("Custom task with legacy spec version", async (t) => { - const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskStub = sinon.stub(); const specVersionGteStub = sinon.stub().returns(false); const mockSpecVersion = { @@ -712,7 +722,7 @@ test("Custom task with legacy spec version", async (t) => { ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -752,7 +762,7 @@ test("Custom task with legacy spec version", async (t) => { }); test("Custom task with legacy spec version and requiredDependenciesCallback", async (t) => { - const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskStub = sinon.stub(); const specVersionGteStub = sinon.stub().returns(false); const mockSpecVersion = { @@ -773,7 +783,7 @@ test("Custom task with legacy spec version and requiredDependenciesCallback", as ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -824,7 +834,7 @@ test("Custom task with legacy spec version and requiredDependenciesCallback", as }); test("Custom task with specVersion 3.0", async (t) => { - const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskStub = sinon.stub(); const specVersionGteStub = sinon.stub().returns(true); const mockSpecVersion = { @@ -848,7 +858,7 @@ test("Custom task with specVersion 3.0", async (t) => { ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -921,7 +931,7 @@ test("Custom task with specVersion 3.0", async (t) => { }); test("Custom task with specVersion 3.0 and no requiredDependenciesCallback", async (t) => { - const {sinon, graph, taskUtil, taskRepository, projectBuildLogger, TaskRunner} = t.context; + const {sinon, graph, taskUtil, taskRepository, projectBuildLogger, cache, TaskRunner} = t.context; const taskStub = sinon.stub(); const specVersionGteStub = sinon.stub().returns(true); const mockSpecVersion = { @@ -944,7 +954,7 @@ test("Custom task with specVersion 3.0 and no requiredDependenciesCallback", asy ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -982,7 +992,7 @@ test("Custom task with specVersion 3.0 and no requiredDependenciesCallback", asy }); test("Multiple custom tasks with same name are called correctly", async (t) => { - const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskStubA = sinon.stub(); const taskStubB = sinon.stub(); const taskStubC = sinon.stub(); @@ -1042,7 +1052,7 @@ test("Multiple custom tasks with same name are called correctly", async (t) => { {name: "myTask", afterTask: "myTask", configuration: "bird"} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -1184,7 +1194,7 @@ test("Multiple custom tasks with same name are called correctly", async (t) => { }); test("Custom task: requiredDependenciesCallback returns unknown dependency", async (t) => { - const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskStub = sinon.stub(); const specVersionGteStub = sinon.stub().returns(true); const mockSpecVersion = { @@ -1209,7 +1219,7 @@ test("Custom task: requiredDependenciesCallback returns unknown dependency", asy ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await t.throwsAsync(taskRunner._initTasks(), { message: @@ -1221,7 +1231,7 @@ test("Custom task: requiredDependenciesCallback returns unknown dependency", asy test("Custom task: requiredDependenciesCallback returns Array instead of Set", async (t) => { - const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskStub = sinon.stub(); const specVersionGteStub = sinon.stub().returns(true); const mockSpecVersion = { @@ -1246,7 +1256,7 @@ test("Custom task: requiredDependenciesCallback returns Array instead of Set", a ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await t.throwsAsync(taskRunner._initTasks(), { message: @@ -1256,7 +1266,7 @@ test("Custom task: requiredDependenciesCallback returns Array instead of Set", a }); test("Custom task attached to a disabled task", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, sinon, customTask} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache, sinon, customTask} = t.context; const project = getMockProject("application"); const customTaskFnStub = sinon.stub(); @@ -1269,7 +1279,7 @@ test("Custom task attached to a disabled task", async (t) => { customTask.getTask = () => customTaskFnStub; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner.runTasks(); @@ -1296,7 +1306,7 @@ test("Custom task attached to a disabled task", async (t) => { }); test.serial("_addTask", async (t) => { - const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskStub = sinon.stub(); taskRepository.getTask.withArgs("standardTask").resolves({ @@ -1305,7 +1315,7 @@ test.serial("_addTask", async (t) => { const project = getMockProject("module"); const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -1338,12 +1348,12 @@ test.serial("_addTask", async (t) => { }); test.serial("_addTask with options", async (t) => { - const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {sinon, graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskStub = sinon.stub(); const project = getMockProject("module"); const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -1384,10 +1394,10 @@ test.serial("_addTask with options", async (t) => { }); test("_addTask: Duplicate task", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("module"); const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -1405,10 +1415,10 @@ test("_addTask: Duplicate task", async (t) => { }); test("_addTask: Task already added to execution order", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("module"); const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); @@ -1424,13 +1434,13 @@ test("_addTask: Task already added to execution order", async (t) => { }); test("getRequiredDependencies: Custom Task", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("module"); project.getCustomTasks = () => [ {name: "myTask"} ]; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); t.deepEqual(await taskRunner.getRequiredDependencies(), new Set([]), "Project with custom task >= specVersion 3.0 and no requiredDependenciesCallback " + @@ -1438,11 +1448,11 @@ test("getRequiredDependencies: Custom Task", async (t) => { }); test("getRequiredDependencies: Default application", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("application"); project.getBundles = () => []; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); t.deepEqual(await taskRunner.getRequiredDependencies(), new Set([]), "Default application project does not require dependencies"); @@ -1460,44 +1470,44 @@ test("getRequiredDependencies: Default component", async (t) => { }); test("getRequiredDependencies: Default library", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("library"); project.getBundles = () => []; const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); t.deepEqual(await taskRunner.getRequiredDependencies(), new Set(["dep.a", "dep.b"]), "Default library project requires dependencies"); }); test("getRequiredDependencies: Default theme-library", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("theme-library"); const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); t.deepEqual(await taskRunner.getRequiredDependencies(), new Set(["dep.a", "dep.b"]), "Default theme-library project requires dependencies"); }); test("getRequiredDependencies: Default module", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const project = getMockProject("module"); const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); t.deepEqual(await taskRunner.getRequiredDependencies(), new Set([]), "Default module project does not require dependencies"); }); test("_createDependenciesReader", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, resourceFactory, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, resourceFactory, projectBuildLogger, cache} = t.context; const project = getMockProject("module"); const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); graph.traverseBreadthFirst.reset(); // Ignore the call in initTask @@ -1554,11 +1564,11 @@ test("_createDependenciesReader", async (t) => { }); test("_createDependenciesReader: All dependencies required", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, resourceFactory, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, resourceFactory, projectBuildLogger, cache} = t.context; const project = getMockProject("module"); const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); graph.traverseBreadthFirst.reset(); // Ignore the call in initTask @@ -1571,11 +1581,11 @@ test("_createDependenciesReader: All dependencies required", async (t) => { }); test("_createDependenciesReader: No dependencies required", async (t) => { - const {graph, taskUtil, taskRepository, TaskRunner, resourceFactory, projectBuildLogger} = t.context; + const {graph, taskUtil, taskRepository, TaskRunner, resourceFactory, projectBuildLogger, cache} = t.context; const project = getMockProject("module"); const taskRunner = new TaskRunner({ - project, graph, taskUtil, taskRepository, log: projectBuildLogger, buildConfig + project, graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); graph.traverseBreadthFirst.reset(); // Ignore the call in initTask diff --git a/packages/project/test/lib/build/helpers/ProjectBuildContext.js b/packages/project/test/lib/build/helpers/ProjectBuildContext.js index 03f9a568325..74b06d49927 100644 --- a/packages/project/test/lib/build/helpers/ProjectBuildContext.js +++ b/packages/project/test/lib/build/helpers/ProjectBuildContext.js @@ -1,6 +1,7 @@ import test from "ava"; import sinon from "sinon"; import esmock from "esmock"; +import ProjectBuildCache from "../../../../lib/build/helpers/ProjectBuildCache.js"; import ResourceTagCollection from "@ui5/fs/internal/ResourceTagCollection"; test.beforeEach((t) => { @@ -315,7 +316,7 @@ test("getTaskUtil", (t) => { }); test.serial("getTaskRunner", async (t) => { - t.plan(3); + t.plan(4); const project = { getName: () => "project", getType: () => "type", @@ -325,10 +326,13 @@ test.serial("getTaskRunner", async (t) => { constructor(params) { t.true(params.log instanceof ProjectBuildLogger, "TaskRunner receives an instance of ProjectBuildLogger"); params.log = "log"; // replace log instance with string for deep comparison + t.true(params.cache instanceof ProjectBuildCache, "TaskRunner receives an instance of ProjectBuildCache"); + params.cache = "cache"; // replace cache instance with string for deep comparison t.deepEqual(params, { graph: "graph", project: project, log: "log", + cache: "cache", taskUtil: "taskUtil", taskRepository: "taskRepository", buildConfig: "buildConfig" From 3a33579f87438757d48add3ca95f73c0c718beff Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 18 Nov 2025 16:03:17 +0100 Subject: [PATCH 007/110] refactor(cli): Use cache in ui5 build Cherry-picked from: https://github.com/SAP/ui5-cli/commit/d29ead8326c43690c7c792bb15ff41402a3d9f25 JIRA: CPOUI5FOUNDATION-1174 --- packages/cli/lib/cli/commands/build.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/cli/lib/cli/commands/build.js b/packages/cli/lib/cli/commands/build.js index df93ac5a12e..31e7b56062c 100644 --- a/packages/cli/lib/cli/commands/build.js +++ b/packages/cli/lib/cli/commands/build.js @@ -1,4 +1,5 @@ import baseMiddleware from "../middlewares/base.js"; +import path from "node:path"; const build = { command: "build", @@ -173,6 +174,7 @@ async function handleBuild(argv) { const buildSettings = graph.getRoot().getBuilderSettings() || {}; await graph.build({ graph, + cacheDir: path.join(graph.getRoot().getRootPath(), ".ui5-cache"), destPath: argv.dest, cleanDest: argv["clean-dest"], createBuildManifest: argv["create-build-manifest"], From eecbcb372063e3007b6a48751eabaaa902048670 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Mon, 24 Nov 2025 17:06:48 +0100 Subject: [PATCH 008/110] refactor(project): Use cacache --- package-lock.json | 2 ++ packages/project/package.json | 2 ++ 2 files changed, 4 insertions(+) diff --git a/package-lock.json b/package-lock.json index 923f496d358..69941cb1d95 100644 --- a/package-lock.json +++ b/package-lock.json @@ -21290,6 +21290,7 @@ "@ui5/logger": "^5.0.0-alpha.2", "ajv": "^6.12.6", "ajv-errors": "^1.0.1", + "cacache": "^20.0.3", "chalk": "^5.6.2", "escape-string-regexp": "^5.0.0", "globby": "^14.1.0", @@ -21304,6 +21305,7 @@ "read-pkg": "^9.0.1", "resolve": "^1.22.10", "semver": "^7.7.2", + "ssri": "^13.0.0", "xml2js": "^0.6.2", "yesno": "^0.4.0" }, diff --git a/packages/project/package.json b/packages/project/package.json index b75e62d845c..a1b73ef2fc4 100644 --- a/packages/project/package.json +++ b/packages/project/package.json @@ -62,6 +62,7 @@ "@ui5/logger": "^5.0.0-alpha.2", "ajv": "^6.12.6", "ajv-errors": "^1.0.1", + "cacache": "^20.0.3", "chalk": "^5.6.2", "escape-string-regexp": "^5.0.0", "globby": "^14.1.0", @@ -76,6 +77,7 @@ "read-pkg": "^9.0.1", "resolve": "^1.22.10", "semver": "^7.7.2", + "ssri": "^13.0.0", "xml2js": "^0.6.2", "yesno": "^0.4.0" }, From 0aa4e2645cff0a9d0ae91a85e9eca9c67d8b89e6 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Fri, 28 Nov 2025 10:12:39 +0100 Subject: [PATCH 009/110] refactor(project): Add cache manager --- .../project/lib/build/cache/CacheManager.js | 28 +++++++++++++++++++ 1 file changed, 28 insertions(+) create mode 100644 packages/project/lib/build/cache/CacheManager.js diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js new file mode 100644 index 00000000000..138b0d8d373 --- /dev/null +++ b/packages/project/lib/build/cache/CacheManager.js @@ -0,0 +1,28 @@ +import cacache from "cacache"; + +export class CacheManager { + constructor(cacheDir) { + this._cacheDir = cacheDir; + } + + async get(cacheKey) { + try { + const result = await cacache.get(this._cacheDir, cacheKey); + return JSON.parse(result.data.toString("utf-8")); + } catch (err) { + if (err.code === "ENOENT" || err.code === "EINTEGRITY") { + // Cache miss + return null; + } + throw err; + } + } + + async put(cacheKey, data) { + await cacache.put(this._cacheDir, cacheKey, data); + } + + async putStream(cacheKey, stream) { + await cacache.put.stream(this._cacheDir, cacheKey, stream); + } +} From 0f1f0f4d7dc874da5886b967024580d583ba12ab Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Thu, 27 Nov 2025 10:40:01 +0100 Subject: [PATCH 010/110] refactor(fs): Refactor Resource internals * Improve handling for concurrent resource access and modifications, especially when buffering streams. * Deprecate getStatInfo in favor of dedicated getSize, isDirectory, getLastModified methods. * Deprecate synchronous getStream in favor of getStreamAsync and modifyStream, allowing for atomic modification of resource content * Generate Resource hash using ssri --- package-lock.json | 4162 +---------------- packages/fs/lib/Resource.js | 695 ++- packages/fs/lib/ResourceFacade.js | 70 +- packages/fs/package.json | 4 +- packages/fs/test/lib/Resource.js | 1220 ++++- packages/fs/test/lib/ResourceFacade.js | 3 +- .../fs/test/lib/adapters/FileSystem_write.js | 6 +- 7 files changed, 2004 insertions(+), 4156 deletions(-) diff --git a/package-lock.json b/package-lock.json index 69941cb1d95..5b346d2bc71 100644 --- a/package-lock.json +++ b/package-lock.json @@ -79,8 +79,6 @@ }, "internal/documentation/node_modules/@types/node": { "version": "22.19.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-22.19.1.tgz", - "integrity": "sha512-LCCV0HdSZZZb34qifBsyWlUmok6W7ouER+oQIGBScS8EsZsQbrtFTUrDX4hOl+CS6p7cnNC4td+qrSVGSCTUfQ==", "license": "MIT", "dependencies": { "undici-types": "~6.21.0" @@ -109,8 +107,6 @@ }, "internal/shrinkwrap-extractor/node_modules/@npmcli/arborist": { "version": "9.1.7", - "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-9.1.7.tgz", - "integrity": "sha512-Qz/PbocuzbIk8T8+92zoI5Yt3mqYaCUgUxSQgMcJOxA4PsMOlExamXmn6Q+3TOyqBepXTszsWtuO5FCk7wzajg==", "license": "ISC", "dependencies": { "@isaacs/string-locale-compare": "^1.1.0", @@ -156,8 +152,6 @@ }, "internal/shrinkwrap-extractor/node_modules/@npmcli/arborist/node_modules/proc-log": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.0.0.tgz", - "integrity": "sha512-KG/XsTDN901PNfPfAMmj6N/Ywg9tM+bHK8pAz+27fS4N4Pcr+4zoYBOcGSBu6ceXYNPxkLpa4ohtfxV1XcLAfA==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -182,8 +176,6 @@ }, "internal/shrinkwrap-extractor/node_modules/@npmcli/fs": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-4.0.0.tgz", - "integrity": "sha512-/xGlezI6xfGO9NwuJlnwz/K14qD1kCSAGtacBHnGzeAIuJGazcp45KP5NuyARXoKb7cwulAGWVsbeSxdG/cb0Q==", "license": "ISC", "dependencies": { "semver": "^7.3.5" @@ -194,8 +186,6 @@ }, "internal/shrinkwrap-extractor/node_modules/@npmcli/map-workspaces": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-5.0.3.tgz", - "integrity": "sha512-o2grssXo1e774E5OtEwwrgoszYRh0lqkJH+Pb9r78UcqdGJRDRfhpM8DvZPjzNLLNYeD/rNbjOKM3Ss5UABROw==", "license": "ISC", "dependencies": { "@npmcli/name-from-folder": "^4.0.0", @@ -209,8 +199,6 @@ }, "internal/shrinkwrap-extractor/node_modules/walk-up-path": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-4.0.0.tgz", - "integrity": "sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==", "license": "ISC", "engines": { "node": "20 || >=22" @@ -218,8 +206,6 @@ }, "node_modules/@75lb/deep-merge": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/@75lb/deep-merge/-/deep-merge-1.1.2.tgz", - "integrity": "sha512-08K9ou5VNbheZFxM5tDWoqjA3ImC50DiuuJ2tj1yEPRfkp8lLLg6XAaJ4On+a0yAXor/8ay5gHnAIshRM44Kpw==", "dev": true, "license": "MIT", "dependencies": { @@ -232,14 +218,10 @@ }, "node_modules/@adobe/css-tools": { "version": "4.4.4", - "resolved": "https://registry.npmjs.org/@adobe/css-tools/-/css-tools-4.4.4.tgz", - "integrity": "sha512-Elp+iwUx5rN5+Y8xLt5/GRoG20WGoDCQ/1Fb+1LiGtvwbDavuSk0jhD/eZdckHAuzcDzccnkv+rEjyWfRx18gg==", "license": "MIT" }, "node_modules/@algolia/abtesting": { "version": "1.10.0", - "resolved": "https://registry.npmjs.org/@algolia/abtesting/-/abtesting-1.10.0.tgz", - "integrity": "sha512-mQT3jwuTgX8QMoqbIR7mPlWkqQqBPQaPabQzm37xg2txMlaMogK/4hCiiESGdg39MlHZOVHeV+0VJuE7f5UK8A==", "license": "MIT", "dependencies": { "@algolia/client-common": "5.44.0", @@ -253,8 +235,6 @@ }, "node_modules/@algolia/autocomplete-core": { "version": "1.17.7", - "resolved": "https://registry.npmjs.org/@algolia/autocomplete-core/-/autocomplete-core-1.17.7.tgz", - "integrity": "sha512-BjiPOW6ks90UKl7TwMv7oNQMnzU+t/wk9mgIDi6b1tXpUek7MW0lbNOUHpvam9pe3lVCf4xPFT+lK7s+e+fs7Q==", "license": "MIT", "dependencies": { "@algolia/autocomplete-plugin-algolia-insights": "1.17.7", @@ -263,8 +243,6 @@ }, "node_modules/@algolia/autocomplete-plugin-algolia-insights": { "version": "1.17.7", - "resolved": "https://registry.npmjs.org/@algolia/autocomplete-plugin-algolia-insights/-/autocomplete-plugin-algolia-insights-1.17.7.tgz", - "integrity": "sha512-Jca5Ude6yUOuyzjnz57og7Et3aXjbwCSDf/8onLHSQgw1qW3ALl9mrMWaXb5FmPVkV3EtkD2F/+NkT6VHyPu9A==", "license": "MIT", "dependencies": { "@algolia/autocomplete-shared": "1.17.7" @@ -275,8 +253,6 @@ }, "node_modules/@algolia/autocomplete-preset-algolia": { "version": "1.17.7", - "resolved": "https://registry.npmjs.org/@algolia/autocomplete-preset-algolia/-/autocomplete-preset-algolia-1.17.7.tgz", - "integrity": "sha512-ggOQ950+nwbWROq2MOCIL71RE0DdQZsceqrg32UqnhDz8FlO9rL8ONHNsI2R1MH0tkgVIDKI/D0sMiUchsFdWA==", "license": "MIT", "dependencies": { "@algolia/autocomplete-shared": "1.17.7" @@ -288,8 +264,6 @@ }, "node_modules/@algolia/autocomplete-shared": { "version": "1.17.7", - "resolved": "https://registry.npmjs.org/@algolia/autocomplete-shared/-/autocomplete-shared-1.17.7.tgz", - "integrity": "sha512-o/1Vurr42U/qskRSuhBH+VKxMvkkUVTLU6WZQr+L5lGZZLYWyhdzWjW0iGXY7EkwRTjBqvN2EsR81yCTGV/kmg==", "license": "MIT", "peerDependencies": { "@algolia/client-search": ">= 4.9.1 < 6", @@ -298,8 +272,6 @@ }, "node_modules/@algolia/client-abtesting": { "version": "5.44.0", - "resolved": "https://registry.npmjs.org/@algolia/client-abtesting/-/client-abtesting-5.44.0.tgz", - "integrity": "sha512-KY5CcrWhRTUo/lV7KcyjrZkPOOF9bjgWpMj9z98VA+sXzVpZtkuskBLCKsWYFp2sbwchZFTd3wJM48H0IGgF7g==", "license": "MIT", "dependencies": { "@algolia/client-common": "5.44.0", @@ -313,8 +285,6 @@ }, "node_modules/@algolia/client-analytics": { "version": "5.44.0", - "resolved": "https://registry.npmjs.org/@algolia/client-analytics/-/client-analytics-5.44.0.tgz", - "integrity": "sha512-LKOCE8S4ewI9bN3ot9RZoYASPi8b78E918/DVPW3HHjCMUe6i+NjbNG6KotU4RpP6AhRWZjjswbOkWelUO+OoA==", "license": "MIT", "dependencies": { "@algolia/client-common": "5.44.0", @@ -328,8 +298,6 @@ }, "node_modules/@algolia/client-common": { "version": "5.44.0", - "resolved": "https://registry.npmjs.org/@algolia/client-common/-/client-common-5.44.0.tgz", - "integrity": "sha512-1yyJm4OYC2cztbS28XYVWwLXdwpLsMG4LoZLOltVglQ2+hc/i9q9fUDZyjRa2Bqt4DmkIfezagfMrokhyH4uxQ==", "license": "MIT", "engines": { "node": ">= 14.0.0" @@ -337,8 +305,6 @@ }, "node_modules/@algolia/client-insights": { "version": "5.44.0", - "resolved": "https://registry.npmjs.org/@algolia/client-insights/-/client-insights-5.44.0.tgz", - "integrity": "sha512-wVQWK6jYYsbEOjIMI+e5voLGPUIbXrvDj392IckXaCPvQ6vCMTXakQqOYCd+znQdL76S+3wHDo77HZWiAYKrtA==", "license": "MIT", "dependencies": { "@algolia/client-common": "5.44.0", @@ -352,8 +318,6 @@ }, "node_modules/@algolia/client-personalization": { "version": "5.44.0", - "resolved": "https://registry.npmjs.org/@algolia/client-personalization/-/client-personalization-5.44.0.tgz", - "integrity": "sha512-lkgRjOjOkqmIkebHjHpU9rLJcJNUDMm+eVSW/KJQYLjGqykEZxal+nYJJTBbLceEU2roByP/+27ZmgIwCdf0iA==", "license": "MIT", "dependencies": { "@algolia/client-common": "5.44.0", @@ -367,8 +331,6 @@ }, "node_modules/@algolia/client-query-suggestions": { "version": "5.44.0", - "resolved": "https://registry.npmjs.org/@algolia/client-query-suggestions/-/client-query-suggestions-5.44.0.tgz", - "integrity": "sha512-sYfhgwKu6NDVmZHL1WEKVLsOx/jUXCY4BHKLUOcYa8k4COCs6USGgz6IjFkUf+niwq8NCECMmTC4o/fVQOalsA==", "license": "MIT", "dependencies": { "@algolia/client-common": "5.44.0", @@ -382,8 +344,6 @@ }, "node_modules/@algolia/client-search": { "version": "5.44.0", - "resolved": "https://registry.npmjs.org/@algolia/client-search/-/client-search-5.44.0.tgz", - "integrity": "sha512-/FRKUM1G4xn3vV8+9xH1WJ9XknU8rkBGlefruq9jDhYUAvYozKimhrmC2pRqw/RyHhPivmgZCRuC8jHP8piz4Q==", "license": "MIT", "dependencies": { "@algolia/client-common": "5.44.0", @@ -397,8 +357,6 @@ }, "node_modules/@algolia/ingestion": { "version": "1.44.0", - "resolved": "https://registry.npmjs.org/@algolia/ingestion/-/ingestion-1.44.0.tgz", - "integrity": "sha512-5+S5ynwMmpTpCLXGjTDpeIa81J+R4BLH0lAojOhmeGSeGEHQTqacl/4sbPyDTcidvnWhaqtyf8m42ue6lvISAw==", "license": "MIT", "dependencies": { "@algolia/client-common": "5.44.0", @@ -412,8 +370,6 @@ }, "node_modules/@algolia/monitoring": { "version": "1.44.0", - "resolved": "https://registry.npmjs.org/@algolia/monitoring/-/monitoring-1.44.0.tgz", - "integrity": "sha512-xhaTN8pXJjR6zkrecg4Cc9YZaQK2LKm2R+LkbAq+AYGBCWJxtSGlNwftozZzkUyq4AXWoyoc0x2SyBtq5LRtqQ==", "license": "MIT", "dependencies": { "@algolia/client-common": "5.44.0", @@ -427,8 +383,6 @@ }, "node_modules/@algolia/recommend": { "version": "5.44.0", - "resolved": "https://registry.npmjs.org/@algolia/recommend/-/recommend-5.44.0.tgz", - "integrity": "sha512-GNcite/uOIS7wgRU1MT7SdNIupGSW+vbK9igIzMePvD2Dl8dy0O3urKPKIbTuZQqiVH1Cb84y5cgLvwNrdCj/Q==", "license": "MIT", "dependencies": { "@algolia/client-common": "5.44.0", @@ -442,8 +396,6 @@ }, "node_modules/@algolia/requester-browser-xhr": { "version": "5.44.0", - "resolved": "https://registry.npmjs.org/@algolia/requester-browser-xhr/-/requester-browser-xhr-5.44.0.tgz", - "integrity": "sha512-YZHBk72Cd7pcuNHzbhNzF/FbbYszlc7JhZlDyQAchnX5S7tcemSS96F39Sy8t4O4WQLpFvUf1MTNedlitWdOsQ==", "license": "MIT", "dependencies": { "@algolia/client-common": "5.44.0" @@ -454,8 +406,6 @@ }, "node_modules/@algolia/requester-fetch": { "version": "5.44.0", - "resolved": "https://registry.npmjs.org/@algolia/requester-fetch/-/requester-fetch-5.44.0.tgz", - "integrity": "sha512-B9WHl+wQ7uf46t9cq+vVM/ypVbOeuldVDq9OtKsX2ApL2g/htx6ImB9ugDOOJmB5+fE31/XPTuCcYz/j03+idA==", "license": "MIT", "dependencies": { "@algolia/client-common": "5.44.0" @@ -466,8 +416,6 @@ }, "node_modules/@algolia/requester-node-http": { "version": "5.44.0", - "resolved": "https://registry.npmjs.org/@algolia/requester-node-http/-/requester-node-http-5.44.0.tgz", - "integrity": "sha512-MULm0qeAIk4cdzZ/ehJnl1o7uB5NMokg83/3MKhPq0Pk7+I0uELGNbzIfAkvkKKEYcHALemKdArtySF9eKzh/A==", "license": "MIT", "dependencies": { "@algolia/client-common": "5.44.0" @@ -478,8 +426,6 @@ }, "node_modules/@alloc/quick-lru": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/@alloc/quick-lru/-/quick-lru-5.2.0.tgz", - "integrity": "sha512-UrcABB+4bUrFABwbluTIBErXwvbsU/V7TZWfmbgJfbkwiBuziS9gxdODUyuiecfdGQ85jglMW6juS3+z5TsKLw==", "license": "MIT", "engines": { "node": ">=10" @@ -490,8 +436,6 @@ }, "node_modules/@apidevtools/json-schema-ref-parser": { "version": "14.2.1", - "resolved": "https://registry.npmjs.org/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-14.2.1.tgz", - "integrity": "sha512-HmdFw9CDYqM6B25pqGBpNeLCKvGPlIx1EbLrVL0zPvj50CJQUHyBNBw45Muk0kEIkogo1VZvOKHajdMuAzSxRg==", "dev": true, "license": "MIT", "dependencies": { @@ -509,8 +453,6 @@ }, "node_modules/@babel/code-frame": { "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.27.1.tgz", - "integrity": "sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==", "license": "MIT", "dependencies": { "@babel/helper-validator-identifier": "^7.27.1", @@ -523,8 +465,6 @@ }, "node_modules/@babel/compat-data": { "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.28.5.tgz", - "integrity": "sha512-6uFXyCayocRbqhZOB+6XcuZbkMNimwfVGFji8CTZnCzOHVGvDqzvitu1re2AU5LROliz7eQPhB8CpAMvnx9EjA==", "dev": true, "license": "MIT", "engines": { @@ -533,8 +473,6 @@ }, "node_modules/@babel/core": { "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/core/-/core-7.28.5.tgz", - "integrity": "sha512-e7jT4DxYvIDLk1ZHmU/m/mB19rex9sv0c2ftBtjSBv+kVM/902eh0fINUzD7UwLLNR+jU585GxUJ8/EBfAM5fw==", "dev": true, "license": "MIT", "dependencies": { @@ -564,8 +502,6 @@ }, "node_modules/@babel/core/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -582,15 +518,11 @@ }, "node_modules/@babel/core/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/@babel/core/node_modules/semver": { "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "license": "ISC", "bin": { @@ -599,8 +531,6 @@ }, "node_modules/@babel/generator": { "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.28.5.tgz", - "integrity": "sha512-3EwLFhZ38J4VyIP6WNtt2kUdW9dokXA9Cr4IVIFHuCpZ3H8/YFOl5JjZHisrn1fATPBmKKqXzDFvh9fUwHz6CQ==", "dev": true, "license": "MIT", "dependencies": { @@ -616,8 +546,6 @@ }, "node_modules/@babel/helper-annotate-as-pure": { "version": "7.27.3", - "resolved": "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.27.3.tgz", - "integrity": "sha512-fXSwMQqitTGeHLBC08Eq5yXz2m37E4pJX1qAU1+2cNedz/ifv/bVXft90VeSav5nFO61EcNgwr0aJxbyPaWBPg==", "dev": true, "license": "MIT", "dependencies": { @@ -629,8 +557,6 @@ }, "node_modules/@babel/helper-compilation-targets": { "version": "7.27.2", - "resolved": "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.27.2.tgz", - "integrity": "sha512-2+1thGUUWWjLTYTHZWK1n8Yga0ijBz1XAhUXcKy81rd5g6yh7hGqMp45v7cadSbEHc9G3OTv45SyneRN3ps4DQ==", "dev": true, "license": "MIT", "dependencies": { @@ -646,8 +572,6 @@ }, "node_modules/@babel/helper-compilation-targets/node_modules/lru-cache": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", - "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==", "dev": true, "license": "ISC", "dependencies": { @@ -656,8 +580,6 @@ }, "node_modules/@babel/helper-compilation-targets/node_modules/semver": { "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "license": "ISC", "bin": { @@ -666,15 +588,11 @@ }, "node_modules/@babel/helper-compilation-targets/node_modules/yallist": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-3.1.1.tgz", - "integrity": "sha512-a4UGQaWPH59mOXUYnAG2ewncQS4i4F43Tv3JoAM+s2VDAmS9NsK8GpDMLrCHPksFT7h3K6TOoUNn2pb7RoXx4g==", "dev": true, "license": "ISC" }, "node_modules/@babel/helper-create-class-features-plugin": { "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.28.5.tgz", - "integrity": "sha512-q3WC4JfdODypvxArsJQROfupPBq9+lMwjKq7C33GhbFYJsufD0yd/ziwD+hJucLeWsnFPWZjsU2DNFqBPE7jwQ==", "dev": true, "license": "MIT", "dependencies": { @@ -695,8 +613,6 @@ }, "node_modules/@babel/helper-create-class-features-plugin/node_modules/semver": { "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "license": "ISC", "bin": { @@ -705,8 +621,6 @@ }, "node_modules/@babel/helper-globals": { "version": "7.28.0", - "resolved": "https://registry.npmjs.org/@babel/helper-globals/-/helper-globals-7.28.0.tgz", - "integrity": "sha512-+W6cISkXFa1jXsDEdYA8HeevQT/FULhxzR99pxphltZcVaugps53THCeiWA8SguxxpSp3gKPiuYfSWopkLQ4hw==", "dev": true, "license": "MIT", "engines": { @@ -715,8 +629,6 @@ }, "node_modules/@babel/helper-member-expression-to-functions": { "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.28.5.tgz", - "integrity": "sha512-cwM7SBRZcPCLgl8a7cY0soT1SptSzAlMH39vwiRpOQkJlh53r5hdHwLSCZpQdVLT39sZt+CRpNwYG4Y2v77atg==", "dev": true, "license": "MIT", "dependencies": { @@ -729,8 +641,6 @@ }, "node_modules/@babel/helper-module-imports": { "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.27.1.tgz", - "integrity": "sha512-0gSFWUPNXNopqtIPQvlD5WgXYI5GY2kP2cCvoT8kczjbfcfuIljTbcWrulD1CIPIX2gt1wghbDy08yE1p+/r3w==", "dev": true, "license": "MIT", "dependencies": { @@ -743,8 +653,6 @@ }, "node_modules/@babel/helper-module-transforms": { "version": "7.28.3", - "resolved": "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.28.3.tgz", - "integrity": "sha512-gytXUbs8k2sXS9PnQptz5o0QnpLL51SwASIORY6XaBKF88nsOT0Zw9szLqlSGQDP/4TljBAD5y98p2U1fqkdsw==", "dev": true, "license": "MIT", "dependencies": { @@ -761,8 +669,6 @@ }, "node_modules/@babel/helper-optimise-call-expression": { "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.27.1.tgz", - "integrity": "sha512-URMGH08NzYFhubNSGJrpUEphGKQwMQYBySzat5cAByY1/YgIRkULnIy3tAMeszlL/so2HbeilYloUmSpd7GdVw==", "dev": true, "license": "MIT", "dependencies": { @@ -774,8 +680,6 @@ }, "node_modules/@babel/helper-plugin-utils": { "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.27.1.tgz", - "integrity": "sha512-1gn1Up5YXka3YYAHGKpbideQ5Yjf1tDa9qYcgysz+cNCXukyLl6DjPXhD3VRwSb8c0J9tA4b2+rHEZtc6R0tlw==", "dev": true, "license": "MIT", "engines": { @@ -784,8 +688,6 @@ }, "node_modules/@babel/helper-replace-supers": { "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.27.1.tgz", - "integrity": "sha512-7EHz6qDZc8RYS5ElPoShMheWvEgERonFCs7IAonWLLUTXW59DP14bCZt89/GKyreYn8g3S83m21FelHKbeDCKA==", "dev": true, "license": "MIT", "dependencies": { @@ -802,8 +704,6 @@ }, "node_modules/@babel/helper-skip-transparent-expression-wrappers": { "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.27.1.tgz", - "integrity": "sha512-Tub4ZKEXqbPjXgWLl2+3JpQAYBJ8+ikpQ2Ocj/q/r0LwE3UhENh7EUabyHjz2kCEsrRY83ew2DQdHluuiDQFzg==", "dev": true, "license": "MIT", "dependencies": { @@ -816,8 +716,6 @@ }, "node_modules/@babel/helper-string-parser": { "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.27.1.tgz", - "integrity": "sha512-qMlSxKbpRlAridDExk92nSobyDdpPijUq2DW6oDnUqd0iOGxmQjyqhMIihI9+zv4LPyZdRje2cavWPbCbWm3eA==", "license": "MIT", "engines": { "node": ">=6.9.0" @@ -825,8 +723,6 @@ }, "node_modules/@babel/helper-validator-identifier": { "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.28.5.tgz", - "integrity": "sha512-qSs4ifwzKJSV39ucNjsvc6WVHs6b7S03sOh2OcHF9UHfVPqWWALUsNUVzhSBiItjRZoLHx7nIarVjqKVusUZ1Q==", "license": "MIT", "engines": { "node": ">=6.9.0" @@ -834,8 +730,6 @@ }, "node_modules/@babel/helper-validator-option": { "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.27.1.tgz", - "integrity": "sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==", "dev": true, "license": "MIT", "engines": { @@ -844,8 +738,6 @@ }, "node_modules/@babel/helpers": { "version": "7.28.4", - "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.28.4.tgz", - "integrity": "sha512-HFN59MmQXGHVyYadKLVumYsA9dBFun/ldYxipEjzA4196jpLZd8UjEEBLkbEkvfYreDqJhZxYAWFPtrfhNpj4w==", "dev": true, "license": "MIT", "dependencies": { @@ -858,8 +750,6 @@ }, "node_modules/@babel/parser": { "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.28.5.tgz", - "integrity": "sha512-KKBU1VGYR7ORr3At5HAtUQ+TV3SzRCXmA/8OdDZiLDBIZxVyzXuztPjfLd3BV1PRAQGCMWWSHYhL0F8d5uHBDQ==", "license": "MIT", "dependencies": { "@babel/types": "^7.28.5" @@ -873,8 +763,6 @@ }, "node_modules/@babel/plugin-syntax-decorators": { "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.27.1.tgz", - "integrity": "sha512-YMq8Z87Lhl8EGkmb0MwYkt36QnxC+fzCgrl66ereamPlYToRpIk5nUjKUY3QKLWq8mwUB1BgbeXcTJhZOCDg5A==", "dev": true, "license": "MIT", "dependencies": { @@ -889,8 +777,6 @@ }, "node_modules/@babel/plugin-syntax-jsx": { "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.27.1.tgz", - "integrity": "sha512-y8YTNIeKoyhGd9O0Jiyzyyqk8gdjnumGTQPsz0xOZOQ2RmkVJeZ1vmmfIvFEKqucBG6axJGBZDE/7iI5suUI/w==", "dev": true, "license": "MIT", "dependencies": { @@ -905,8 +791,6 @@ }, "node_modules/@babel/plugin-syntax-typescript": { "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.27.1.tgz", - "integrity": "sha512-xfYCBMxveHrRMnAWl1ZlPXOZjzkN82THFvLhQhFXFt81Z5HnN+EtUkZhv/zcKpmT3fzmWZB0ywiBrbC3vogbwQ==", "dev": true, "license": "MIT", "dependencies": { @@ -921,8 +805,6 @@ }, "node_modules/@babel/plugin-transform-modules-commonjs": { "version": "7.27.1", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.27.1.tgz", - "integrity": "sha512-OJguuwlTYlN0gBZFRPqwOGNWssZjfIUdS7HMYtN8c1KmwpwHFBwTeFZrg9XZa+DFTitWOW5iTAG7tyCUPsCCyw==", "dev": true, "license": "MIT", "dependencies": { @@ -938,8 +820,6 @@ }, "node_modules/@babel/plugin-transform-typescript": { "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.28.5.tgz", - "integrity": "sha512-x2Qa+v/CuEoX7Dr31iAfr0IhInrVOWZU/2vJMJ00FOR/2nM0BcBEclpaf9sWCDc+v5e9dMrhSH8/atq/kX7+bA==", "dev": true, "license": "MIT", "dependencies": { @@ -958,8 +838,6 @@ }, "node_modules/@babel/preset-typescript": { "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.28.5.tgz", - "integrity": "sha512-+bQy5WOI2V6LJZpPVxY+yp66XdZ2yifu0Mc1aP5CQKgjn4QM5IN2i5fAZ4xKop47pr8rpVhiAeu+nDQa12C8+g==", "dev": true, "license": "MIT", "dependencies": { @@ -978,8 +856,6 @@ }, "node_modules/@babel/template": { "version": "7.27.2", - "resolved": "https://registry.npmjs.org/@babel/template/-/template-7.27.2.tgz", - "integrity": "sha512-LPDZ85aEJyYSd18/DkjNh4/y1ntkE5KwUHWTiqgRxruuZL2F1yuHligVHLvcHY2vMHXttKFpJn6LwfI7cw7ODw==", "dev": true, "license": "MIT", "dependencies": { @@ -993,8 +869,6 @@ }, "node_modules/@babel/traverse": { "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/traverse/-/traverse-7.28.5.tgz", - "integrity": "sha512-TCCj4t55U90khlYkVV/0TfkJkAkUg3jZFA3Neb7unZT8CPok7iiRfaX0F+WnqWqt7OxhOn0uBKXCw4lbL8W0aQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1012,8 +886,6 @@ }, "node_modules/@babel/traverse/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -1030,15 +902,11 @@ }, "node_modules/@babel/traverse/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/@babel/types": { "version": "7.28.5", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.28.5.tgz", - "integrity": "sha512-qQ5m48eI/MFLQ5PxQj4PFaprjyCTLI37ElWMmNs0K8Lk3dVeOdNpB3ks8jc7yM5CDmVC73eMVk/trk3fgmrUpA==", "license": "MIT", "dependencies": { "@babel/helper-string-parser": "^7.27.1", @@ -1050,15 +918,11 @@ }, "node_modules/@blueoak/list": { "version": "15.0.0", - "resolved": "https://registry.npmjs.org/@blueoak/list/-/list-15.0.0.tgz", - "integrity": "sha512-xW5Xb9Fr3WtYAOwavxxWL0CaJK/ReT+HKb5/R6dR1p9RVJ55MTdaxPdeTKY2ukhFchv2YHPMM8YuZyfyLqxedg==", "dev": true, "license": "CC0-1.0" }, "node_modules/@commitlint/cli": { "version": "20.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/cli/-/cli-20.1.0.tgz", - "integrity": "sha512-pW5ujjrOovhq5RcYv5xCpb4GkZxkO2+GtOdBW2/qrr0Ll9tl3PX0aBBobGQl3mdZUbOBgwAexEQLeH6uxL0VYg==", "dev": true, "license": "MIT", "dependencies": { @@ -1079,8 +943,6 @@ }, "node_modules/@commitlint/config-conventional": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-conventional/-/config-conventional-20.0.0.tgz", - "integrity": "sha512-q7JroPIkDBtyOkVe9Bca0p7kAUYxZMxkrBArCfuD3yN4KjRAenP9PmYwnn7rsw8Q+hHq1QB2BRmBh0/Z19ZoJw==", "dev": true, "license": "MIT", "dependencies": { @@ -1093,8 +955,6 @@ }, "node_modules/@commitlint/config-validator": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/config-validator/-/config-validator-20.0.0.tgz", - "integrity": "sha512-BeyLMaRIJDdroJuYM2EGhDMGwVBMZna9UiIqV9hxj+J551Ctc6yoGuGSmghOy/qPhBSuhA6oMtbEiTmxECafsg==", "dev": true, "license": "MIT", "dependencies": { @@ -1107,8 +967,6 @@ }, "node_modules/@commitlint/config-validator/node_modules/ajv": { "version": "8.17.1", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.17.1.tgz", - "integrity": "sha512-B/gBuNg5SiMTrPkC+A2+cW0RszwxYmn6VYxB/inlBStS5nx6xHIt/ehKRhIMhqusl7a8LjQoZnjCs5vhwxOQ1g==", "dev": true, "license": "MIT", "dependencies": { @@ -1124,15 +982,11 @@ }, "node_modules/@commitlint/config-validator/node_modules/json-schema-traverse": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz", - "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==", "dev": true, "license": "MIT" }, "node_modules/@commitlint/ensure": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/ensure/-/ensure-20.0.0.tgz", - "integrity": "sha512-WBV47Fffvabe68n+13HJNFBqiMH5U1Ryls4W3ieGwPC0C7kJqp3OVQQzG2GXqOALmzrgAB+7GXmyy8N9ct8/Fg==", "dev": true, "license": "MIT", "dependencies": { @@ -1149,8 +1003,6 @@ }, "node_modules/@commitlint/execute-rule": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/execute-rule/-/execute-rule-20.0.0.tgz", - "integrity": "sha512-xyCoOShoPuPL44gVa+5EdZsBVao/pNzpQhkzq3RdtlFdKZtjWcLlUFQHSWBuhk5utKYykeJPSz2i8ABHQA+ZZw==", "dev": true, "license": "MIT", "engines": { @@ -1159,8 +1011,6 @@ }, "node_modules/@commitlint/format": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/format/-/format-20.0.0.tgz", - "integrity": "sha512-zrZQXUcSDmQ4eGGrd+gFESiX0Rw+WFJk7nW4VFOmxub4mAATNKBQ4vNw5FgMCVehLUKG2OT2LjOqD0Hk8HvcRg==", "dev": true, "license": "MIT", "dependencies": { @@ -1173,8 +1023,6 @@ }, "node_modules/@commitlint/is-ignored": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/is-ignored/-/is-ignored-20.0.0.tgz", - "integrity": "sha512-ayPLicsqqGAphYIQwh9LdAYOVAQ9Oe5QCgTNTj+BfxZb9b/JW222V5taPoIBzYnAP0z9EfUtljgBk+0BN4T4Cw==", "dev": true, "license": "MIT", "dependencies": { @@ -1187,8 +1035,6 @@ }, "node_modules/@commitlint/lint": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/lint/-/lint-20.0.0.tgz", - "integrity": "sha512-kWrX8SfWk4+4nCexfLaQT3f3EcNjJwJBsSZ5rMBw6JCd6OzXufFHgel2Curos4LKIxwec9WSvs2YUD87rXlxNQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1203,8 +1049,6 @@ }, "node_modules/@commitlint/load": { "version": "20.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/load/-/load-20.1.0.tgz", - "integrity": "sha512-qo9ER0XiAimATQR5QhvvzePfeDfApi/AFlC1G+YN+ZAY8/Ua6IRrDrxRvQAr+YXUKAxUsTDSp9KXeXLBPsNRWg==", "dev": true, "license": "MIT", "dependencies": { @@ -1225,8 +1069,6 @@ }, "node_modules/@commitlint/message": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/message/-/message-20.0.0.tgz", - "integrity": "sha512-gLX4YmKnZqSwkmSB9OckQUrI5VyXEYiv3J5JKZRxIp8jOQsWjZgHSG/OgEfMQBK9ibdclEdAyIPYggwXoFGXjQ==", "dev": true, "license": "MIT", "engines": { @@ -1235,8 +1077,6 @@ }, "node_modules/@commitlint/parse": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/parse/-/parse-20.0.0.tgz", - "integrity": "sha512-j/PHCDX2bGM5xGcWObOvpOc54cXjn9g6xScXzAeOLwTsScaL4Y+qd0pFC6HBwTtrH92NvJQc+2Lx9HFkVi48cg==", "dev": true, "license": "MIT", "dependencies": { @@ -1250,8 +1090,6 @@ }, "node_modules/@commitlint/read": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/read/-/read-20.0.0.tgz", - "integrity": "sha512-Ti7Y7aEgxsM1nkwA4ZIJczkTFRX/+USMjNrL9NXwWQHqNqrBX2iMi+zfuzZXqfZ327WXBjdkRaytJ+z5vNqTOA==", "dev": true, "license": "MIT", "dependencies": { @@ -1267,8 +1105,6 @@ }, "node_modules/@commitlint/resolve-extends": { "version": "20.1.0", - "resolved": "https://registry.npmjs.org/@commitlint/resolve-extends/-/resolve-extends-20.1.0.tgz", - "integrity": "sha512-cxKXQrqHjZT3o+XPdqDCwOWVFQiae++uwd9dUBC7f2MdV58ons3uUvASdW7m55eat5sRiQ6xUHyMWMRm6atZWw==", "dev": true, "license": "MIT", "dependencies": { @@ -1285,8 +1121,6 @@ }, "node_modules/@commitlint/rules": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/rules/-/rules-20.0.0.tgz", - "integrity": "sha512-gvg2k10I/RfvHn5I5sxvVZKM1fl72Sqrv2YY/BnM7lMHcYqO0E2jnRWoYguvBfEcZ39t+rbATlciggVe77E4zA==", "dev": true, "license": "MIT", "dependencies": { @@ -1301,8 +1135,6 @@ }, "node_modules/@commitlint/to-lines": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/to-lines/-/to-lines-20.0.0.tgz", - "integrity": "sha512-2l9gmwiCRqZNWgV+pX1X7z4yP0b3ex/86UmUFgoRt672Ez6cAM2lOQeHFRUTuE6sPpi8XBCGnd8Kh3bMoyHwJw==", "dev": true, "license": "MIT", "engines": { @@ -1311,8 +1143,6 @@ }, "node_modules/@commitlint/top-level": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/top-level/-/top-level-20.0.0.tgz", - "integrity": "sha512-drXaPSP2EcopukrUXvUXmsQMu3Ey/FuJDc/5oiW4heoCfoE5BdLQyuc7veGeE3aoQaTVqZnh4D5WTWe2vefYKg==", "dev": true, "license": "MIT", "dependencies": { @@ -1324,8 +1154,6 @@ }, "node_modules/@commitlint/types": { "version": "20.0.0", - "resolved": "https://registry.npmjs.org/@commitlint/types/-/types-20.0.0.tgz", - "integrity": "sha512-bVUNBqG6aznYcYjTjnc3+Cat/iBgbgpflxbIBTnsHTX0YVpnmINPEkSRWymT2Q8aSH3Y7aKnEbunilkYe8TybA==", "dev": true, "license": "MIT", "dependencies": { @@ -1338,14 +1166,10 @@ }, "node_modules/@docsearch/css": { "version": "3.8.2", - "resolved": "https://registry.npmjs.org/@docsearch/css/-/css-3.8.2.tgz", - "integrity": "sha512-y05ayQFyUmCXze79+56v/4HpycYF3uFqB78pLPrSV5ZKAlDuIAAJNhaRi8tTdRNXh05yxX/TyNnzD6LwSM89vQ==", "license": "MIT" }, "node_modules/@docsearch/js": { "version": "3.8.2", - "resolved": "https://registry.npmjs.org/@docsearch/js/-/js-3.8.2.tgz", - "integrity": "sha512-Q5wY66qHn0SwA7Taa0aDbHiJvaFJLOJyHmooQ7y8hlwwQLQ/5WwCcoX0g7ii04Qi2DJlHsd0XXzJ8Ypw9+9YmQ==", "license": "MIT", "dependencies": { "@docsearch/react": "3.8.2", @@ -1354,8 +1178,6 @@ }, "node_modules/@docsearch/react": { "version": "3.8.2", - "resolved": "https://registry.npmjs.org/@docsearch/react/-/react-3.8.2.tgz", - "integrity": "sha512-xCRrJQlTt8N9GU0DG4ptwHRkfnSnD/YpdeaXe02iKfqs97TkZJv60yE+1eq/tjPcVnTW8dP5qLP7itifFVV5eg==", "license": "MIT", "dependencies": { "@algolia/autocomplete-core": "1.17.7", @@ -1386,8 +1208,6 @@ }, "node_modules/@es-joy/jsdoccomment": { "version": "0.76.0", - "resolved": "https://registry.npmjs.org/@es-joy/jsdoccomment/-/jsdoccomment-0.76.0.tgz", - "integrity": "sha512-g+RihtzFgGTx2WYCuTHbdOXJeAlGnROws0TeALx9ow/ZmOROOZkVg5wp/B44n0WJgI4SQFP1eWM2iRPlU2Y14w==", "dev": true, "license": "MIT", "dependencies": { @@ -1403,82 +1223,14 @@ }, "node_modules/@es-joy/resolve.exports": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/@es-joy/resolve.exports/-/resolve.exports-1.2.0.tgz", - "integrity": "sha512-Q9hjxWI5xBM+qW2enxfe8wDKdFWMfd0Z29k5ZJnuBqD/CasY5Zryj09aCA6owbGATWz+39p5uIdaHXpopOcG8g==", "dev": true, "license": "MIT", "engines": { "node": ">=10" } }, - "node_modules/@esbuild/aix-ppc64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/aix-ppc64/-/aix-ppc64-0.21.5.tgz", - "integrity": "sha512-1SDgH6ZSPTlggy1yI6+Dbkiz8xzpHJEVAlF/AM1tHPLsf5STom9rwtjE4hKAF20FfXXNTFqEYXyJNWh1GiZedQ==", - "cpu": [ - "ppc64" - ], - "license": "MIT", - "optional": true, - "os": [ - "aix" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.21.5.tgz", - "integrity": "sha512-vCPvzSjpPHEi1siZdlvAlsPxXl7WbOVUBBAowWug4rJHb68Ox8KualB+1ocNvT5fjv6wpkX6o/iEpbDrf68zcg==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-arm64/-/android-arm64-0.21.5.tgz", - "integrity": "sha512-c0uX9VAUBQ7dTDCjq+wdyGLowMdtR/GoC2U5IYk/7D1H1JYC0qseD7+11iMP2mRLN9RcCMRcjC4YMclCzGwS/A==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/android-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/android-x64/-/android-x64-0.21.5.tgz", - "integrity": "sha512-D7aPRUUNHRBwHxzxRvp856rjUHRFW1SdQATKXH2hqA0kAZb1hKmi02OpYRacl0TxIGz/ZmXWlbZgjwWYaCakTA==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/@esbuild/darwin-arm64": { "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-arm64/-/darwin-arm64-0.21.5.tgz", - "integrity": "sha512-DwqXqZyuk5AiWWf3UfLiRDJ5EDd49zg6O9wclZ7kUMv2WRFr4HKjXp/5t8JZ11QbQfUS6/cRCKGwYhtNAY88kQ==", "cpu": [ "arm64" ], @@ -1491,298 +1243,8 @@ "node": ">=12" } }, - "node_modules/@esbuild/darwin-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/darwin-x64/-/darwin-x64-0.21.5.tgz", - "integrity": "sha512-se/JjF8NlmKVG4kNIuyWMV/22ZaerB+qaSi5MdrXtd6R08kvs2qCN4C09miupktDitvh8jRFflwGFBQcxZRjbw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-arm64/-/freebsd-arm64-0.21.5.tgz", - "integrity": "sha512-5JcRxxRDUJLX8JXp/wcBCy3pENnCgBR9bN6JsY4OmhfUtIHe3ZW0mawA7+RDAcMLrMIZaf03NlQiX9DGyB8h4g==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/freebsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/freebsd-x64/-/freebsd-x64-0.21.5.tgz", - "integrity": "sha512-J95kNBj1zkbMXtHVH29bBriQygMXqoVQOQYA+ISs0/2l3T9/kj42ow2mpqerRBxDJnmkUDCaQT/dfNXWX/ZZCQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm/-/linux-arm-0.21.5.tgz", - "integrity": "sha512-bPb5AHZtbeNGjCKVZ9UGqGwo8EUu4cLq68E95A53KlxAPRmUyYv2D6F0uUI65XisGOL1hBP5mTronbgo+0bFcA==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-arm64/-/linux-arm64-0.21.5.tgz", - "integrity": "sha512-ibKvmyYzKsBeX8d8I7MH/TMfWDXBF3db4qM6sy+7re0YXya+K1cem3on9XgdT2EQGMu4hQyZhan7TeQ8XkGp4Q==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ia32": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ia32/-/linux-ia32-0.21.5.tgz", - "integrity": "sha512-YvjXDqLRqPDl2dvRODYmmhz4rPeVKYvppfGYKSNGdyZkA01046pLWyRKKI3ax8fbJoK5QbxblURkwK/MWY18Tg==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-loong64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.21.5.tgz", - "integrity": "sha512-uHf1BmMG8qEvzdrzAqg2SIG/02+4/DHB6a9Kbya0XDvwDEKCoC8ZRWI5JJvNdUjtciBGFQ5PuBlpEOXQj+JQSg==", - "cpu": [ - "loong64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-mips64el": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-mips64el/-/linux-mips64el-0.21.5.tgz", - "integrity": "sha512-IajOmO+KJK23bj52dFSNCMsz1QP1DqM6cwLUv3W1QwyxkyIWecfafnI555fvSGqEKwjMXVLokcV5ygHW5b3Jbg==", - "cpu": [ - "mips64el" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-ppc64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-ppc64/-/linux-ppc64-0.21.5.tgz", - "integrity": "sha512-1hHV/Z4OEfMwpLO8rp7CvlhBDnjsC3CttJXIhBi+5Aj5r+MBvy4egg7wCbe//hSsT+RvDAG7s81tAvpL2XAE4w==", - "cpu": [ - "ppc64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-riscv64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-riscv64/-/linux-riscv64-0.21.5.tgz", - "integrity": "sha512-2HdXDMd9GMgTGrPWnJzP2ALSokE/0O5HhTUvWIbD3YdjME8JwvSCnNGBnTThKGEB91OZhzrJ4qIIxk/SBmyDDA==", - "cpu": [ - "riscv64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-s390x": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-s390x/-/linux-s390x-0.21.5.tgz", - "integrity": "sha512-zus5sxzqBJD3eXxwvjN1yQkRepANgxE9lgOW2qLnmr8ikMTphkjgXu1HR01K4FJg8h1kEEDAqDcZQtbrRnB41A==", - "cpu": [ - "s390x" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/linux-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/linux-x64/-/linux-x64-0.21.5.tgz", - "integrity": "sha512-1rYdTpyv03iycF1+BhzrzQJCdOuAOtaqHTWJZCWvijKD2N5Xu0TtVC8/+1faWqcP9iBCWOmjmhoH94dH82BxPQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/netbsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/netbsd-x64/-/netbsd-x64-0.21.5.tgz", - "integrity": "sha512-Woi2MXzXjMULccIwMnLciyZH4nCIMpWQAs049KEeMvOcNADVxo0UBIQPfSmxB3CWKedngg7sWZdLvLczpe0tLg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "netbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/openbsd-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/openbsd-x64/-/openbsd-x64-0.21.5.tgz", - "integrity": "sha512-HLNNw99xsvx12lFBUwoT8EVCsSvRNDVxNpjZ7bPn947b8gJPzeHWyNVhFsaerc0n3TsbOINvRP2byTZ5LKezow==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openbsd" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/sunos-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/sunos-x64/-/sunos-x64-0.21.5.tgz", - "integrity": "sha512-6+gjmFpfy0BHU5Tpptkuh8+uw3mnrvgs+dSPQXQOv3ekbordwnzTVEb4qnIvQcYXq6gzkyTnoZ9dZG+D4garKg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "sunos" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-arm64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-arm64/-/win32-arm64-0.21.5.tgz", - "integrity": "sha512-Z0gOTd75VvXqyq7nsl93zwahcTROgqvuAcYDUr+vOv8uHhNSKROyU961kgtCD1e95IqPKSQKH7tBTslnS3tA8A==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-ia32": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-ia32/-/win32-ia32-0.21.5.tgz", - "integrity": "sha512-SWXFF1CL2RVNMaVs+BBClwtfZSvDgtL//G/smwAc5oVK/UPu2Gu9tIaRgFmYFFKrmg3SyAjSrElf0TiJ1v8fYA==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, - "node_modules/@esbuild/win32-x64": { - "version": "0.21.5", - "resolved": "https://registry.npmjs.org/@esbuild/win32-x64/-/win32-x64-0.21.5.tgz", - "integrity": "sha512-tQd/1efJuzPC6rCFwEvLtci/xNFcTZknmXs98FYDfGE4wP9ClFV98nyKrzJKVPMhdDnjzLhdUyMX4PsQAPjwIw==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ], - "engines": { - "node": ">=12" - } - }, "node_modules/@eslint-community/eslint-utils": { "version": "4.9.0", - "resolved": "https://registry.npmjs.org/@eslint-community/eslint-utils/-/eslint-utils-4.9.0.tgz", - "integrity": "sha512-ayVFHdtZ+hsq1t2Dy24wCmGXGe4q9Gu3smhLYALJrr473ZH27MsnSL+LKUlimp4BWJqMDMLmPpx/Q9R3OAlL4g==", "dev": true, "license": "MIT", "dependencies": { @@ -1800,8 +1262,6 @@ }, "node_modules/@eslint-community/eslint-utils/node_modules/eslint-visitor-keys": { "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "license": "Apache-2.0", "engines": { @@ -1813,8 +1273,6 @@ }, "node_modules/@eslint-community/regexpp": { "version": "4.12.2", - "resolved": "https://registry.npmjs.org/@eslint-community/regexpp/-/regexpp-4.12.2.tgz", - "integrity": "sha512-EriSTlt5OC9/7SXkRSCAhfSxxoSUgBm33OH+IkwbdpgoqsSsUg7y3uh+IICI/Qg4BBWr3U2i39RpmycbxMq4ew==", "dev": true, "license": "MIT", "engines": { @@ -1823,8 +1281,6 @@ }, "node_modules/@eslint/config-array": { "version": "0.21.1", - "resolved": "https://registry.npmjs.org/@eslint/config-array/-/config-array-0.21.1.tgz", - "integrity": "sha512-aw1gNayWpdI/jSYVgzN5pL0cfzU02GT3NBpeT/DXbx1/1x7ZKxFPd9bwrzygx/qiwIQiJ1sw/zD8qY/kRvlGHA==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -1838,8 +1294,6 @@ }, "node_modules/@eslint/config-array/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -1856,8 +1310,6 @@ }, "node_modules/@eslint/config-array/node_modules/minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "license": "ISC", "dependencies": { @@ -1869,15 +1321,11 @@ }, "node_modules/@eslint/config-array/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/@eslint/config-helpers": { "version": "0.4.2", - "resolved": "https://registry.npmjs.org/@eslint/config-helpers/-/config-helpers-0.4.2.tgz", - "integrity": "sha512-gBrxN88gOIf3R7ja5K9slwNayVcZgK6SOUORm2uBzTeIEfeVaIhOpCtTox3P6R7o2jLFwLFTLnC7kU/RGcYEgw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -1889,8 +1337,6 @@ }, "node_modules/@eslint/core": { "version": "0.17.0", - "resolved": "https://registry.npmjs.org/@eslint/core/-/core-0.17.0.tgz", - "integrity": "sha512-yL/sLrpmtDaFEiUj1osRP4TI2MDz1AddJL+jZ7KSqvBuliN4xqYY54IfdN8qD8Toa6g1iloph1fxQNkjOxrrpQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -1902,8 +1348,6 @@ }, "node_modules/@eslint/eslintrc": { "version": "3.3.1", - "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-3.3.1.tgz", - "integrity": "sha512-gtF186CXhIl1p4pJNGZw8Yc6RlshoePRvE0X91oPGb3vZ8pM3qOS9W9NGPat9LziaBV7XrJWGylNQXkGcnM3IQ==", "dev": true, "license": "MIT", "dependencies": { @@ -1926,8 +1370,6 @@ }, "node_modules/@eslint/eslintrc/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -1944,8 +1386,6 @@ }, "node_modules/@eslint/eslintrc/node_modules/globals": { "version": "14.0.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-14.0.0.tgz", - "integrity": "sha512-oahGvuMGQlPw/ivIYBjVSrWAfWLBeku5tpPE2fOPLi+WHffIWbuh2tCjhyQhTBPMf5E9jDEH4FOmTYgYwbKwtQ==", "dev": true, "license": "MIT", "engines": { @@ -1957,8 +1397,6 @@ }, "node_modules/@eslint/eslintrc/node_modules/minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "license": "ISC", "dependencies": { @@ -1970,15 +1408,11 @@ }, "node_modules/@eslint/eslintrc/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/@eslint/js": { "version": "9.39.1", - "resolved": "https://registry.npmjs.org/@eslint/js/-/js-9.39.1.tgz", - "integrity": "sha512-S26Stp4zCy88tH94QbBv3XCuzRQiZ9yXofEILmglYTh/Ug/a9/umqvgFtYBAo3Lp0nsI/5/qH1CCrbdK3AP1Tw==", "dev": true, "license": "MIT", "engines": { @@ -1990,8 +1424,6 @@ }, "node_modules/@eslint/object-schema": { "version": "2.1.7", - "resolved": "https://registry.npmjs.org/@eslint/object-schema/-/object-schema-2.1.7.tgz", - "integrity": "sha512-VtAOaymWVfZcmZbp6E2mympDIHvyjXs/12LqWYjVw6qjrfF+VK+fyG33kChz3nnK+SU5/NeHOqrTEHS8sXO3OA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -2000,8 +1432,6 @@ }, "node_modules/@eslint/plugin-kit": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@eslint/plugin-kit/-/plugin-kit-0.4.1.tgz", - "integrity": "sha512-43/qtrDUokr7LJqoF2c3+RInu/t4zfrpYdoSDfYyhg52rwLV6TnOvdG4fXm7IkSB3wErkcmJS9iEhjVtOSEjjA==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -2014,15 +1444,11 @@ }, "node_modules/@hapi/bourne": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@hapi/bourne/-/bourne-3.0.0.tgz", - "integrity": "sha512-Waj1cwPXJDucOib4a3bAISsKJVb15MKi9IvmTI/7ssVEm6sywXGjVJDhl6/umt1pK1ZS7PacXU3A1PmFKHEZ2w==", "dev": true, "license": "BSD-3-Clause" }, "node_modules/@humanfs/core": { "version": "0.19.1", - "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz", - "integrity": "sha512-5DyQ4+1JEUzejeK1JGICcideyfUbGixgS9jNgex5nqkW+cY7WZhxBigmieN5Qnw9ZosSNVC9KQKyb+GUaGyKUA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -2031,8 +1457,6 @@ }, "node_modules/@humanfs/node": { "version": "0.16.7", - "resolved": "https://registry.npmjs.org/@humanfs/node/-/node-0.16.7.tgz", - "integrity": "sha512-/zUx+yOsIrG4Y43Eh2peDeKCxlRt/gET6aHfaKpuq267qXdYDFViVHfMaLyygZOnl0kGWxFIgsBy8QFuTLUXEQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -2045,8 +1469,6 @@ }, "node_modules/@humanwhocodes/module-importer": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/@humanwhocodes/module-importer/-/module-importer-1.0.1.tgz", - "integrity": "sha512-bxveV4V8v5Yb4ncFTT3rPSgZBOpCkjfK0y4oVVVJwIuDVBRMDXrPyXRL988i5ap9m9bnyEEjWfm5WkBmtffLfA==", "dev": true, "license": "Apache-2.0", "engines": { @@ -2059,8 +1481,6 @@ }, "node_modules/@humanwhocodes/retry": { "version": "0.4.3", - "resolved": "https://registry.npmjs.org/@humanwhocodes/retry/-/retry-0.4.3.tgz", - "integrity": "sha512-bV0Tgo9K4hfPCek+aMAn81RppFKv2ySDQeMoSZuvTASywNTnVJCArCZE2FWqpvIatKu7VMRLWlR1EazvVhDyhQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -2073,8 +1493,6 @@ }, "node_modules/@iconify-json/simple-icons": { "version": "1.2.60", - "resolved": "https://registry.npmjs.org/@iconify-json/simple-icons/-/simple-icons-1.2.60.tgz", - "integrity": "sha512-KlwLBKCdMCqfySdkAA+jehdUx6VSjnj6lvzQKus7HjkPSQ6QP58d6xiptkIp0jd/Hw3PW2++nRuGvCvSYaF0Mg==", "license": "CC0-1.0", "dependencies": { "@iconify/types": "*" @@ -2082,14 +1500,10 @@ }, "node_modules/@iconify/types": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@iconify/types/-/types-2.0.0.tgz", - "integrity": "sha512-+wluvCrRhXrhyOmRDJ3q8mux9JkKy5SJ/v8ol2tu4FVjyYvtEzkc/3pK15ET6RKg4b4w4BmTk1+gsCUhf21Ykg==", "license": "MIT" }, "node_modules/@isaacs/balanced-match": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/balanced-match/-/balanced-match-4.0.1.tgz", - "integrity": "sha512-yzMTt9lEb8Gv7zRioUilSglI0c0smZ9k5D65677DLWLtWJaXIS3CqcGyUFByYKlnUj6TkjLVs54fBl6+TiGQDQ==", "license": "MIT", "engines": { "node": "20 || >=22" @@ -2097,8 +1511,6 @@ }, "node_modules/@isaacs/brace-expansion": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@isaacs/brace-expansion/-/brace-expansion-5.0.0.tgz", - "integrity": "sha512-ZT55BDLV0yv0RBm2czMiZ+SqCGO7AvmOM3G/w2xhVPH+te0aKgFjmBvGlL1dH+ql2tgGO3MVrbb3jCKyvpgnxA==", "license": "MIT", "dependencies": { "@isaacs/balanced-match": "^4.0.1" @@ -2109,8 +1521,6 @@ }, "node_modules/@isaacs/cliui": { "version": "8.0.2", - "resolved": "https://registry.npmjs.org/@isaacs/cliui/-/cliui-8.0.2.tgz", - "integrity": "sha512-O8jcjabXaleOG9DQ0+ARXWZBTfnP4WNAqzuiJK7ll44AmxGKv/J2M4TPjxjY3znBCfvBXFzucm1twdyFybFqEA==", "license": "ISC", "dependencies": { "string-width": "^5.1.2", @@ -2126,14 +1536,10 @@ }, "node_modules/@isaacs/cliui/node_modules/emoji-regex": { "version": "9.2.2", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz", - "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg==", "license": "MIT" }, "node_modules/@isaacs/cliui/node_modules/string-width": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz", - "integrity": "sha512-HnLOCR3vjcY8beoNLtcjZ5/nxn2afmME6lhrDrebokqMap+XbeW8n9TXpPDOqdGK5qcI3oT0GKTW6wC7EMiVqA==", "license": "MIT", "dependencies": { "eastasianwidth": "^0.2.0", @@ -2149,8 +1555,6 @@ }, "node_modules/@isaacs/cliui/node_modules/wrap-ansi": { "version": "8.1.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-8.1.0.tgz", - "integrity": "sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==", "license": "MIT", "dependencies": { "ansi-styles": "^6.1.0", @@ -2166,8 +1570,6 @@ }, "node_modules/@isaacs/fs-minipass": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@isaacs/fs-minipass/-/fs-minipass-4.0.1.tgz", - "integrity": "sha512-wgm9Ehl2jpeqP3zw/7mo3kRHFp5MEDhqAdwy1fTGkHAwnkGOVsgpvQhL8B5n1qlb01jV3n/bI0ZfZp5lWA1k4w==", "license": "ISC", "dependencies": { "minipass": "^7.0.4" @@ -2178,14 +1580,10 @@ }, "node_modules/@isaacs/string-locale-compare": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@isaacs/string-locale-compare/-/string-locale-compare-1.1.0.tgz", - "integrity": "sha512-SQ7Kzhh9+D+ZW9MA0zkYv3VXhIDNx+LzM6EJ+/65I3QY+enU6Itte7E5XX7EWrqLW2FN4n06GWzBnPoC3th2aQ==", "license": "ISC" }, "node_modules/@istanbuljs/esm-loader-hook": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/esm-loader-hook/-/esm-loader-hook-0.3.0.tgz", - "integrity": "sha512-lEnYroBUYfNQuJDYrPvre8TSwPZnyIQv9qUT3gACvhr3igZr+BbrdyIcz4+2RnEXZzi12GqkUW600+QQPpIbVg==", "dev": true, "license": "ISC", "dependencies": { @@ -2203,8 +1601,6 @@ }, "node_modules/@istanbuljs/load-nyc-config": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@istanbuljs/load-nyc-config/-/load-nyc-config-1.1.0.tgz", - "integrity": "sha512-VjeHSlIzpv/NyD3N0YuHfXOPDIixcA1q2ZV98wsMqcYlPmv2n3Yb2lYP9XMElnaFVXg5A7YLTeLu6V84uQDjmQ==", "dev": true, "license": "ISC", "dependencies": { @@ -2220,8 +1616,6 @@ }, "node_modules/@istanbuljs/load-nyc-config/node_modules/argparse": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "license": "MIT", "dependencies": { @@ -2230,8 +1624,6 @@ }, "node_modules/@istanbuljs/load-nyc-config/node_modules/camelcase": { "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true, "license": "MIT", "engines": { @@ -2240,8 +1632,6 @@ }, "node_modules/@istanbuljs/load-nyc-config/node_modules/find-up": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "license": "MIT", "dependencies": { @@ -2254,8 +1644,6 @@ }, "node_modules/@istanbuljs/load-nyc-config/node_modules/js-yaml": { "version": "3.14.2", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz", - "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==", "dev": true, "license": "MIT", "dependencies": { @@ -2268,8 +1656,6 @@ }, "node_modules/@istanbuljs/load-nyc-config/node_modules/locate-path": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "license": "MIT", "dependencies": { @@ -2281,8 +1667,6 @@ }, "node_modules/@istanbuljs/load-nyc-config/node_modules/p-limit": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "license": "MIT", "dependencies": { @@ -2297,8 +1681,6 @@ }, "node_modules/@istanbuljs/load-nyc-config/node_modules/p-locate": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "license": "MIT", "dependencies": { @@ -2310,8 +1692,6 @@ }, "node_modules/@istanbuljs/load-nyc-config/node_modules/path-exists": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, "license": "MIT", "engines": { @@ -2320,8 +1700,6 @@ }, "node_modules/@istanbuljs/schema": { "version": "0.1.3", - "resolved": "https://registry.npmjs.org/@istanbuljs/schema/-/schema-0.1.3.tgz", - "integrity": "sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==", "dev": true, "license": "MIT", "engines": { @@ -2330,8 +1708,6 @@ }, "node_modules/@jridgewell/gen-mapping": { "version": "0.3.13", - "resolved": "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.13.tgz", - "integrity": "sha512-2kkt/7niJ6MgEPxF0bYdQ6etZaA+fQvDcLKckhy1yIQOzaoKjBBjSj63/aLVjYE3qhRt5dvM+uUyfCg6UKCBbA==", "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.0", @@ -2340,8 +1716,6 @@ }, "node_modules/@jridgewell/remapping": { "version": "2.3.5", - "resolved": "https://registry.npmjs.org/@jridgewell/remapping/-/remapping-2.3.5.tgz", - "integrity": "sha512-LI9u/+laYG4Ds1TDKSJW2YPrIlcVYOwi2fUC6xB43lueCjgxV4lffOCZCtYFiH6TNOX+tQKXx97T4IKHbhyHEQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2351,8 +1725,6 @@ }, "node_modules/@jridgewell/resolve-uri": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.2.tgz", - "integrity": "sha512-bRISgCIjP20/tbWSPWMEi54QVPRZExkuD9lJL+UIxUKtwVJA8wW1Trb1jMs1RFXo1CBTNZ/5hpC9QvmKWdopKw==", "license": "MIT", "engines": { "node": ">=6.0.0" @@ -2360,8 +1732,6 @@ }, "node_modules/@jridgewell/source-map": { "version": "0.3.11", - "resolved": "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.11.tgz", - "integrity": "sha512-ZMp1V8ZFcPG5dIWnQLr3NSI1MiCU7UETdS/A0G8V/XWHvJv3ZsFqutJn1Y5RPmAPX6F3BiE397OqveU/9NCuIA==", "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.5", @@ -2370,14 +1740,10 @@ }, "node_modules/@jridgewell/sourcemap-codec": { "version": "1.5.5", - "resolved": "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.5.5.tgz", - "integrity": "sha512-cYQ9310grqxueWbl+WuIUIaiUaDcj7WOq5fVhEljNVgRfOUhY9fy2zTvfoqWsnebh8Sl70VScFbICvJnLKB0Og==", "license": "MIT" }, "node_modules/@jridgewell/trace-mapping": { "version": "0.3.31", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.31.tgz", - "integrity": "sha512-zzNR+SdQSDJzc8joaeP8QQoCQr8NuYx2dIIytl1QeBEZHJ9uW6hebsrYgbz8hJwUQao3TWCMtmfV8Nu1twOLAw==", "license": "MIT", "dependencies": { "@jridgewell/resolve-uri": "^3.1.0", @@ -2386,8 +1752,6 @@ }, "node_modules/@jsdoc/salty": { "version": "0.2.9", - "resolved": "https://registry.npmjs.org/@jsdoc/salty/-/salty-0.2.9.tgz", - "integrity": "sha512-yYxMVH7Dqw6nO0d5NIV8OQWnitU8k6vXH8NtgqAfIa/IUqRMxRv/NUJJ08VEKbAakwxlgBl5PJdrU0dMPStsnw==", "license": "Apache-2.0", "dependencies": { "lodash": "^4.17.21" @@ -2398,8 +1762,6 @@ }, "node_modules/@koa/cors": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@koa/cors/-/cors-5.0.0.tgz", - "integrity": "sha512-x/iUDjcS90W69PryLDIMgFyV21YLTnG9zOpPXS7Bkt2b8AsY3zZsIpOLBkYr9fBcF3HbkKaER5hOBZLfpLgYNw==", "dev": true, "license": "MIT", "dependencies": { @@ -2411,14 +1773,10 @@ }, "node_modules/@lit-labs/ssr-dom-shim": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/@lit-labs/ssr-dom-shim/-/ssr-dom-shim-1.4.0.tgz", - "integrity": "sha512-ficsEARKnmmW5njugNYKipTm4SFnbik7CXtoencDZzmzo/dQ+2Q0bgkzJuoJP20Aj0F+izzJjOqsnkd6F/o1bw==", "license": "BSD-3-Clause" }, "node_modules/@mapbox/node-pre-gyp": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@mapbox/node-pre-gyp/-/node-pre-gyp-2.0.0.tgz", - "integrity": "sha512-llMXd39jtP0HpQLVI37Bf1m2ADlEb35GYSh1SDSLsBhR+5iCxiNGlT31yqbNtVHygHAtMy6dWFERpU2JgufhPg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -2439,8 +1797,6 @@ }, "node_modules/@noble/hashes": { "version": "1.8.0", - "resolved": "https://registry.npmjs.org/@noble/hashes/-/hashes-1.8.0.tgz", - "integrity": "sha512-jCs9ldd7NwzpgXDIf6P3+NrHh9/sD6CQdxHyjQI+h/6rDNo88ypBxxz45UDuZHz9r3tNz7N/VInSVoVdtXEI4A==", "dev": true, "license": "MIT", "engines": { @@ -2452,8 +1808,6 @@ }, "node_modules/@nodelib/fs.scandir": { "version": "2.1.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz", - "integrity": "sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==", "license": "MIT", "dependencies": { "@nodelib/fs.stat": "2.0.5", @@ -2465,8 +1819,6 @@ }, "node_modules/@nodelib/fs.stat": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz", - "integrity": "sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==", "license": "MIT", "engines": { "node": ">= 8" @@ -2474,8 +1826,6 @@ }, "node_modules/@nodelib/fs.walk": { "version": "1.2.8", - "resolved": "https://registry.npmjs.org/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz", - "integrity": "sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==", "license": "MIT", "dependencies": { "@nodelib/fs.scandir": "2.1.5", @@ -2487,8 +1837,6 @@ }, "node_modules/@npmcli/agent": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-4.0.0.tgz", - "integrity": "sha512-kAQTcEN9E8ERLVg5AsGwLNoFb+oEG6engbqAU2P43gD4JEIkNGMHdVQ096FsOAAYpZPB0RSt0zgInKIAS1l5QA==", "license": "ISC", "dependencies": { "agent-base": "^7.1.0", @@ -2503,8 +1851,6 @@ }, "node_modules/@npmcli/agent/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -2520,8 +1866,6 @@ }, "node_modules/@npmcli/agent/node_modules/http-proxy-agent": { "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", "license": "MIT", "dependencies": { "agent-base": "^7.1.0", @@ -2533,14 +1877,10 @@ }, "node_modules/@npmcli/agent/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, "node_modules/@npmcli/arborist": { "version": "7.5.4", - "resolved": "https://registry.npmjs.org/@npmcli/arborist/-/arborist-7.5.4.tgz", - "integrity": "sha512-nWtIc6QwwoUORCRNzKx4ypHqCk3drI+5aeYdMTQQiRCcn4lOOgfQh7WyZobGYTxXPSq1VwV53lkpN/BRlRk08g==", "dev": true, "license": "ISC", "dependencies": { @@ -2589,8 +1929,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@npmcli/agent": { "version": "2.2.2", - "resolved": "https://registry.npmjs.org/@npmcli/agent/-/agent-2.2.2.tgz", - "integrity": "sha512-OrcNPXdpSl9UX7qPVRWbmWMCSXrcDa2M9DvrbOTj7ao1S4PlqVFYv9/yLKMkrJKZ/V5A/kDBC690or307i26Og==", "dev": true, "license": "ISC", "dependencies": { @@ -2606,8 +1944,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@npmcli/fs": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-3.1.1.tgz", - "integrity": "sha512-q9CRWjpHCMIh5sVyefoD1cA7PkvILqCZsnSOEUUivORLjxCO/Irmue2DprETiNgEqktDBZaM1Bi+jrarx1XdCg==", "dev": true, "license": "ISC", "dependencies": { @@ -2619,8 +1955,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@npmcli/git": { "version": "5.0.8", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-5.0.8.tgz", - "integrity": "sha512-liASfw5cqhjNW9UFd+ruwwdEf/lbOAQjLL2XY2dFW/bkJheXDYZgOyul/4gVvEV4BWkTXjYGmDqMw9uegdbJNQ==", "dev": true, "license": "ISC", "dependencies": { @@ -2640,8 +1974,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@npmcli/installed-package-contents": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-2.1.0.tgz", - "integrity": "sha512-c8UuGLeZpm69BryRykLuKRyKFZYJsZSCT4aVY5ds4omyZqJ172ApzgfKJ5eV/r3HgLdUYgFVe54KSFVjKoe27w==", "dev": true, "license": "ISC", "dependencies": { @@ -2657,8 +1989,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@npmcli/map-workspaces": { "version": "3.0.6", - "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-3.0.6.tgz", - "integrity": "sha512-tkYs0OYnzQm6iIRdfy+LcLBjcKuQCeE5YLb8KnrIlutJfheNaPvPpgoFEyEFgbjzl5PLZ3IA/BWAwRU0eHuQDA==", "dev": true, "license": "ISC", "dependencies": { @@ -2673,8 +2003,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@npmcli/metavuln-calculator": { "version": "7.1.1", - "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-7.1.1.tgz", - "integrity": "sha512-Nkxf96V0lAx3HCpVda7Vw4P23RILgdi/5K1fmj2tZkWIYLpXAN8k2UVVOsW16TsS5F8Ws2I7Cm+PU1/rsVF47g==", "dev": true, "license": "ISC", "dependencies": { @@ -2690,8 +2018,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@npmcli/name-from-folder": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-2.0.0.tgz", - "integrity": "sha512-pwK+BfEBZJbKdNYpHHRTNBwBoqrN/iIMO0AiGvYsp3Hoaq0WbgGSWQR6SCldZovoDpY3yje5lkFUe6gsDgJ2vg==", "dev": true, "license": "ISC", "engines": { @@ -2700,8 +2026,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@npmcli/node-gyp": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-3.0.0.tgz", - "integrity": "sha512-gp8pRXC2oOxu0DUE1/M3bYtb1b3/DbJ5aM113+XJBgfXdussRAsX0YOrOhdd8WvnAR6auDBvJomGAkLKA5ydxA==", "dev": true, "license": "ISC", "engines": { @@ -2710,8 +2034,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@npmcli/package-json": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-5.2.1.tgz", - "integrity": "sha512-f7zYC6kQautXHvNbLEWgD/uGu1+xCn9izgqBfgItWSx22U0ZDekxN08A1vM8cTxj/cRVe0Q94Ode+tdoYmIOOQ==", "dev": true, "license": "ISC", "dependencies": { @@ -2729,8 +2051,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@npmcli/promise-spawn": { "version": "7.0.2", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-7.0.2.tgz", - "integrity": "sha512-xhfYPXoV5Dy4UkY0D+v2KkwvnDfiA/8Mt3sWCGI/hM03NsYIH8ZaG6QzS9x7pje5vHZBZJ2v6VRFVTWACnqcmQ==", "dev": true, "license": "ISC", "dependencies": { @@ -2742,8 +2062,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@npmcli/query": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/query/-/query-3.1.0.tgz", - "integrity": "sha512-C/iR0tk7KSKGldibYIB9x8GtO/0Bd0I2mhOaDb8ucQL/bQVTmGoeREaFj64Z5+iCBRf3dQfed0CjJL7I8iTkiQ==", "dev": true, "license": "ISC", "dependencies": { @@ -2755,8 +2073,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@npmcli/redact": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-2.0.1.tgz", - "integrity": "sha512-YgsR5jCQZhVmTJvjduTOIHph0L73pK8xwMVaDY0PatySqVM9AZj93jpoXYSJqfHFxFkN9dmqTw6OiqExsS3LPw==", "dev": true, "license": "ISC", "engines": { @@ -2765,8 +2081,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@npmcli/run-script": { "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-8.1.0.tgz", - "integrity": "sha512-y7efHHwghQfk28G2z3tlZ67pLG0XdfYbcVG26r7YIXALRsrVQcTq4/tdenSmdOrEsNahIYA/eh8aEVROWGFUDg==", "dev": true, "license": "ISC", "dependencies": { @@ -2783,8 +2097,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@sigstore/bundle": { "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-2.3.2.tgz", - "integrity": "sha512-wueKWDk70QixNLB363yHc2D2ItTgYiMTdPwK8D9dKQMR3ZQ0c35IxP5xnwQ8cNLoCgCRcHf14kE+CLIvNX1zmA==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -2796,8 +2108,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@sigstore/core": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-1.1.0.tgz", - "integrity": "sha512-JzBqdVIyqm2FRQCulY6nbQzMpJJpSiJ8XXWMhtOX9eKgaXXpfNOF53lzQEjIydlStnd/eFtuC1dW4VYdD93oRg==", "dev": true, "license": "Apache-2.0", "engines": { @@ -2806,8 +2116,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@sigstore/protobuf-specs": { "version": "0.3.3", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.3.3.tgz", - "integrity": "sha512-RpacQhBlwpBWd7KEJsRKcBQalbV28fvkxwTOJIqhIuDysMMaJW47V4OqW30iJB9uRpqOSxxEAQFdr8tTattReQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -2816,8 +2124,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@sigstore/sign": { "version": "2.3.2", - "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-2.3.2.tgz", - "integrity": "sha512-5Vz5dPVuunIIvC5vBb0APwo7qKA4G9yM48kPWJT+OEERs40md5GoUR1yedwpekWZ4m0Hhw44m6zU+ObsON+iDA==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -2834,8 +2140,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@sigstore/tuf": { "version": "2.3.4", - "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-2.3.4.tgz", - "integrity": "sha512-44vtsveTPUpqhm9NCrbU8CWLe3Vck2HO1PNLw7RIajbB7xhtn5RBPm1VNSCMwqGYHhDsBJG8gDF0q4lgydsJvw==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -2848,8 +2152,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@sigstore/verify": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-1.2.1.tgz", - "integrity": "sha512-8iKx79/F73DKbGfRf7+t4dqrc0bRr0thdPrxAtCKWRm/F0tG71i6O1rvlnScncJLLBZHn3h8M3c1BSUAb9yu8g==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -2863,8 +2165,6 @@ }, "node_modules/@npmcli/arborist/node_modules/@tufjs/models": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-2.0.1.tgz", - "integrity": "sha512-92F7/SFyufn4DXsha9+QfKnN03JGqtMFMXgSHbZOo8JG59WkTni7UzAouNQDf7AuP9OAMxVOPQcqG3sB7w+kkg==", "dev": true, "license": "MIT", "dependencies": { @@ -2877,8 +2177,6 @@ }, "node_modules/@npmcli/arborist/node_modules/abbrev": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", "dev": true, "license": "ISC", "engines": { @@ -2887,8 +2185,6 @@ }, "node_modules/@npmcli/arborist/node_modules/bin-links": { "version": "4.0.4", - "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-4.0.4.tgz", - "integrity": "sha512-cMtq4W5ZsEwcutJrVId+a/tjt8GSbS+h0oNkdl6+6rBuEv8Ot33Bevj5KPm40t309zuhVic8NjpuL42QCiJWWA==", "dev": true, "license": "ISC", "dependencies": { @@ -2903,8 +2199,6 @@ }, "node_modules/@npmcli/arborist/node_modules/brace-expansion": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -2913,8 +2207,6 @@ }, "node_modules/@npmcli/arborist/node_modules/cacache": { "version": "18.0.4", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-18.0.4.tgz", - "integrity": "sha512-B+L5iIa9mgcjLbliir2th36yEwPftrzteHYujzsx3dFP/31GCHcIeS8f5MGd80odLOjaOvSpU3EEAmRQptkxLQ==", "dev": true, "license": "ISC", "dependencies": { @@ -2937,8 +2229,6 @@ }, "node_modules/@npmcli/arborist/node_modules/chownr": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-2.0.0.tgz", - "integrity": "sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==", "dev": true, "license": "ISC", "engines": { @@ -2947,8 +2237,6 @@ }, "node_modules/@npmcli/arborist/node_modules/cmd-shim": { "version": "6.0.3", - "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-6.0.3.tgz", - "integrity": "sha512-FMabTRlc5t5zjdenF6mS0MBeFZm0XqHqeOkcskKFb/LYCcRQ5fVgLOHVc4Lq9CqABd9zhjwPjMBCJvMCziSVtA==", "dev": true, "license": "ISC", "engines": { @@ -2957,8 +2245,6 @@ }, "node_modules/@npmcli/arborist/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -2975,8 +2261,6 @@ }, "node_modules/@npmcli/arborist/node_modules/glob": { "version": "10.5.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", - "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", "dev": true, "license": "ISC", "dependencies": { @@ -2996,8 +2280,6 @@ }, "node_modules/@npmcli/arborist/node_modules/hosted-git-info": { "version": "7.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz", - "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==", "dev": true, "license": "ISC", "dependencies": { @@ -3009,8 +2291,6 @@ }, "node_modules/@npmcli/arborist/node_modules/http-proxy-agent": { "version": "7.0.2", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-7.0.2.tgz", - "integrity": "sha512-T1gkAiYYDWYx3V5Bmyu7HcfcvL7mUrTWiM6yOfa3PIphViJ/gFPbvidQ+veqSOHci/PxBcDabeUNCzpOODJZig==", "dev": true, "license": "MIT", "dependencies": { @@ -3023,8 +2303,6 @@ }, "node_modules/@npmcli/arborist/node_modules/ignore-walk": { "version": "6.0.5", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-6.0.5.tgz", - "integrity": "sha512-VuuG0wCnjhnylG1ABXT3dAuIpTNDs/G8jlpmwXY03fXoXy/8ZK8/T+hMzt8L4WnrLCJgdybqgPagnF/f97cg3A==", "dev": true, "license": "ISC", "dependencies": { @@ -3036,8 +2314,6 @@ }, "node_modules/@npmcli/arborist/node_modules/ini": { "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.3.tgz", - "integrity": "sha512-X7rqawQBvfdjS10YU1y1YVreA3SsLrW9dX2CewP2EbBJM4ypVNLDkO5y04gejPwKIY9lR+7r9gn3rFPt/kmWFg==", "dev": true, "license": "ISC", "engines": { @@ -3046,8 +2322,6 @@ }, "node_modules/@npmcli/arborist/node_modules/json-parse-even-better-errors": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz", - "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==", "dev": true, "license": "MIT", "engines": { @@ -3056,15 +2330,11 @@ }, "node_modules/@npmcli/arborist/node_modules/lru-cache": { "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "dev": true, "license": "ISC" }, "node_modules/@npmcli/arborist/node_modules/make-fetch-happen": { "version": "13.0.1", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-13.0.1.tgz", - "integrity": "sha512-cKTUFc/rbKUd/9meOvgrpJ2WrNzymt6jfRDdwg5UCnVzv9dTpEj9JS5m3wtziXVCjluIXyL8pcaukYqezIzZQA==", "dev": true, "license": "ISC", "dependencies": { @@ -3087,8 +2357,6 @@ }, "node_modules/@npmcli/arborist/node_modules/minimatch": { "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, "license": "ISC", "dependencies": { @@ -3103,8 +2371,6 @@ }, "node_modules/@npmcli/arborist/node_modules/minipass-fetch": { "version": "3.0.5", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-3.0.5.tgz", - "integrity": "sha512-2N8elDQAtSnFV0Dk7gt15KHsS0Fyz6CbYZ360h0WTYV1Ty46li3rAXVOQj1THMNLdmrD9Vt5pBPtWtVkpwGBqg==", "dev": true, "license": "MIT", "dependencies": { @@ -3121,8 +2387,6 @@ }, "node_modules/@npmcli/arborist/node_modules/minizlib": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz", - "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==", "dev": true, "license": "MIT", "dependencies": { @@ -3135,8 +2399,6 @@ }, "node_modules/@npmcli/arborist/node_modules/minizlib/node_modules/minipass": { "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, "license": "ISC", "dependencies": { @@ -3148,15 +2410,11 @@ }, "node_modules/@npmcli/arborist/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/@npmcli/arborist/node_modules/node-gyp": { "version": "10.3.1", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-10.3.1.tgz", - "integrity": "sha512-Pp3nFHBThHzVtNY7U6JfPjvT/DTE8+o/4xKsLQtBoU+j2HLsGlhcfzflAoUreaJbNmYnX+LlLi0qjV8kpyO6xQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3180,8 +2438,6 @@ }, "node_modules/@npmcli/arborist/node_modules/nopt": { "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", "dev": true, "license": "ISC", "dependencies": { @@ -3196,8 +2452,6 @@ }, "node_modules/@npmcli/arborist/node_modules/npm-bundled": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-3.0.1.tgz", - "integrity": "sha512-+AvaheE/ww1JEwRHOrn4WHNzOxGtVp+adrg2AeZS/7KuxGUYFuBta98wYpfHBbJp6Tg6j1NKSEVHNcfZzJHQwQ==", "dev": true, "license": "ISC", "dependencies": { @@ -3209,8 +2463,6 @@ }, "node_modules/@npmcli/arborist/node_modules/npm-install-checks": { "version": "6.3.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-6.3.0.tgz", - "integrity": "sha512-W29RiK/xtpCGqn6f3ixfRYGk+zRyr+Ew9F2E20BfXxT5/euLdA/Nm7fO7OeTGuAmTs30cpgInyJ0cYe708YTZw==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -3222,8 +2474,6 @@ }, "node_modules/@npmcli/arborist/node_modules/npm-normalize-package-bin": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", - "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", "dev": true, "license": "ISC", "engines": { @@ -3232,8 +2482,6 @@ }, "node_modules/@npmcli/arborist/node_modules/npm-package-arg": { "version": "11.0.3", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz", - "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==", "dev": true, "license": "ISC", "dependencies": { @@ -3248,8 +2496,6 @@ }, "node_modules/@npmcli/arborist/node_modules/npm-packlist": { "version": "8.0.2", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-8.0.2.tgz", - "integrity": "sha512-shYrPFIS/JLP4oQmAwDyk5HcyysKW8/JLTEA32S0Z5TzvpaeeX2yMFfoK1fjEBnCBvVyIB/Jj/GBFdm0wsgzbA==", "dev": true, "license": "ISC", "dependencies": { @@ -3261,8 +2507,6 @@ }, "node_modules/@npmcli/arborist/node_modules/npm-pick-manifest": { "version": "9.1.0", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-9.1.0.tgz", - "integrity": "sha512-nkc+3pIIhqHVQr085X9d2JzPzLyjzQS96zbruppqC9aZRm/x8xx6xhI98gHtsfELP2bE+loHq8ZaHFHhe+NauA==", "dev": true, "license": "ISC", "dependencies": { @@ -3277,8 +2521,6 @@ }, "node_modules/@npmcli/arborist/node_modules/npm-registry-fetch": { "version": "17.1.0", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-17.1.0.tgz", - "integrity": "sha512-5+bKQRH0J1xG1uZ1zMNvxW0VEyoNWgJpY9UDuluPFLKDfJ9u2JmmjmTJV1srBGQOROfdBMiVvnH2Zvpbm+xkVA==", "dev": true, "license": "ISC", "dependencies": { @@ -3297,8 +2539,6 @@ }, "node_modules/@npmcli/arborist/node_modules/p-map": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz", - "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==", "dev": true, "license": "MIT", "dependencies": { @@ -3313,8 +2553,6 @@ }, "node_modules/@npmcli/arborist/node_modules/pacote": { "version": "18.0.6", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-18.0.6.tgz", - "integrity": "sha512-+eK3G27SMwsB8kLIuj4h1FUhHtwiEUo21Tw8wNjmvdlpOEr613edv+8FUsTj/4F/VN5ywGE19X18N7CC2EJk6A==", "dev": true, "license": "ISC", "dependencies": { @@ -3345,8 +2583,6 @@ }, "node_modules/@npmcli/arborist/node_modules/parse-conflict-json": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-3.0.1.tgz", - "integrity": "sha512-01TvEktc68vwbJOtWZluyWeVGWjP+bZwXtPDMQVbBKzbJ/vZBif0L69KH1+cHv1SZ6e0FKLvjyHe8mqsIqYOmw==", "dev": true, "license": "ISC", "dependencies": { @@ -3360,8 +2596,6 @@ }, "node_modules/@npmcli/arborist/node_modules/path-scurry": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -3377,8 +2611,6 @@ }, "node_modules/@npmcli/arborist/node_modules/postcss-selector-parser": { "version": "6.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", - "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", "dev": true, "license": "MIT", "dependencies": { @@ -3391,8 +2623,6 @@ }, "node_modules/@npmcli/arborist/node_modules/proc-log": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-4.2.0.tgz", - "integrity": "sha512-g8+OnU/L2v+wyiVK+D5fA34J7EH8jZ8DDlvwhRCMxmMj7UCBvxiO1mGeN+36JXIKF4zevU4kRBd8lVgG9vLelA==", "dev": true, "license": "ISC", "engines": { @@ -3401,8 +2631,6 @@ }, "node_modules/@npmcli/arborist/node_modules/proggy": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/proggy/-/proggy-2.0.0.tgz", - "integrity": "sha512-69agxLtnI8xBs9gUGqEnK26UfiexpHy+KUpBQWabiytQjnn5wFY8rklAi7GRfABIuPNnQ/ik48+LGLkYYJcy4A==", "dev": true, "license": "ISC", "engines": { @@ -3411,8 +2639,6 @@ }, "node_modules/@npmcli/arborist/node_modules/read-cmd-shim": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-4.0.0.tgz", - "integrity": "sha512-yILWifhaSEEytfXI76kB9xEEiG1AiozaCJZ83A87ytjRiN+jVibXjedjCRNjoZviinhG+4UkalO3mWTd8u5O0Q==", "dev": true, "license": "ISC", "engines": { @@ -3421,8 +2647,6 @@ }, "node_modules/@npmcli/arborist/node_modules/sigstore": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-2.3.1.tgz", - "integrity": "sha512-8G+/XDU8wNsJOQS5ysDVO0Etg9/2uA5gR9l4ZwijjlwxBcrU6RPfwi2+jJmbP+Ap1Hlp/nVAaEO4Fj22/SL2gQ==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -3439,8 +2663,6 @@ }, "node_modules/@npmcli/arborist/node_modules/ssri": { "version": "10.0.6", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-10.0.6.tgz", - "integrity": "sha512-MGrFH9Z4NP9Iyhqn16sDtBpRRNJ0Y2hNa6D65h736fVSaPCHr4DM4sWUNvVaSuC+0OBGhwsrydQwmgfg5LncqQ==", "dev": true, "license": "ISC", "dependencies": { @@ -3452,8 +2674,6 @@ }, "node_modules/@npmcli/arborist/node_modules/tar": { "version": "6.2.1", - "resolved": "https://registry.npmjs.org/tar/-/tar-6.2.1.tgz", - "integrity": "sha512-DZ4yORTwrbTj/7MZYq2w+/ZFdI6OZ/f9SFHR+71gIVUZhOQPHzVCLpvRnPgyaMpfWxxk/4ONva3GQSyNIKRv6A==", "dev": true, "license": "ISC", "dependencies": { @@ -3470,8 +2690,6 @@ }, "node_modules/@npmcli/arborist/node_modules/tar/node_modules/fs-minipass": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz", - "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==", "dev": true, "license": "ISC", "dependencies": { @@ -3483,8 +2701,6 @@ }, "node_modules/@npmcli/arborist/node_modules/tar/node_modules/fs-minipass/node_modules/minipass": { "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "dev": true, "license": "ISC", "dependencies": { @@ -3496,8 +2712,6 @@ }, "node_modules/@npmcli/arborist/node_modules/tar/node_modules/minipass": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-5.0.0.tgz", - "integrity": "sha512-3FnjYuehv9k6ovOEbyOswadCDPX1piCfhV8ncmYtHOjuPwylVWsghTLo7rabjC3Rx5xD4HDx8Wm1xnMF7S5qFQ==", "dev": true, "license": "ISC", "engines": { @@ -3506,8 +2720,6 @@ }, "node_modules/@npmcli/arborist/node_modules/tuf-js": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-2.2.1.tgz", - "integrity": "sha512-GwIJau9XaA8nLVbUXsN3IlFi7WmQ48gBUrl3FTkkL/XLu/POhBzfmX9hd33FNMX1qAsfl6ozO1iMmW9NC8YniA==", "dev": true, "license": "MIT", "dependencies": { @@ -3521,8 +2733,6 @@ }, "node_modules/@npmcli/arborist/node_modules/unique-filename": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-3.0.0.tgz", - "integrity": "sha512-afXhuC55wkAmZ0P18QsVE6kp8JaxrEokN2HGIoIVv2ijHQd419H0+6EigAFcIzXeMIkcIkNBpB3L/DXB3cTS/g==", "dev": true, "license": "ISC", "dependencies": { @@ -3534,8 +2744,6 @@ }, "node_modules/@npmcli/arborist/node_modules/unique-slug": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-4.0.0.tgz", - "integrity": "sha512-WrcA6AyEfqDX5bWige/4NQfPZMtASNVxdmWR76WESYQVAACSgWcR6e9i0mofqqBxYFtL4oAxPIptY73/0YE1DQ==", "dev": true, "license": "ISC", "dependencies": { @@ -3547,8 +2755,6 @@ }, "node_modules/@npmcli/arborist/node_modules/validate-npm-package-name": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz", - "integrity": "sha512-OljLrQ9SQdOUqTaQxqL5dEfZWrXExyyWsozYlAWFawPVNuD83igl7uJD2RTkNMbniIYgt8l81eCJGIdQF7avLQ==", "dev": true, "license": "ISC", "engines": { @@ -3557,8 +2763,6 @@ }, "node_modules/@npmcli/arborist/node_modules/which": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-4.0.0.tgz", - "integrity": "sha512-GlaYyEb07DPxYCKhKzplCWBJtvxZcZMrL+4UkrTSJHHPyZU4mYYTv3qaOe77H7EODLSSopAUFAc6W8U4yqvscg==", "dev": true, "license": "ISC", "dependencies": { @@ -3573,8 +2777,6 @@ }, "node_modules/@npmcli/arborist/node_modules/write-file-atomic": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-5.0.1.tgz", - "integrity": "sha512-+QU2zd6OTD8XWIJCbffaiQeH9U73qIqafo1x6V1snCWYGJf6cVE0cDR4D8xRzcEnfI21IFrUPzPGtcPf8AC+Rw==", "dev": true, "license": "ISC", "dependencies": { @@ -3587,15 +2789,11 @@ }, "node_modules/@npmcli/arborist/node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "dev": true, "license": "ISC" }, "node_modules/@npmcli/fs": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-5.0.0.tgz", - "integrity": "sha512-7OsC1gNORBEawOa5+j2pXN9vsicaIOH5cPXxoR6fJOmH6/EXpJB2CajXOu1fPRFun2m1lktEFX11+P89hqO/og==", "license": "ISC", "dependencies": { "semver": "^7.3.5" @@ -3606,8 +2804,6 @@ }, "node_modules/@npmcli/git": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/git/-/git-7.0.1.tgz", - "integrity": "sha512-+XTFxK2jJF/EJJ5SoAzXk3qwIDfvFc5/g+bD274LZ7uY7LE8sTfG6Z8rOanPl2ZEvZWqNvmEdtXC25cE54VcoA==", "license": "ISC", "dependencies": { "@npmcli/promise-spawn": "^9.0.0", @@ -3625,8 +2821,6 @@ }, "node_modules/@npmcli/git/node_modules/ini": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-6.0.0.tgz", - "integrity": "sha512-IBTdIkzZNOpqm7q3dRqJvMaldXjDHWkEDfrwGEQTs5eaQMWV+djAhR+wahyNNMAa+qpbDUhBMVt4ZKNwpPm7xQ==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -3634,8 +2828,6 @@ }, "node_modules/@npmcli/git/node_modules/proc-log": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.0.0.tgz", - "integrity": "sha512-KG/XsTDN901PNfPfAMmj6N/Ywg9tM+bHK8pAz+27fS4N4Pcr+4zoYBOcGSBu6ceXYNPxkLpa4ohtfxV1XcLAfA==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -3643,8 +2835,6 @@ }, "node_modules/@npmcli/installed-package-contents": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/installed-package-contents/-/installed-package-contents-4.0.0.tgz", - "integrity": "sha512-yNyAdkBxB72gtZ4GrwXCM0ZUedo9nIbOMKfGjt6Cu6DXf0p8y1PViZAKDC8q8kv/fufx0WTjRBdSlyrvnP7hmA==", "license": "ISC", "dependencies": { "npm-bundled": "^5.0.0", @@ -3659,8 +2849,6 @@ }, "node_modules/@npmcli/metavuln-calculator": { "version": "9.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/metavuln-calculator/-/metavuln-calculator-9.0.3.tgz", - "integrity": "sha512-94GLSYhLXF2t2LAC7pDwLaM4uCARzxShyAQKsirmlNcpidH89VA4/+K1LbJmRMgz5gy65E/QBBWQdUvGLe2Frg==", "license": "ISC", "dependencies": { "cacache": "^20.0.0", @@ -3675,8 +2863,6 @@ }, "node_modules/@npmcli/metavuln-calculator/node_modules/proc-log": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.0.0.tgz", - "integrity": "sha512-KG/XsTDN901PNfPfAMmj6N/Ywg9tM+bHK8pAz+27fS4N4Pcr+4zoYBOcGSBu6ceXYNPxkLpa4ohtfxV1XcLAfA==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -3684,8 +2870,6 @@ }, "node_modules/@npmcli/name-from-folder": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/name-from-folder/-/name-from-folder-4.0.0.tgz", - "integrity": "sha512-qfrhVlOSqmKM8i6rkNdZzABj8MKEITGFAY+4teqBziksCQAOLutiAxM1wY2BKEd8KjUSpWmWCYxvXr0y4VTlPg==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -3693,8 +2877,6 @@ }, "node_modules/@npmcli/node-gyp": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/node-gyp/-/node-gyp-5.0.0.tgz", - "integrity": "sha512-uuG5HZFXLfyFKqg8QypsmgLQW7smiRjVc45bqD/ofZZcR/uxEjgQU8qDPv0s9TEeMUiAAU/GC5bR6++UdTirIQ==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -3702,8 +2884,6 @@ }, "node_modules/@npmcli/package-json": { "version": "7.0.4", - "resolved": "https://registry.npmjs.org/@npmcli/package-json/-/package-json-7.0.4.tgz", - "integrity": "sha512-0wInJG3j/K40OJt/33ax47WfWMzZTm6OQxB9cDhTt5huCP2a9g2GnlsxmfN+PulItNPIpPrZ+kfwwUil7eHcZQ==", "license": "ISC", "dependencies": { "@npmcli/git": "^7.0.0", @@ -3720,8 +2900,6 @@ }, "node_modules/@npmcli/package-json/node_modules/proc-log": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz", - "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -3729,8 +2907,6 @@ }, "node_modules/@npmcli/promise-spawn": { "version": "9.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-9.0.1.tgz", - "integrity": "sha512-OLUaoqBuyxeTqUvjA3FZFiXUfYC1alp3Sa99gW3EUDz3tZ3CbXDdcZ7qWKBzicrJleIgucoWamWH1saAmH/l2Q==", "license": "ISC", "dependencies": { "which": "^6.0.0" @@ -3741,8 +2917,6 @@ }, "node_modules/@npmcli/query": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@npmcli/query/-/query-4.0.1.tgz", - "integrity": "sha512-4OIPFb4weUUwkDXJf4Hh1inAn8neBGq3xsH4ZsAaN6FK3ldrFkH7jSpCc7N9xesi0Sp+EBXJ9eGMDrEww2Ztqw==", "license": "ISC", "dependencies": { "postcss-selector-parser": "^7.0.0" @@ -3753,8 +2927,6 @@ }, "node_modules/@npmcli/redact": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@npmcli/redact/-/redact-4.0.0.tgz", - "integrity": "sha512-gOBg5YHMfZy+TfHArfVogwgfBeQnKbbGo3pSUyK/gSI0AVu+pEiDVcKlQb0D8Mg1LNRZILZ6XG8I5dJ4KuAd9Q==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -3762,8 +2934,6 @@ }, "node_modules/@npmcli/run-script": { "version": "10.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/run-script/-/run-script-10.0.3.tgz", - "integrity": "sha512-ER2N6itRkzWbbtVmZ9WKaWxVlKlOeBFF1/7xx+KA5J1xKa4JjUwBdb6tDpk0v1qA+d+VDwHI9qmLcXSWcmi+Rw==", "license": "ISC", "dependencies": { "@npmcli/node-gyp": "^5.0.0", @@ -3779,8 +2949,6 @@ }, "node_modules/@npmcli/run-script/node_modules/proc-log": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.0.0.tgz", - "integrity": "sha512-KG/XsTDN901PNfPfAMmj6N/Ywg9tM+bHK8pAz+27fS4N4Pcr+4zoYBOcGSBu6ceXYNPxkLpa4ohtfxV1XcLAfA==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -3788,15 +2956,11 @@ }, "node_modules/@one-ini/wasm": { "version": "0.1.1", - "resolved": "https://registry.npmjs.org/@one-ini/wasm/-/wasm-0.1.1.tgz", - "integrity": "sha512-XuySG1E38YScSJoMlqovLru4KTUNSjgVTIjyh7qMX6aNN5HY5Ct5LhRJdxO79JtTzKfzV/bnWpz+zquYrISsvw==", "dev": true, "license": "MIT" }, "node_modules/@paralleldrive/cuid2": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@paralleldrive/cuid2/-/cuid2-2.3.1.tgz", - "integrity": "sha512-XO7cAxhnTZl0Yggq6jOgjiOHhbgcO4NqFqwSmQpjK3b6TEE6Uj/jfSk6wzYyemh3+I0sHirKSetjQwn5cZktFw==", "dev": true, "license": "MIT", "dependencies": { @@ -3805,8 +2969,6 @@ }, "node_modules/@pkgjs/parseargs": { "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@pkgjs/parseargs/-/parseargs-0.11.0.tgz", - "integrity": "sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==", "license": "MIT", "optional": true, "engines": { @@ -3815,8 +2977,6 @@ }, "node_modules/@pnpm/config.env-replace": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/@pnpm/config.env-replace/-/config.env-replace-1.1.0.tgz", - "integrity": "sha512-htyl8TWnKL7K/ESFa1oW2UB5lVDxuF5DpM7tBi6Hu2LNL3mWkIzNLG6N4zoCUP1lCKNxWy/3iu8mS8MvToGd6w==", "license": "MIT", "engines": { "node": ">=12.22.0" @@ -3824,8 +2984,6 @@ }, "node_modules/@pnpm/network.ca-file": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/@pnpm/network.ca-file/-/network.ca-file-1.0.2.tgz", - "integrity": "sha512-YcPQ8a0jwYU9bTdJDpXjMi7Brhkr1mXsXrUJvjqM2mQDgkRiz8jFaQGOdaLxgjtUfQgZhKy/O3cG/YwmgKaxLA==", "license": "MIT", "dependencies": { "graceful-fs": "4.2.10" @@ -3836,14 +2994,10 @@ }, "node_modules/@pnpm/network.ca-file/node_modules/graceful-fs": { "version": "4.2.10", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz", - "integrity": "sha512-9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA==", "license": "ISC" }, "node_modules/@pnpm/npm-conf": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/@pnpm/npm-conf/-/npm-conf-2.3.1.tgz", - "integrity": "sha512-c83qWb22rNRuB0UaVCI0uRPNRr8Z0FWnEIvT47jiHAmOIUHbBOg5XvV7pM5x+rKn9HRpjxquDbXYSXr3fAKFcw==", "license": "MIT", "dependencies": { "@pnpm/config.env-replace": "^1.1.0", @@ -3856,8 +3010,6 @@ }, "node_modules/@rollup/pluginutils": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/@rollup/pluginutils/-/pluginutils-5.3.0.tgz", - "integrity": "sha512-5EdhGZtnu3V88ces7s53hhfK5KSASnJZv8Lulpc04cWO3REESroJXg73DFsOmgbU2BhwV0E20bu2IDZb3VKW4Q==", "dev": true, "license": "MIT", "dependencies": { @@ -3877,36 +3029,8 @@ } } }, - "node_modules/@rollup/rollup-android-arm-eabi": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm-eabi/-/rollup-android-arm-eabi-4.53.3.tgz", - "integrity": "sha512-mRSi+4cBjrRLoaal2PnqH82Wqyb+d3HsPUN/W+WslCXsZsyHa9ZeQQX/pQsZaVIWDkPcpV6jJ+3KLbTbgnwv8w==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ] - }, - "node_modules/@rollup/rollup-android-arm64": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-android-arm64/-/rollup-android-arm64-4.53.3.tgz", - "integrity": "sha512-CbDGaMpdE9sh7sCmTrTUyllhrg65t6SwhjlMJsLr+J8YjFuPmCEjbBSx4Z/e4SmDyH3aB5hGaJUP2ltV/vcs4w==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "android" - ] - }, "node_modules/@rollup/rollup-darwin-arm64": { "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-arm64/-/rollup-darwin-arm64-4.53.3.tgz", - "integrity": "sha512-Nr7SlQeqIBpOV6BHHGZgYBuSdanCXuw09hon14MGOLGmXAFYjx1wNvquVPmpZnl0tLjg25dEdr4IQ6GgyToCUA==", "cpu": [ "arm64" ], @@ -3916,270 +3040,17 @@ "darwin" ] }, - "node_modules/@rollup/rollup-darwin-x64": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-darwin-x64/-/rollup-darwin-x64-4.53.3.tgz", - "integrity": "sha512-DZ8N4CSNfl965CmPktJ8oBnfYr3F8dTTNBQkRlffnUarJ2ohudQD17sZBa097J8xhQ26AwhHJ5mvUyQW8ddTsQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "darwin" - ] - }, - "node_modules/@rollup/rollup-freebsd-arm64": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-arm64/-/rollup-freebsd-arm64-4.53.3.tgz", - "integrity": "sha512-yMTrCrK92aGyi7GuDNtGn2sNW+Gdb4vErx4t3Gv/Tr+1zRb8ax4z8GWVRfr3Jw8zJWvpGHNpss3vVlbF58DZ4w==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/@rollup/rollup-freebsd-x64": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-freebsd-x64/-/rollup-freebsd-x64-4.53.3.tgz", - "integrity": "sha512-lMfF8X7QhdQzseM6XaX0vbno2m3hlyZFhwcndRMw8fbAGUGL3WFMBdK0hbUBIUYcEcMhVLr1SIamDeuLBnXS+Q==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "freebsd" - ] - }, - "node_modules/@rollup/rollup-linux-arm-gnueabihf": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-gnueabihf/-/rollup-linux-arm-gnueabihf-4.53.3.tgz", - "integrity": "sha512-k9oD15soC/Ln6d2Wv/JOFPzZXIAIFLp6B+i14KhxAfnq76ajt0EhYc5YPeX6W1xJkAdItcVT+JhKl1QZh44/qw==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm-musleabihf": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm-musleabihf/-/rollup-linux-arm-musleabihf-4.53.3.tgz", - "integrity": "sha512-vTNlKq+N6CK/8UktsrFuc+/7NlEYVxgaEgRXVUVK258Z5ymho29skzW1sutgYjqNnquGwVUObAaxae8rZ6YMhg==", - "cpu": [ - "arm" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-gnu": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-gnu/-/rollup-linux-arm64-gnu-4.53.3.tgz", - "integrity": "sha512-RGrFLWgMhSxRs/EWJMIFM1O5Mzuz3Xy3/mnxJp/5cVhZ2XoCAxJnmNsEyeMJtpK+wu0FJFWz+QF4mjCA7AUQ3w==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-arm64-musl": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-arm64-musl/-/rollup-linux-arm64-musl-4.53.3.tgz", - "integrity": "sha512-kASyvfBEWYPEwe0Qv4nfu6pNkITLTb32p4yTgzFCocHnJLAHs+9LjUu9ONIhvfT/5lv4YS5muBHyuV84epBo/A==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-loong64-gnu": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-loong64-gnu/-/rollup-linux-loong64-gnu-4.53.3.tgz", - "integrity": "sha512-JiuKcp2teLJwQ7vkJ95EwESWkNRFJD7TQgYmCnrPtlu50b4XvT5MOmurWNrCj3IFdyjBQ5p9vnrX4JM6I8OE7g==", - "cpu": [ - "loong64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-ppc64-gnu": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-ppc64-gnu/-/rollup-linux-ppc64-gnu-4.53.3.tgz", - "integrity": "sha512-EoGSa8nd6d3T7zLuqdojxC20oBfNT8nexBbB/rkxgKj5T5vhpAQKKnD+h3UkoMuTyXkP5jTjK/ccNRmQrPNDuw==", - "cpu": [ - "ppc64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-gnu": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-gnu/-/rollup-linux-riscv64-gnu-4.53.3.tgz", - "integrity": "sha512-4s+Wped2IHXHPnAEbIB0YWBv7SDohqxobiiPA1FIWZpX+w9o2i4LezzH/NkFUl8LRci/8udci6cLq+jJQlh+0g==", - "cpu": [ - "riscv64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-riscv64-musl": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-riscv64-musl/-/rollup-linux-riscv64-musl-4.53.3.tgz", - "integrity": "sha512-68k2g7+0vs2u9CxDt5ktXTngsxOQkSEV/xBbwlqYcUrAVh6P9EgMZvFsnHy4SEiUl46Xf0IObWVbMvPrr2gw8A==", - "cpu": [ - "riscv64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-s390x-gnu": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-s390x-gnu/-/rollup-linux-s390x-gnu-4.53.3.tgz", - "integrity": "sha512-VYsFMpULAz87ZW6BVYw3I6sWesGpsP9OPcyKe8ofdg9LHxSbRMd7zrVrr5xi/3kMZtpWL/wC+UIJWJYVX5uTKg==", - "cpu": [ - "s390x" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-gnu": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-gnu/-/rollup-linux-x64-gnu-4.53.3.tgz", - "integrity": "sha512-3EhFi1FU6YL8HTUJZ51imGJWEX//ajQPfqWLI3BQq4TlvHy4X0MOr5q3D2Zof/ka0d5FNdPwZXm3Yyib/UEd+w==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-linux-x64-musl": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-linux-x64-musl/-/rollup-linux-x64-musl-4.53.3.tgz", - "integrity": "sha512-eoROhjcc6HbZCJr+tvVT8X4fW3/5g/WkGvvmwz/88sDtSJzO7r/blvoBDgISDiCjDRZmHpwud7h+6Q9JxFwq1Q==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "linux" - ] - }, - "node_modules/@rollup/rollup-openharmony-arm64": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-openharmony-arm64/-/rollup-openharmony-arm64-4.53.3.tgz", - "integrity": "sha512-OueLAWgrNSPGAdUdIjSWXw+u/02BRTcnfw9PN41D2vq/JSEPnJnVuBgw18VkN8wcd4fjUs+jFHVM4t9+kBSNLw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "openharmony" - ] - }, - "node_modules/@rollup/rollup-win32-arm64-msvc": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-arm64-msvc/-/rollup-win32-arm64-msvc-4.53.3.tgz", - "integrity": "sha512-GOFuKpsxR/whszbF/bzydebLiXIHSgsEUp6M0JI8dWvi+fFa1TD6YQa4aSZHtpmh2/uAlj/Dy+nmby3TJ3pkTw==", - "cpu": [ - "arm64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-ia32-msvc": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-ia32-msvc/-/rollup-win32-ia32-msvc-4.53.3.tgz", - "integrity": "sha512-iah+THLcBJdpfZ1TstDFbKNznlzoxa8fmnFYK4V67HvmuNYkVdAywJSoteUszvBQ9/HqN2+9AZghbajMsFT+oA==", - "cpu": [ - "ia32" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-gnu": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-gnu/-/rollup-win32-x64-gnu-4.53.3.tgz", - "integrity": "sha512-J9QDiOIZlZLdcot5NXEepDkstocktoVjkaKUtqzgzpt2yWjGlbYiKyp05rWwk4nypbYUNoFAztEgixoLaSETkg==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, - "node_modules/@rollup/rollup-win32-x64-msvc": { - "version": "4.53.3", - "resolved": "https://registry.npmjs.org/@rollup/rollup-win32-x64-msvc/-/rollup-win32-x64-msvc-4.53.3.tgz", - "integrity": "sha512-UhTd8u31dXadv0MopwGgNOBpUVROFKWVQgAg5N1ESyCz8AuBcMqm4AuTjrwgQKGDfoFuz02EuMRHQIw/frmYKQ==", - "cpu": [ - "x64" - ], - "license": "MIT", - "optional": true, - "os": [ - "win32" - ] - }, "node_modules/@sap-theming/theming-base-content": { "version": "11.29.3", - "resolved": "https://registry.npmjs.org/@sap-theming/theming-base-content/-/theming-base-content-11.29.3.tgz", - "integrity": "sha512-0LVCUYqoTQGcKmgPShbxQLBoF8469ZojUrYtVm1k3op/1pgLA/FMN//bvgGEm7HTBJBu3gW2Ad2f4ASqEzLolA==", "license": "Apache-2.0" }, "node_modules/@sec-ant/readable-stream": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/@sec-ant/readable-stream/-/readable-stream-0.4.1.tgz", - "integrity": "sha512-831qok9r2t8AlxLko40y2ebgSDhenenCatLVeW/uBtnHPyhHOvG0C7TvfgecV+wHzIm5KUICgzmVpWS+IMEAeg==", "dev": true, "license": "MIT" }, "node_modules/@shikijs/core": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@shikijs/core/-/core-2.5.0.tgz", - "integrity": "sha512-uu/8RExTKtavlpH7XqnVYBrfBkUc20ngXiX9NSrBhOVZYv/7XQRKUyhtkeflY5QsxC0GbJThCerruZfsUaSldg==", "license": "MIT", "dependencies": { "@shikijs/engine-javascript": "2.5.0", @@ -4192,8 +3063,6 @@ }, "node_modules/@shikijs/engine-javascript": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@shikijs/engine-javascript/-/engine-javascript-2.5.0.tgz", - "integrity": "sha512-VjnOpnQf8WuCEZtNUdjjwGUbtAVKuZkVQ/5cHy/tojVVRIRtlWMYVjyWhxOmIq05AlSOv72z7hRNRGVBgQOl0w==", "license": "MIT", "dependencies": { "@shikijs/types": "2.5.0", @@ -4203,8 +3072,6 @@ }, "node_modules/@shikijs/engine-oniguruma": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@shikijs/engine-oniguruma/-/engine-oniguruma-2.5.0.tgz", - "integrity": "sha512-pGd1wRATzbo/uatrCIILlAdFVKdxImWJGQ5rFiB5VZi2ve5xj3Ax9jny8QvkaV93btQEwR/rSz5ERFpC5mKNIw==", "license": "MIT", "dependencies": { "@shikijs/types": "2.5.0", @@ -4213,8 +3080,6 @@ }, "node_modules/@shikijs/langs": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@shikijs/langs/-/langs-2.5.0.tgz", - "integrity": "sha512-Qfrrt5OsNH5R+5tJ/3uYBBZv3SuGmnRPejV9IlIbFH3HTGLDlkqgHymAlzklVmKBjAaVmkPkyikAV/sQ1wSL+w==", "license": "MIT", "dependencies": { "@shikijs/types": "2.5.0" @@ -4222,8 +3087,6 @@ }, "node_modules/@shikijs/themes": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@shikijs/themes/-/themes-2.5.0.tgz", - "integrity": "sha512-wGrk+R8tJnO0VMzmUExHR+QdSaPUl/NKs+a4cQQRWyoc3YFbUzuLEi/KWK1hj+8BfHRKm2jNhhJck1dfstJpiw==", "license": "MIT", "dependencies": { "@shikijs/types": "2.5.0" @@ -4231,8 +3094,6 @@ }, "node_modules/@shikijs/transformers": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@shikijs/transformers/-/transformers-2.5.0.tgz", - "integrity": "sha512-SI494W5X60CaUwgi8u4q4m4s3YAFSxln3tzNjOSYqq54wlVgz0/NbbXEb3mdLbqMBztcmS7bVTaEd2w0qMmfeg==", "license": "MIT", "dependencies": { "@shikijs/core": "2.5.0", @@ -4241,8 +3102,6 @@ }, "node_modules/@shikijs/types": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/@shikijs/types/-/types-2.5.0.tgz", - "integrity": "sha512-ygl5yhxki9ZLNuNpPitBWvcy9fsSKKaRuO4BAlMyagszQidxcpLAr0qiW/q43DtSIDxO6hEbtYLiFZNXO/hdGw==", "license": "MIT", "dependencies": { "@shikijs/vscode-textmate": "^10.0.2", @@ -4251,14 +3110,10 @@ }, "node_modules/@shikijs/vscode-textmate": { "version": "10.0.2", - "resolved": "https://registry.npmjs.org/@shikijs/vscode-textmate/-/vscode-textmate-10.0.2.tgz", - "integrity": "sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==", "license": "MIT" }, "node_modules/@sigstore/bundle": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@sigstore/bundle/-/bundle-4.0.0.tgz", - "integrity": "sha512-NwCl5Y0V6Di0NexvkTqdoVfmjTaQwoLM236r89KEojGmq/jMls8S+zb7yOwAPdXvbwfKDlP+lmXgAL4vKSQT+A==", "license": "Apache-2.0", "dependencies": { "@sigstore/protobuf-specs": "^0.5.0" @@ -4269,8 +3124,6 @@ }, "node_modules/@sigstore/core": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@sigstore/core/-/core-3.0.0.tgz", - "integrity": "sha512-NgbJ+aW9gQl/25+GIEGYcCyi8M+ng2/5X04BMuIgoDfgvp18vDcoNHOQjQsG9418HGNYRxG3vfEXaR1ayD37gg==", "license": "Apache-2.0", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -4278,8 +3131,6 @@ }, "node_modules/@sigstore/protobuf-specs": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/@sigstore/protobuf-specs/-/protobuf-specs-0.5.0.tgz", - "integrity": "sha512-MM8XIwUjN2bwvCg1QvrMtbBmpcSHrkhFSCu1D11NyPvDQ25HEc4oG5/OcQfd/Tlf/OxmKWERDj0zGE23jQaMwA==", "license": "Apache-2.0", "engines": { "node": "^18.17.0 || >=20.5.0" @@ -4287,8 +3138,6 @@ }, "node_modules/@sigstore/sign": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/@sigstore/sign/-/sign-4.0.1.tgz", - "integrity": "sha512-KFNGy01gx9Y3IBPG/CergxR9RZpN43N+lt3EozEfeoyqm8vEiLxwRl3ZO5sPx3Obv1ix/p7FWOlPc2Jgwfp9PA==", "license": "Apache-2.0", "dependencies": { "@sigstore/bundle": "^4.0.0", @@ -4302,10 +3151,42 @@ "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/@sigstore/sign/node_modules/make-fetch-happen": { + "version": "15.0.3", + "license": "ISC", + "dependencies": { + "@npmcli/agent": "^4.0.0", + "cacache": "^20.0.1", + "http-cache-semantics": "^4.1.1", + "minipass": "^7.0.2", + "minipass-fetch": "^5.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^1.0.0", + "proc-log": "^6.0.0", + "promise-retry": "^2.0.1", + "ssri": "^13.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@sigstore/sign/node_modules/make-fetch-happen/node_modules/proc-log": { + "version": "6.0.0", + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/@sigstore/sign/node_modules/negotiator": { + "version": "1.0.0", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/@sigstore/tuf": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@sigstore/tuf/-/tuf-4.0.0.tgz", - "integrity": "sha512-0QFuWDHOQmz7t66gfpfNO6aEjoFrdhkJaej/AOqb4kqWZVbPWFZifXZzkxyQBB1OwTbkhdT3LNpMFxwkTvf+2w==", "license": "Apache-2.0", "dependencies": { "@sigstore/protobuf-specs": "^0.5.0", @@ -4317,8 +3198,6 @@ }, "node_modules/@sigstore/verify": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/@sigstore/verify/-/verify-3.0.0.tgz", - "integrity": "sha512-moXtHH33AobOhTZF8xcX1MpOFqdvfCk7v6+teJL8zymBiDXwEsQH6XG9HGx2VIxnJZNm4cNSzflTLDnQLmIdmw==", "license": "Apache-2.0", "dependencies": { "@sigstore/bundle": "^4.0.0", @@ -4331,8 +3210,6 @@ }, "node_modules/@sindresorhus/base62": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/base62/-/base62-1.0.0.tgz", - "integrity": "sha512-TeheYy0ILzBEI/CO55CP6zJCSdSWeRtGnHy8U8dWSUH4I68iqTsy7HkMktR4xakThc9jotkPQUXT4ITdbV7cHA==", "dev": true, "license": "MIT", "engines": { @@ -4344,8 +3221,6 @@ }, "node_modules/@sindresorhus/merge-streams": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-4.0.0.tgz", - "integrity": "sha512-tlqY9xq5ukxTUZBmoOp+m61cqwQD5pHJtFY3Mn8CA8ps6yghLH/Hw8UPdqg4OLmFW3IFlcXnQNmo/dh8HzXYIQ==", "license": "MIT", "engines": { "node": ">=18" @@ -4356,8 +3231,6 @@ }, "node_modules/@sinonjs/commons": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/@sinonjs/commons/-/commons-3.0.1.tgz", - "integrity": "sha512-K3mCHKQ9sVh8o1C9cxkwxaOmXoAMlDxC1mYyHrjqOWEcBjYr76t96zL2zlj5dUGZ3HSw240X1qgH3Mjf1yJWpQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -4365,9 +3238,7 @@ } }, "node_modules/@sinonjs/fake-timers": { - "version": "15.1.0", - "resolved": "https://registry.npmjs.org/@sinonjs/fake-timers/-/fake-timers-15.1.0.tgz", - "integrity": "sha512-cqfapCxwTGsrR80FEgOoPsTonoefMBY7dnUEbQ+GRcved0jvkJLzvX6F4WtN+HBqbPX/SiFsIRUp+IrCW/2I2w==", + "version": "13.0.5", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -4376,8 +3247,6 @@ }, "node_modules/@sinonjs/samsam": { "version": "8.0.3", - "resolved": "https://registry.npmjs.org/@sinonjs/samsam/-/samsam-8.0.3.tgz", - "integrity": "sha512-hw6HbX+GyVZzmaYNh82Ecj1vdGZrqVIn/keDTg63IgAwiQPO+xCz99uG6Woqgb4tM0mUiFENKZ4cqd7IX94AXQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -4387,8 +3256,6 @@ }, "node_modules/@sinonjs/samsam/node_modules/type-detect": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.1.0.tgz", - "integrity": "sha512-Acylog8/luQ8L7il+geoSxhEkazvkslg7PSNKOX59mbB9cOveP5aq9h74Y7YU8yDpJwetzQQrfIwtf4Wp4LKcw==", "dev": true, "license": "MIT", "engines": { @@ -4397,15 +3264,11 @@ }, "node_modules/@tokenizer/token": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/@tokenizer/token/-/token-0.3.0.tgz", - "integrity": "sha512-OvjF+z51L3ov0OyAU0duzsYuvO01PH7x4t6DJx+guahgTnBHkhJdG7soQeTSFLWN3efnHyibZ4Z8l2EuWwJN3A==", "dev": true, "license": "MIT" }, "node_modules/@tootallnate/once": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tootallnate/once/-/once-2.0.0.tgz", - "integrity": "sha512-XCuKFP5PS55gnMVu3dty8KPatLqUoy/ZYzDzAGCQ8JNFCkLXzmI7vNHCR+XpbZaMWQK/vQubr7PkYq8g470J/A==", "dev": true, "license": "MIT", "engines": { @@ -4414,8 +3277,6 @@ }, "node_modules/@tufjs/canonical-json": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@tufjs/canonical-json/-/canonical-json-2.0.0.tgz", - "integrity": "sha512-yVtV8zsdo8qFHe+/3kw81dSLyF7D576A5cCFCi4X7B39tWT7SekaEFUnvnWJHz+9qO7qJTah1JbrDjWKqFtdWA==", "license": "MIT", "engines": { "node": "^16.14.0 || >=18.0.0" @@ -4423,8 +3284,6 @@ }, "node_modules/@tufjs/models": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/@tufjs/models/-/models-4.0.0.tgz", - "integrity": "sha512-h5x5ga/hh82COe+GoD4+gKUeV4T3iaYOxqLt41GRKApinPI7DMidhCmNVTjKfhCWFJIGXaFJee07XczdT4jdZQ==", "license": "MIT", "dependencies": { "@tufjs/canonical-json": "2.0.0", @@ -4436,8 +3295,6 @@ }, "node_modules/@tufjs/models/node_modules/brace-expansion": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" @@ -4445,8 +3302,6 @@ }, "node_modules/@tufjs/models/node_modules/minimatch": { "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" @@ -4460,8 +3315,6 @@ }, "node_modules/@types/conventional-commits-parser": { "version": "5.0.2", - "resolved": "https://registry.npmjs.org/@types/conventional-commits-parser/-/conventional-commits-parser-5.0.2.tgz", - "integrity": "sha512-BgT2szDXnVypgpNxOK8aL5SGjUdaQbC++WZNjF1Qge3Og2+zhHj+RWhmehLhYyvQwqAmvezruVfOf8+3m74W+g==", "dev": true, "license": "MIT", "dependencies": { @@ -4470,14 +3323,10 @@ }, "node_modules/@types/estree": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.8.tgz", - "integrity": "sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==", "license": "MIT" }, "node_modules/@types/hast": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/@types/hast/-/hast-3.0.4.tgz", - "integrity": "sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==", "license": "MIT", "dependencies": { "@types/unist": "*" @@ -4485,8 +3334,6 @@ }, "node_modules/@types/jquery": { "version": "3.5.33", - "resolved": "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.33.tgz", - "integrity": "sha512-SeyVJXlCZpEki5F0ghuYe+L+PprQta6nRZqhONt9F13dWBtR/ftoaIbdRQ7cis7womE+X2LKhsDdDtkkDhJS6g==", "license": "MIT", "dependencies": { "@types/sizzle": "*" @@ -4494,21 +3341,15 @@ }, "node_modules/@types/json-schema": { "version": "7.0.15", - "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz", - "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA==", "dev": true, "license": "MIT" }, "node_modules/@types/linkify-it": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/@types/linkify-it/-/linkify-it-5.0.0.tgz", - "integrity": "sha512-sVDA58zAw4eWAffKOaQH5/5j3XeayukzDk+ewSsnv3p4yJEZHCCzMDiZM8e0OUrRvmpGZ85jf4yDHkHsgBNr9Q==", "license": "MIT" }, "node_modules/@types/markdown-it": { "version": "14.1.2", - "resolved": "https://registry.npmjs.org/@types/markdown-it/-/markdown-it-14.1.2.tgz", - "integrity": "sha512-promo4eFwuiW+TfGxhi+0x3czqTYJkG8qB17ZUJiVF10Xm7NLVRSLUsfRTU/6h1e24VvRnXCx+hG7li58lkzog==", "license": "MIT", "dependencies": { "@types/linkify-it": "^5", @@ -4517,8 +3358,6 @@ }, "node_modules/@types/mdast": { "version": "4.0.4", - "resolved": "https://registry.npmjs.org/@types/mdast/-/mdast-4.0.4.tgz", - "integrity": "sha512-kGaNbPh1k7AFzgpud/gMdvIm5xuECykRR+JnWKQno9TAXVa6WIVCGTPvYGekIDL4uwCZQSYbUxNBSb1aUo79oA==", "license": "MIT", "dependencies": { "@types/unist": "*" @@ -4526,21 +3365,15 @@ }, "node_modules/@types/mdurl": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/@types/mdurl/-/mdurl-2.0.0.tgz", - "integrity": "sha512-RGdgjQUZba5p6QEFAVx2OGb8rQDL/cPRG7GiedRzMcJ1tYnUANBncjbSB1NRGwbvjcPeikRABz2nshyPk1bhWg==", "license": "MIT" }, "node_modules/@types/minimatch": { "version": "3.0.5", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-3.0.5.tgz", - "integrity": "sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==", "dev": true, "license": "MIT" }, "node_modules/@types/node": { "version": "24.10.1", - "resolved": "https://registry.npmjs.org/@types/node/-/node-24.10.1.tgz", - "integrity": "sha512-GNWcUTRBgIRJD5zj+Tq0fKOJ5XZajIiBroOF0yvj2bSU1WvNdYS/dn9UxwsujGW4JX06dnHyjV2y9rRaybH0iQ==", "devOptional": true, "license": "MIT", "dependencies": { @@ -4549,21 +3382,15 @@ }, "node_modules/@types/node/node_modules/undici-types": { "version": "7.16.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-7.16.0.tgz", - "integrity": "sha512-Zz+aZWSj8LE6zoxD+xrjh4VfkIG8Ya6LvYkZqtUQGJPZjYl53ypCaUwWqo7eI0x66KBGeRo+mlBEkMSeSZ38Nw==", "devOptional": true, "license": "MIT" }, "node_modules/@types/normalize-package-data": { "version": "2.4.4", - "resolved": "https://registry.npmjs.org/@types/normalize-package-data/-/normalize-package-data-2.4.4.tgz", - "integrity": "sha512-37i+OaWTh9qeK4LSHPsyRC7NahnGotNuZvjLSgcPzblpHB3rrCJxAOgI5gCdKm7coonsaX1Of0ILiTcnZjbfxA==", "license": "MIT" }, "node_modules/@types/openui5": { "version": "1.142.0", - "resolved": "https://registry.npmjs.org/@types/openui5/-/openui5-1.142.0.tgz", - "integrity": "sha512-gbp6dHeU5/lhAhVrp4TscIcOHRkiFu4QrBzFn3XVrhz3mCeMN9zhIbfu8ShANRxOrFtRc4fHoplvrSZyMwY+2A==", "license": "MIT", "dependencies": { "@types/jquery": "~3.5.13", @@ -4572,45 +3399,31 @@ }, "node_modules/@types/parse-json": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/@types/parse-json/-/parse-json-4.0.2.tgz", - "integrity": "sha512-dISoDXWWQwUquiKsyZ4Ng+HX2KsPL7LyHKHQwgGFEA3IaKac4Obd+h2a/a6waisAoepJlBcx9paWqjA8/HVjCw==", "dev": true, "license": "MIT" }, "node_modules/@types/qunit": { "version": "2.19.13", - "resolved": "https://registry.npmjs.org/@types/qunit/-/qunit-2.19.13.tgz", - "integrity": "sha512-N4xp3v4s7f0jb2Oij6+6xw5QhH7/IgHCoGIFLCWtbEWoPkGYp8Te4mIwIP21qaurr6ed5JiPMiy2/ZoiGPkLIw==", "license": "MIT" }, "node_modules/@types/sizzle": { "version": "2.3.10", - "resolved": "https://registry.npmjs.org/@types/sizzle/-/sizzle-2.3.10.tgz", - "integrity": "sha512-TC0dmN0K8YcWEAEfiPi5gJP14eJe30TTGjkvek3iM/1NdHHsdCA/Td6GvNndMOo/iSnIsZ4HuuhrYPDAmbxzww==", "license": "MIT" }, "node_modules/@types/trusted-types": { "version": "2.0.7", - "resolved": "https://registry.npmjs.org/@types/trusted-types/-/trusted-types-2.0.7.tgz", - "integrity": "sha512-ScaPdn1dQczgbl0QFTeTOmVHFULt394XJgOQNoyVhZ6r2vLnMLJfBPd53SB52T/3G36VI1/g2MZaX0cwDuXsfw==", "license": "MIT" }, "node_modules/@types/unist": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/@types/unist/-/unist-3.0.3.tgz", - "integrity": "sha512-ko/gIFJRv177XgZsZcBwnqJN5x/Gien8qNOn0D5bQU/zAzVf9Zt3BlcUiLqhV9y4ARk0GbT3tnUiPNgnTXzc/Q==", "license": "MIT" }, "node_modules/@types/web-bluetooth": { "version": "0.0.21", - "resolved": "https://registry.npmjs.org/@types/web-bluetooth/-/web-bluetooth-0.0.21.tgz", - "integrity": "sha512-oIQLCGWtcFZy2JW77j9k8nHzAOpqMHLQejDA48XXMWH6tjCQHz5RCFz1bzsmROyL6PUm+LLnUiI4BCn221inxA==", "license": "MIT" }, "node_modules/@typescript-eslint/types": { "version": "8.47.0", - "resolved": "https://registry.npmjs.org/@typescript-eslint/types/-/types-8.47.0.tgz", - "integrity": "sha512-nHAE6bMKsizhA2uuYZbEbmp5z2UpffNrPEqiKIeN7VsV6UY/roxanWfoRrf6x/k9+Obf+GQdkm0nPU+vnMXo9A==", "dev": true, "license": "MIT", "engines": { @@ -4659,8 +3472,6 @@ }, "node_modules/@ui5/webcomponents": { "version": "2.16.2", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents/-/webcomponents-2.16.2.tgz", - "integrity": "sha512-ngajdJwUNvIlGm0SMfGyDB9nAkkvrgWdpiVcVpbKGI5EYsugaeZIuUKoEU1NQE3IPoGWzgEhoApN36uxQh6SQg==", "license": "Apache-2.0", "dependencies": { "@ui5/webcomponents-base": "2.16.2", @@ -4673,8 +3484,6 @@ }, "node_modules/@ui5/webcomponents-base": { "version": "2.16.2", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents-base/-/webcomponents-base-2.16.2.tgz", - "integrity": "sha512-h+1nok1655usJlEgp9uu/hoCS12GmLJA80b+4klEil3E3Xnhhr6pam5C8I29XVHVMeKD4vQvA6UccpcW3IDakg==", "license": "Apache-2.0", "dependencies": { "@lit-labs/ssr-dom-shim": "^1.1.2", @@ -4683,8 +3492,6 @@ }, "node_modules/@ui5/webcomponents-icons": { "version": "2.16.2", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents-icons/-/webcomponents-icons-2.16.2.tgz", - "integrity": "sha512-JxmLwD7TqZ2X6Tbka3qvUPsapRd53Yo6D9WNSmywR2CK2/Mb9uMBaQlf0gfoEMqVXJBAnBUKy4l/UwWkaEuDsw==", "license": "Apache-2.0", "dependencies": { "@ui5/webcomponents-base": "2.16.2" @@ -4692,8 +3499,6 @@ }, "node_modules/@ui5/webcomponents-icons-business-suite": { "version": "2.16.2", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents-icons-business-suite/-/webcomponents-icons-business-suite-2.16.2.tgz", - "integrity": "sha512-wloCrGqQFX/MMUfO+8asWCd49fxSwTVWRE+9K5LrxhyYPtiGfAm5D7qbNWt5NmvBw1lh5m4EolL7VH9ZGIeHjw==", "license": "Apache-2.0", "dependencies": { "@ui5/webcomponents-base": "2.16.2" @@ -4701,8 +3506,6 @@ }, "node_modules/@ui5/webcomponents-icons-tnt": { "version": "2.16.2", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents-icons-tnt/-/webcomponents-icons-tnt-2.16.2.tgz", - "integrity": "sha512-w3T7leHIWaWo1Fswn0/dNOgFEa0PamASVa3VxlSTmMNHpGjN9AbL6Jf86x9vM6cdQUaGVu0wso99090AcV19+Q==", "license": "Apache-2.0", "dependencies": { "@ui5/webcomponents-base": "2.16.2" @@ -4710,8 +3513,6 @@ }, "node_modules/@ui5/webcomponents-localization": { "version": "2.16.2", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents-localization/-/webcomponents-localization-2.16.2.tgz", - "integrity": "sha512-6RBBlao3Yn+94ftWS5PYvZKuhYI+TR1Ty9N2L/rshA7uLiSef0RVFys6ARyQQetrjaiC8TazFrlll/7qO4nwEA==", "license": "Apache-2.0", "dependencies": { "@types/openui5": "^1.113.0", @@ -4720,8 +3521,6 @@ }, "node_modules/@ui5/webcomponents-theming": { "version": "2.16.2", - "resolved": "https://registry.npmjs.org/@ui5/webcomponents-theming/-/webcomponents-theming-2.16.2.tgz", - "integrity": "sha512-XDpHaW0yAJLrTITTgdL85bgOLT7VJ9Gaq4a/fSBy9zYPpaVri5PZBMVWtgiwDRAcYsLe+9T6rD+SHBLjVM7TwQ==", "license": "Apache-2.0", "dependencies": { "@sap-theming/theming-base-content": "11.29.3", @@ -4730,14 +3529,10 @@ }, "node_modules/@ungap/structured-clone": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/@ungap/structured-clone/-/structured-clone-1.3.0.tgz", - "integrity": "sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==", "license": "ISC" }, "node_modules/@vercel/nft": { "version": "0.29.4", - "resolved": "https://registry.npmjs.org/@vercel/nft/-/nft-0.29.4.tgz", - "integrity": "sha512-6lLqMNX3TuycBPABycx7A9F1bHQR7kiQln6abjFbPrf5C/05qHM9M5E4PeTE59c7z8g6vHnx1Ioihb2AQl7BTA==", "dev": true, "license": "MIT", "dependencies": { @@ -4763,8 +3558,6 @@ }, "node_modules/@vercel/nft/node_modules/brace-expansion": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -4773,8 +3566,6 @@ }, "node_modules/@vercel/nft/node_modules/glob": { "version": "10.5.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", - "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", "dev": true, "license": "ISC", "dependencies": { @@ -4794,15 +3585,11 @@ }, "node_modules/@vercel/nft/node_modules/lru-cache": { "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "dev": true, "license": "ISC" }, "node_modules/@vercel/nft/node_modules/minimatch": { "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, "license": "ISC", "dependencies": { @@ -4817,8 +3604,6 @@ }, "node_modules/@vercel/nft/node_modules/path-scurry": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -4834,8 +3619,6 @@ }, "node_modules/@vitejs/plugin-vue": { "version": "5.2.4", - "resolved": "https://registry.npmjs.org/@vitejs/plugin-vue/-/plugin-vue-5.2.4.tgz", - "integrity": "sha512-7Yx/SXSOcQq5HiiV3orevHUFn+pmMB4cgbEkDYgnkUWb0WfeQ/wa2yFv6D5ICiCQOVpjA7vYDXrC7AGO8yjDHA==", "license": "MIT", "engines": { "node": "^18.0.0 || >=20.0.0" @@ -4847,8 +3630,6 @@ }, "node_modules/@vue/compiler-core": { "version": "3.5.25", - "resolved": "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.5.25.tgz", - "integrity": "sha512-vay5/oQJdsNHmliWoZfHPoVZZRmnSWhug0BYT34njkYTPqClh3DNWLkZNJBVSjsNMrg0CCrBfoKkjZQPM/QVUw==", "license": "MIT", "dependencies": { "@babel/parser": "^7.28.5", @@ -4860,8 +3641,6 @@ }, "node_modules/@vue/compiler-dom": { "version": "3.5.25", - "resolved": "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.5.25.tgz", - "integrity": "sha512-4We0OAcMZsKgYoGlMjzYvaoErltdFI2/25wqanuTu+S4gismOTRTBPi4IASOjxWdzIwrYSjnqONfKvuqkXzE2Q==", "license": "MIT", "dependencies": { "@vue/compiler-core": "3.5.25", @@ -4870,8 +3649,6 @@ }, "node_modules/@vue/compiler-sfc": { "version": "3.5.25", - "resolved": "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.5.25.tgz", - "integrity": "sha512-PUgKp2rn8fFsI++lF2sO7gwO2d9Yj57Utr5yEsDf3GNaQcowCLKL7sf+LvVFvtJDXUp/03+dC6f2+LCv5aK1ag==", "license": "MIT", "dependencies": { "@babel/parser": "^7.28.5", @@ -4887,8 +3664,6 @@ }, "node_modules/@vue/compiler-ssr": { "version": "3.5.25", - "resolved": "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.5.25.tgz", - "integrity": "sha512-ritPSKLBcParnsKYi+GNtbdbrIE1mtuFEJ4U1sWeuOMlIziK5GtOL85t5RhsNy4uWIXPgk+OUdpnXiTdzn8o3A==", "license": "MIT", "dependencies": { "@vue/compiler-dom": "3.5.25", @@ -4897,8 +3672,6 @@ }, "node_modules/@vue/devtools-api": { "version": "7.7.9", - "resolved": "https://registry.npmjs.org/@vue/devtools-api/-/devtools-api-7.7.9.tgz", - "integrity": "sha512-kIE8wvwlcZ6TJTbNeU2HQNtaxLx3a84aotTITUuL/4bzfPxzajGBOoqjMhwZJ8L9qFYDU/lAYMEEm11dnZOD6g==", "license": "MIT", "dependencies": { "@vue/devtools-kit": "^7.7.9" @@ -4906,8 +3679,6 @@ }, "node_modules/@vue/devtools-kit": { "version": "7.7.9", - "resolved": "https://registry.npmjs.org/@vue/devtools-kit/-/devtools-kit-7.7.9.tgz", - "integrity": "sha512-PyQ6odHSgiDVd4hnTP+aDk2X4gl2HmLDfiyEnn3/oV+ckFDuswRs4IbBT7vacMuGdwY/XemxBoh302ctbsptuA==", "license": "MIT", "dependencies": { "@vue/devtools-shared": "^7.7.9", @@ -4921,8 +3692,6 @@ }, "node_modules/@vue/devtools-shared": { "version": "7.7.9", - "resolved": "https://registry.npmjs.org/@vue/devtools-shared/-/devtools-shared-7.7.9.tgz", - "integrity": "sha512-iWAb0v2WYf0QWmxCGy0seZNDPdO3Sp5+u78ORnyeonS6MT4PC7VPrryX2BpMJrwlDeaZ6BD4vP4XKjK0SZqaeA==", "license": "MIT", "dependencies": { "rfdc": "^1.4.1" @@ -4930,8 +3699,6 @@ }, "node_modules/@vue/reactivity": { "version": "3.5.25", - "resolved": "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.5.25.tgz", - "integrity": "sha512-5xfAypCQepv4Jog1U4zn8cZIcbKKFka3AgWHEFQeK65OW+Ys4XybP6z2kKgws4YB43KGpqp5D/K3go2UPPunLA==", "license": "MIT", "dependencies": { "@vue/shared": "3.5.25" @@ -4939,8 +3706,6 @@ }, "node_modules/@vue/runtime-core": { "version": "3.5.25", - "resolved": "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.5.25.tgz", - "integrity": "sha512-Z751v203YWwYzy460bzsYQISDfPjHTl+6Zzwo/a3CsAf+0ccEjQ8c+0CdX1WsumRTHeywvyUFtW6KvNukT/smA==", "license": "MIT", "dependencies": { "@vue/reactivity": "3.5.25", @@ -4949,8 +3714,6 @@ }, "node_modules/@vue/runtime-dom": { "version": "3.5.25", - "resolved": "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.5.25.tgz", - "integrity": "sha512-a4WrkYFbb19i9pjkz38zJBg8wa/rboNERq3+hRRb0dHiJh13c+6kAbgqCPfMaJ2gg4weWD3APZswASOfmKwamA==", "license": "MIT", "dependencies": { "@vue/reactivity": "3.5.25", @@ -4961,8 +3724,6 @@ }, "node_modules/@vue/server-renderer": { "version": "3.5.25", - "resolved": "https://registry.npmjs.org/@vue/server-renderer/-/server-renderer-3.5.25.tgz", - "integrity": "sha512-UJaXR54vMG61i8XNIzTSf2Q7MOqZHpp8+x3XLGtE3+fL+nQd+k7O5+X3D/uWrnQXOdMw5VPih+Uremcw+u1woQ==", "license": "MIT", "dependencies": { "@vue/compiler-ssr": "3.5.25", @@ -4974,14 +3735,10 @@ }, "node_modules/@vue/shared": { "version": "3.5.25", - "resolved": "https://registry.npmjs.org/@vue/shared/-/shared-3.5.25.tgz", - "integrity": "sha512-AbOPdQQnAnzs58H2FrrDxYj/TJfmeS2jdfEEhgiKINy+bnOANmVizIEgq1r+C5zsbs6l1CCQxtcj71rwNQ4jWg==", "license": "MIT" }, "node_modules/@vueuse/core": { "version": "12.8.2", - "resolved": "https://registry.npmjs.org/@vueuse/core/-/core-12.8.2.tgz", - "integrity": "sha512-HbvCmZdzAu3VGi/pWYm5Ut+Kd9mn1ZHnn4L5G8kOQTPs/IwIAmJoBrmYk2ckLArgMXZj0AW3n5CAejLUO+PhdQ==", "license": "MIT", "dependencies": { "@types/web-bluetooth": "^0.0.21", @@ -4995,8 +3752,6 @@ }, "node_modules/@vueuse/integrations": { "version": "12.8.2", - "resolved": "https://registry.npmjs.org/@vueuse/integrations/-/integrations-12.8.2.tgz", - "integrity": "sha512-fbGYivgK5uBTRt7p5F3zy6VrETlV9RtZjBqd1/HxGdjdckBgBM4ugP8LHpjolqTj14TXTxSK1ZfgPbHYyGuH7g==", "license": "MIT", "dependencies": { "@vueuse/core": "12.8.2", @@ -5061,8 +3816,6 @@ }, "node_modules/@vueuse/metadata": { "version": "12.8.2", - "resolved": "https://registry.npmjs.org/@vueuse/metadata/-/metadata-12.8.2.tgz", - "integrity": "sha512-rAyLGEuoBJ/Il5AmFHiziCPdQzRt88VxR+Y/A/QhJ1EWtWqPBBAxTAFaSkviwEuOEZNtW8pvkPgoCZQ+HxqW1A==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/antfu" @@ -5070,8 +3823,6 @@ }, "node_modules/@vueuse/shared": { "version": "12.8.2", - "resolved": "https://registry.npmjs.org/@vueuse/shared/-/shared-12.8.2.tgz", - "integrity": "sha512-dznP38YzxZoNloI0qpEfpkms8knDtaoQ6Y/sfS0L7Yki4zh40LFHEhur0odJC6xTHG5dxWVPiUWBXn+wCG2s5w==", "license": "MIT", "dependencies": { "vue": "^3.5.13" @@ -5082,8 +3833,6 @@ }, "node_modules/abbrev": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-3.0.1.tgz", - "integrity": "sha512-AO2ac6pjRB3SJmGJo+v5/aK6Omggp6fsLrs6wN9bd35ulu4cCwaAU9+7ZhXjeqHVkaHThLuzH0nZr0YpCDhygg==", "license": "ISC", "engines": { "node": "^18.17.0 || >=20.5.0" @@ -5091,8 +3840,6 @@ }, "node_modules/abort-controller": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/abort-controller/-/abort-controller-3.0.0.tgz", - "integrity": "sha512-h8lQ8tacZYnR3vNQTgibj+tODHI5/+l06Au2Pcriv/Gmet0eaj4TwWH41sO9wnHDiQsEj19q0drzdWdeAHtweg==", "dev": true, "license": "MIT", "dependencies": { @@ -5104,8 +3851,6 @@ }, "node_modules/accepts": { "version": "1.3.8", - "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz", - "integrity": "sha512-PYAthTa2m2VKxuvSD3DPC/Gy+U+sOA1LAuT8mkmRuvw+NACSaeXEQ+NHcVF7rONl6qcaxV3Uuemwawk+7+SJLw==", "license": "MIT", "dependencies": { "mime-types": "~2.1.34", @@ -5117,8 +3862,6 @@ }, "node_modules/accepts/node_modules/negotiator": { "version": "0.6.3", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz", - "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -5126,8 +3869,6 @@ }, "node_modules/acorn": { "version": "8.15.0", - "resolved": "https://registry.npmjs.org/acorn/-/acorn-8.15.0.tgz", - "integrity": "sha512-NZyJarBfL7nWwIq+FDL6Zp/yHEhePMNnnJ0y3qfieCrmNvYct8uvtiV41UvlSe6apAfk0fY1FbWx+NwfmpvtTg==", "license": "MIT", "bin": { "acorn": "bin/acorn" @@ -5138,8 +3879,6 @@ }, "node_modules/acorn-import-attributes": { "version": "1.9.5", - "resolved": "https://registry.npmjs.org/acorn-import-attributes/-/acorn-import-attributes-1.9.5.tgz", - "integrity": "sha512-n02Vykv5uA3eHGM/Z2dQrcD56kL8TyDb2p1+0P83PClMnC/nc+anbQRhIOWnSq4Ke/KvDPrY3C9hDtC/A3eHnQ==", "dev": true, "license": "MIT", "peerDependencies": { @@ -5148,8 +3887,6 @@ }, "node_modules/acorn-jsx": { "version": "5.3.2", - "resolved": "https://registry.npmjs.org/acorn-jsx/-/acorn-jsx-5.3.2.tgz", - "integrity": "sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==", "license": "MIT", "peerDependencies": { "acorn": "^6.0.0 || ^7.0.0 || ^8.0.0" @@ -5157,8 +3894,6 @@ }, "node_modules/acorn-walk": { "version": "8.3.4", - "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.3.4.tgz", - "integrity": "sha512-ueEepnujpqee2o5aIYnvHU6C0A42MNdsIDeqy5BydrkuC5R1ZuUFnm27EeFJGoEHJQgn3uleRvmTXaJgfXbt4g==", "dev": true, "license": "MIT", "dependencies": { @@ -5170,8 +3905,6 @@ }, "node_modules/agent-base": { "version": "7.1.4", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", - "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==", "license": "MIT", "engines": { "node": ">= 14" @@ -5179,8 +3912,6 @@ }, "node_modules/aggregate-error": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/aggregate-error/-/aggregate-error-3.1.0.tgz", - "integrity": "sha512-4I7Td01quW/RpocfNayFdFVk1qSuoh0E7JrbRJ16nH01HhKFQ88INq9Sd+nd72zqRySlr9BmDA8xlEJ6vJMrYA==", "dev": true, "license": "MIT", "dependencies": { @@ -5193,8 +3924,6 @@ }, "node_modules/aggregate-error/node_modules/indent-string": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz", - "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==", "dev": true, "license": "MIT", "engines": { @@ -5203,8 +3932,6 @@ }, "node_modules/ajv": { "version": "6.12.6", - "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz", - "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==", "license": "MIT", "dependencies": { "fast-deep-equal": "^3.1.1", @@ -5219,8 +3946,6 @@ }, "node_modules/ajv-errors": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ajv-errors/-/ajv-errors-1.0.1.tgz", - "integrity": "sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==", "license": "MIT", "peerDependencies": { "ajv": ">=5.0.0" @@ -5228,8 +3953,6 @@ }, "node_modules/algoliasearch": { "version": "5.44.0", - "resolved": "https://registry.npmjs.org/algoliasearch/-/algoliasearch-5.44.0.tgz", - "integrity": "sha512-f8IpsbdQjzTjr/4mJ/jv5UplrtyMnnciGax6/B0OnLCs2/GJTK13O4Y7Ff1AvJVAaztanH+m5nzPoUq6EAy+aA==", "license": "MIT", "dependencies": { "@algolia/abtesting": "1.10.0", @@ -5253,8 +3976,6 @@ }, "node_modules/ansi-align": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/ansi-align/-/ansi-align-3.0.1.tgz", - "integrity": "sha512-IOfwwBF5iczOjp/WeY4YxyjqAFMQoZufdQWDd19SEExbVLNXqvpzSJ/M7Za4/sCPmQ0+GRquoA7bGcINcxew6w==", "license": "ISC", "dependencies": { "string-width": "^4.1.0" @@ -5262,8 +3983,6 @@ }, "node_modules/ansi-escape-sequences": { "version": "6.2.4", - "resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-6.2.4.tgz", - "integrity": "sha512-2KJQAG1Nk4Iyu0dJENKXQJE9smEASrpu/E0F7LSnR72tQXngKGLqfRkHbkinjNct5vvAQY4BwQNt+4Tvg73nDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5283,8 +4002,6 @@ }, "node_modules/ansi-regex": { "version": "6.2.2", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.2.2.tgz", - "integrity": "sha512-Bq3SmSpyFHaWjPk8If9yc6svM8c56dB5BAtW4Qbw5jHTwwXXcTLoRMkpDJp6VL0XzlWaCHTXrkFURMYmD0sLqg==", "license": "MIT", "engines": { "node": ">=12" @@ -5295,8 +4012,6 @@ }, "node_modules/ansi-styles": { "version": "6.2.3", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-6.2.3.tgz", - "integrity": "sha512-4Dj6M28JB+oAH8kFkTLUo+a2jwOFkuqb3yucU0CANcRRUbxS0cP0nZYCGjcc3BNXwRIsUVmDGgzawme7zvJHvg==", "license": "MIT", "engines": { "node": ">=12" @@ -5307,14 +4022,10 @@ }, "node_modules/any-promise": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/any-promise/-/any-promise-1.3.0.tgz", - "integrity": "sha512-7UvmKalWRt1wgjL1RrGxoSJW/0QZFIegpeGvZG9kjp8vrRu55XTHbwnqq2GpXm9uLbcuhxm3IqX9OB4MZR1b2A==", "license": "MIT" }, "node_modules/anymatch": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/anymatch/-/anymatch-3.1.3.tgz", - "integrity": "sha512-KMReFUr0B4t+D+OBkjR3KYqvocp2XaSzO55UcB6mgQMd3KbcE+mWTyvVV7D/zsdEbNnV6acZUutkiHQXvTr1Rw==", "license": "ISC", "dependencies": { "normalize-path": "^3.0.0", @@ -5326,8 +4037,6 @@ }, "node_modules/anymatch/node_modules/picomatch": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "license": "MIT", "engines": { "node": ">=8.6" @@ -5338,8 +4047,6 @@ }, "node_modules/append-transform": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/append-transform/-/append-transform-2.0.0.tgz", - "integrity": "sha512-7yeyCEurROLQJFv5Xj4lEGTy0borxepjFv1g22oAdqFu//SrAlDl1O1Nxx15SH1RoliUml6p8dwJW9jvZughhg==", "dev": true, "license": "MIT", "dependencies": { @@ -5351,15 +4058,11 @@ }, "node_modules/archy": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/archy/-/archy-1.0.0.tgz", - "integrity": "sha512-Xg+9RwCg/0p32teKdGMPTPnVXKD0w3DfHnFTficozsAgsvq2XenPJq/MYpzzQ/v8zrOyJn6Ds39VA4JIDwFfqw==", "dev": true, "license": "MIT" }, "node_modules/are-docs-informative": { "version": "0.0.2", - "resolved": "https://registry.npmjs.org/are-docs-informative/-/are-docs-informative-0.0.2.tgz", - "integrity": "sha512-ixiS0nLNNG5jNQzgZJNoUpBKdo9yTYZMGJ+QgT2jmjR7G7+QHRCc4v6LQ3NgE7EBJq+o0ams3waJwkrlBom8Ig==", "dev": true, "license": "MIT", "engines": { @@ -5368,20 +4071,14 @@ }, "node_modules/arg": { "version": "5.0.2", - "resolved": "https://registry.npmjs.org/arg/-/arg-5.0.2.tgz", - "integrity": "sha512-PYjyFOLKQ9y57JvQ6QLo8dAgNqswh8M1RMJYdQduT6xbWSgK36P/Z/v+p888pM69jMMfS8Xd8F6I1kQ/I9HUGg==", "license": "MIT" }, "node_modules/argparse": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", - "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==", "license": "Python-2.0" }, "node_modules/array-back": { "version": "6.2.2", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-6.2.2.tgz", - "integrity": "sha512-gUAZ7HPyb4SJczXAMUXMGAvI976JoK3qEx9v1FTmeYuJj0IBiaKttG1ydtGKdkfqWkIkouke7nG8ufGy77+Cvw==", "dev": true, "license": "MIT", "engines": { @@ -5390,8 +4087,6 @@ }, "node_modules/array-buffer-byte-length": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz", - "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==", "dev": true, "license": "MIT", "dependencies": { @@ -5407,8 +4102,6 @@ }, "node_modules/array-differ": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/array-differ/-/array-differ-3.0.0.tgz", - "integrity": "sha512-THtfYS6KtME/yIAhKjZ2ul7XI96lQGHRputJQHO80LAWQnuGP4iCIN8vdMRboGbIEYBwU33q8Tch1os2+X0kMg==", "dev": true, "license": "MIT", "engines": { @@ -5417,8 +4110,6 @@ }, "node_modules/array-find-index": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz", - "integrity": "sha512-M1HQyIXcBGtVywBt8WVdim+lrNaK7VHp99Qt5pSNziXznKHViIBbXWtfRTpEFpF/c4FdfxNAsCCwPp5phBYJtw==", "dev": true, "license": "MIT", "engines": { @@ -5427,21 +4118,15 @@ }, "node_modules/array-flatten": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz", - "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg==", "license": "MIT" }, "node_modules/array-ify": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/array-ify/-/array-ify-1.0.0.tgz", - "integrity": "sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==", "dev": true, "license": "MIT" }, "node_modules/array-union": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/array-union/-/array-union-2.1.0.tgz", - "integrity": "sha512-HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw==", "dev": true, "license": "MIT", "engines": { @@ -5450,8 +4135,6 @@ }, "node_modules/arraybuffer.prototype.slice": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz", - "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5472,8 +4155,6 @@ }, "node_modules/arrgv": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/arrgv/-/arrgv-1.0.2.tgz", - "integrity": "sha512-a4eg4yhp7mmruZDQFqVMlxNRFGi/i1r87pt8SDHy0/I8PqSXoUTlWZRdAZo0VXgvEARcujbtTk8kiZRi1uDGRw==", "dev": true, "license": "MIT", "engines": { @@ -5482,8 +4163,6 @@ }, "node_modules/arrify": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-3.0.0.tgz", - "integrity": "sha512-tLkvA81vQG/XqE2mjDkGQHoOINtMHtysSnemrmoGe6PydDPMRbVugqyk4A6V/WDWEfm3l+0d8anA9r8cv/5Jaw==", "dev": true, "license": "MIT", "engines": { @@ -5495,15 +4174,11 @@ }, "node_modules/asap": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz", - "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA==", "dev": true, "license": "MIT" }, "node_modules/async": { "version": "2.6.4", - "resolved": "https://registry.npmjs.org/async/-/async-2.6.4.tgz", - "integrity": "sha512-mzo5dfJYwAn29PeiJ0zvwTo04zj8HDJj0Mn8TD7sno7q12prdbnasKJHhkm2c1LgrhlJ0teaea8860oxi51mGA==", "license": "MIT", "dependencies": { "lodash": "^4.17.14" @@ -5511,32 +4186,31 @@ }, "node_modules/async-function": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz", - "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==", "dev": true, "license": "MIT", "engines": { "node": ">= 0.4" } }, + "node_modules/async-mutex": { + "version": "0.5.0", + "license": "MIT", + "dependencies": { + "tslib": "^2.4.0" + } + }, "node_modules/async-sema": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/async-sema/-/async-sema-3.1.1.tgz", - "integrity": "sha512-tLRNUXati5MFePdAk8dw7Qt7DpxPB60ofAgn8WRhW6a2rcimZnYBP9oxHiv0OHy+Wz7kPMG+t4LGdt31+4EmGg==", "dev": true, "license": "MIT" }, "node_modules/asynckit": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz", - "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==", "dev": true, "license": "MIT" }, "node_modules/atomically": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/atomically/-/atomically-2.1.0.tgz", - "integrity": "sha512-+gDffFXRW6sl/HCwbta7zK4uNqbPjv4YJEAdz7Vu+FLQHe77eZ4bvbJGi4hE0QPeJlMYMA3piXEr1UL3dAwx7Q==", "license": "MIT", "dependencies": { "stubborn-fs": "^2.0.0", @@ -5545,8 +4219,6 @@ }, "node_modules/autoprefixer": { "version": "10.4.22", - "resolved": "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.4.22.tgz", - "integrity": "sha512-ARe0v/t9gO28Bznv6GgqARmVqcWOV3mfgUPn9becPHMiD3o9BwlRgaeccZnwTpZ7Zwqrm+c1sUSsMxIzQzc8Xg==", "funding": [ { "type": "opencollective", @@ -5582,8 +4254,6 @@ }, "node_modules/ava": { "version": "6.4.1", - "resolved": "https://registry.npmjs.org/ava/-/ava-6.4.1.tgz", - "integrity": "sha512-vxmPbi1gZx9zhAjHBgw81w/iEDKcrokeRk/fqDTyA2DQygZ0o+dUGRHFOtX8RA5N0heGJTTsIk7+xYxitDb61Q==", "dev": true, "license": "MIT", "dependencies": { @@ -5645,8 +4315,6 @@ }, "node_modules/ava/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -5663,15 +4331,11 @@ }, "node_modules/ava/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/available-typed-arrays": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz", - "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5686,8 +4350,6 @@ }, "node_modules/babel-plugin-istanbul": { "version": "6.1.1", - "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz", - "integrity": "sha512-Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -5703,8 +4365,6 @@ }, "node_modules/babel-plugin-istanbul/node_modules/istanbul-lib-instrument": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz", - "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -5720,8 +4380,6 @@ }, "node_modules/babel-plugin-istanbul/node_modules/semver": { "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "license": "ISC", "bin": { @@ -5730,14 +4388,10 @@ }, "node_modules/balanced-match": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz", - "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==", "license": "MIT" }, "node_modules/base64-js": { "version": "1.5.1", - "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz", - "integrity": "sha512-AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA==", "dev": true, "funding": [ { @@ -5757,8 +4411,6 @@ }, "node_modules/baseline-browser-mapping": { "version": "2.8.31", - "resolved": "https://registry.npmjs.org/baseline-browser-mapping/-/baseline-browser-mapping-2.8.31.tgz", - "integrity": "sha512-a28v2eWrrRWPpJSzxc+mKwm0ZtVx/G8SepdQZDArnXYU/XS+IF6mp8aB/4E+hH1tyGCoDo3KlUCdlSxGDsRkAw==", "license": "Apache-2.0", "bin": { "baseline-browser-mapping": "dist/cli.js" @@ -5766,8 +4418,6 @@ }, "node_modules/basic-auth": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/basic-auth/-/basic-auth-2.0.1.tgz", - "integrity": "sha512-NF+epuEdnUYVlGuhaxbbq+dvJttwLnGY+YixlXlME5KpQ5W3CnXA5cVTneY3SPbPDRkcjMbifrwmFYcClgOZeg==", "dev": true, "license": "MIT", "dependencies": { @@ -5779,22 +4429,16 @@ }, "node_modules/basic-auth/node_modules/safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, "license": "MIT" }, "node_modules/batch": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz", - "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw==", "dev": true, "license": "MIT" }, "node_modules/bin-links": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/bin-links/-/bin-links-6.0.0.tgz", - "integrity": "sha512-X4CiKlcV2GjnCMwnKAfbVWpHa++65th9TuzAEYtZoATiOE2DQKhSp4CJlyLoTqdhBKlXjpXjCTYPNNFS33Fi6w==", "license": "ISC", "dependencies": { "cmd-shim": "^8.0.0", @@ -5809,8 +4453,6 @@ }, "node_modules/bin-links/node_modules/proc-log": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.0.0.tgz", - "integrity": "sha512-KG/XsTDN901PNfPfAMmj6N/Ywg9tM+bHK8pAz+27fS4N4Pcr+4zoYBOcGSBu6ceXYNPxkLpa4ohtfxV1XcLAfA==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -5818,8 +4460,6 @@ }, "node_modules/bin-links/node_modules/write-file-atomic": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-7.0.0.tgz", - "integrity": "sha512-YnlPC6JqnZl6aO4uRc+dx5PHguiR9S6WeoLtpxNT9wIG+BDya7ZNE1q7KOjVgaA73hKhKLpVPgJ5QA9THQ5BRg==", "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4", @@ -5831,8 +4471,6 @@ }, "node_modules/binary-extensions": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz", - "integrity": "sha512-Ceh+7ox5qe7LJuLHoY0feh3pHuUDHAcRUeyL2VYghZwfpkNIy/+8Ocg0a3UuSoYzavmylwuLWQOf3hl0jjMMIw==", "license": "MIT", "engines": { "node": ">=8" @@ -5843,8 +4481,6 @@ }, "node_modules/bindings": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz", - "integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==", "dev": true, "license": "MIT", "dependencies": { @@ -5853,8 +4489,6 @@ }, "node_modules/birpc": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/birpc/-/birpc-2.8.0.tgz", - "integrity": "sha512-Bz2a4qD/5GRhiHSwj30c/8kC8QGj12nNDwz3D4ErQ4Xhy35dsSDvF+RA/tWpjyU0pdGtSDiEk6B5fBGE1qNVhw==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/antfu" @@ -5862,80 +4496,41 @@ }, "node_modules/bluebird": { "version": "3.7.2", - "resolved": "https://registry.npmjs.org/bluebird/-/bluebird-3.7.2.tgz", - "integrity": "sha512-XpNj6GDQzdfW+r2Wnn7xiSAd7TM3jzkxGXBGTtWKuSXv1xUV+azxAm8jdWZN06QTQk+2N2XB9jRDkvbmQmcRtg==", "license": "MIT" }, "node_modules/blueimp-md5": { "version": "2.19.0", - "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz", - "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==", "dev": true, "license": "MIT" }, "node_modules/body-parser": { - "version": "1.20.4", - "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.4.tgz", - "integrity": "sha512-ZTgYYLMOXY9qKU/57FAo8F+HA2dGX7bqGc71txDRC1rS4frdFI5R7NhluHxH6M0YItAP0sHB4uqAOcYKxO6uGA==", + "version": "1.20.3", "license": "MIT", "dependencies": { - "bytes": "~3.1.2", + "bytes": "3.1.2", "content-type": "~1.0.5", "debug": "2.6.9", "depd": "2.0.0", - "destroy": "~1.2.0", - "http-errors": "~2.0.1", - "iconv-lite": "~0.4.24", - "on-finished": "~2.4.1", - "qs": "~6.14.0", - "raw-body": "~2.5.3", + "destroy": "1.2.0", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "on-finished": "2.4.1", + "qs": "6.13.0", + "raw-body": "2.5.2", "type-is": "~1.6.18", - "unpipe": "~1.0.0" + "unpipe": "1.0.0" }, "engines": { "node": ">= 0.8", "npm": "1.2.8000 || >= 1.4.16" } }, - "node_modules/body-parser/node_modules/http-errors": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", - "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", - "license": "MIT", - "dependencies": { - "depd": "~2.0.0", - "inherits": "~2.0.4", - "setprototypeof": "~1.2.0", - "statuses": "~2.0.2", - "toidentifier": "~1.0.1" - }, - "engines": { - "node": ">= 0.8" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/body-parser/node_modules/statuses": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", - "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", - "license": "MIT", - "engines": { - "node": ">= 0.8" - } - }, "node_modules/boolbase": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz", - "integrity": "sha512-JZOSA7Mo9sNGB8+UjSgzdLtokWAky1zbztM3WRLCbZ70/3cTANmQmOdR7y2g+J0e2WXywy1yS468tY+IruqEww==", "license": "ISC" }, "node_modules/boxen": { "version": "8.0.1", - "resolved": "https://registry.npmjs.org/boxen/-/boxen-8.0.1.tgz", - "integrity": "sha512-F3PH5k5juxom4xktynS7MoFY+NUWH5LC4CnH11YB8NPew+HLpmBLCybSAEyb2F+4pRXhuhWqFesoQd6DAyc2hw==", "license": "MIT", "dependencies": { "ansi-align": "^3.0.1", @@ -5956,8 +4551,6 @@ }, "node_modules/boxen/node_modules/camelcase": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-8.0.0.tgz", - "integrity": "sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==", "license": "MIT", "engines": { "node": ">=16" @@ -5968,14 +4561,10 @@ }, "node_modules/boxen/node_modules/emoji-regex": { "version": "10.6.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", "license": "MIT" }, "node_modules/boxen/node_modules/string-width": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", "license": "MIT", "dependencies": { "emoji-regex": "^10.3.0", @@ -5991,8 +4580,6 @@ }, "node_modules/boxen/node_modules/type-fest": { "version": "4.41.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz", - "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==", "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=16" @@ -6003,8 +4590,6 @@ }, "node_modules/brace-expansion": { "version": "1.1.12", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.12.tgz", - "integrity": "sha512-9T9UjW3r0UW5c1Q7GTwllptXwhvYmEzFhzMfZ9H7FQWt+uZePjZPjBP/W1ZEyZ1twGWom5/56TF4lPcqjnDHcg==", "dev": true, "license": "MIT", "dependencies": { @@ -6014,8 +4599,6 @@ }, "node_modules/braces": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/braces/-/braces-3.0.3.tgz", - "integrity": "sha512-yQbXgO/OSZVD2IsiLlro+7Hf6Q18EJrKSEsdoMzKePKXct3gvD8oLcOQdIzGupr5Fj+EDe8gO/lxc1BzfMpxvA==", "license": "MIT", "dependencies": { "fill-range": "^7.1.1" @@ -6026,8 +4609,6 @@ }, "node_modules/browserslist": { "version": "4.28.0", - "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.28.0.tgz", - "integrity": "sha512-tbydkR/CxfMwelN0vwdP/pLkDwyAASZ+VfWm4EOwlB6SWhx1sYnWLqo8N5j0rAzPfzfRaxt0mM/4wPU/Su84RQ==", "funding": [ { "type": "opencollective", @@ -6059,8 +4640,6 @@ }, "node_modules/buffer": { "version": "6.0.3", - "resolved": "https://registry.npmjs.org/buffer/-/buffer-6.0.3.tgz", - "integrity": "sha512-FTiCpNxtwiZZHEZbcbTIcZjERVICn9yq/pDFkTl95/AxzD1naBctN7YO68riM/gLSDY7sdrMby8hofADYuuqOA==", "dev": true, "funding": [ { @@ -6084,14 +4663,10 @@ }, "node_modules/buffer-from": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz", - "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ==", "license": "MIT" }, "node_modules/bundle-name": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/bundle-name/-/bundle-name-4.1.0.tgz", - "integrity": "sha512-tjwM5exMg6BGRI+kNmTntNsvdZS1X8BFYS6tnJ2hdH0kVxM6/eVZ2xy+FqStSWvYmtfFMDLIxurorHwDKfDz5Q==", "license": "MIT", "dependencies": { "run-applescript": "^7.0.0" @@ -6105,8 +4680,6 @@ }, "node_modules/byte-size": { "version": "9.0.1", - "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-9.0.1.tgz", - "integrity": "sha512-YLe9x3rabBrcI0cueCdLS2l5ONUKywcRpTs02B8KP9/Cimhj7o3ZccGrPnRvcbyHMbb7W79/3MUJl7iGgTXKEw==", "dev": true, "license": "MIT", "engines": { @@ -6123,8 +4696,6 @@ }, "node_modules/bytes": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz", - "integrity": "sha512-/Nf7TyzTx6S3yRJObOAV7956r8cr2+Oj8AC5dt8wSP3BQAoeX58NoHyCU8P8zGkNXStjTSi6fzO6F0pBdcYbEg==", "license": "MIT", "engines": { "node": ">= 0.8" @@ -6132,8 +4703,6 @@ }, "node_modules/cacache": { "version": "20.0.3", - "resolved": "https://registry.npmjs.org/cacache/-/cacache-20.0.3.tgz", - "integrity": "sha512-3pUp4e8hv07k1QlijZu6Kn7c9+ZpWWk4j3F8N3xPuCExULobqJydKYOTj1FTq58srkJsXvO7LbGAH4C0ZU3WGw==", "license": "ISC", "dependencies": { "@npmcli/fs": "^5.0.0", @@ -6154,8 +4723,6 @@ }, "node_modules/cache-content-type": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/cache-content-type/-/cache-content-type-1.0.1.tgz", - "integrity": "sha512-IKufZ1o4Ut42YUrZSo8+qnMTrFuKkvyoLXUywKz9GJ5BrhOFGhLdkx9sG4KAnVvbY6kEcSFjLQul+DVmBm2bgA==", "dev": true, "license": "MIT", "dependencies": { @@ -6168,8 +4735,6 @@ }, "node_modules/caching-transform": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/caching-transform/-/caching-transform-4.0.0.tgz", - "integrity": "sha512-kpqOvwXnjjN44D89K5ccQC+RUrsy7jB/XLlRrx0D7/2HNcTPqzsb6XgYoErwko6QsV184CA2YgS1fxDiiDZMWA==", "dev": true, "license": "MIT", "dependencies": { @@ -6184,8 +4749,6 @@ }, "node_modules/caching-transform/node_modules/make-dir": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "license": "MIT", "dependencies": { @@ -6200,8 +4763,6 @@ }, "node_modules/caching-transform/node_modules/semver": { "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "license": "ISC", "bin": { @@ -6210,15 +4771,11 @@ }, "node_modules/caching-transform/node_modules/signal-exit": { "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true, "license": "ISC" }, "node_modules/caching-transform/node_modules/write-file-atomic": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-3.0.3.tgz", - "integrity": "sha512-AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q==", "dev": true, "license": "ISC", "dependencies": { @@ -6230,8 +4787,6 @@ }, "node_modules/call-bind": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz", - "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==", "dev": true, "license": "MIT", "dependencies": { @@ -6249,8 +4804,6 @@ }, "node_modules/call-bind-apply-helpers": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.2.tgz", - "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==", "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -6262,8 +4815,6 @@ }, "node_modules/call-bound": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.4.tgz", - "integrity": "sha512-+ys997U96po4Kx/ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/tyMTlRpaSejg==", "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", @@ -6278,8 +4829,6 @@ }, "node_modules/callsite": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/callsite/-/callsite-1.0.0.tgz", - "integrity": "sha512-0vdNRFXn5q+dtOqjfFtmtlI9N2eVZ7LMyEV2iKC5mEEFvSg/69Ml6b/WU2qF8W1nLRa0wiSrDT3Y5jOHZCwKPQ==", "dev": true, "engines": { "node": "*" @@ -6287,8 +4836,6 @@ }, "node_modules/callsites": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-4.2.0.tgz", - "integrity": "sha512-kfzR4zzQtAE9PC7CzZsjl3aBNbXWuXiSeOCdLcPpBfGW8YuCqQHcRPFDbr/BPVmd3EEPVpuFzLyuT/cUhPr4OQ==", "dev": true, "license": "MIT", "engines": { @@ -6300,8 +4847,6 @@ }, "node_modules/camelcase": { "version": "6.3.0", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz", - "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true, "license": "MIT", "engines": { @@ -6313,8 +4858,6 @@ }, "node_modules/camelcase-css": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/camelcase-css/-/camelcase-css-2.0.1.tgz", - "integrity": "sha512-QOSvevhslijgYwRx6Rv7zKdMF8lbRmx+uQGx2+vDc+KI/eBnsy9kit5aj23AgGu3pa4t9AgwbnXWqS+iOY+2aA==", "license": "MIT", "engines": { "node": ">= 6" @@ -6322,8 +4865,6 @@ }, "node_modules/caniuse-api": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz", - "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==", "license": "MIT", "dependencies": { "browserslist": "^4.0.0", @@ -6334,8 +4875,6 @@ }, "node_modules/caniuse-lite": { "version": "1.0.30001757", - "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001757.tgz", - "integrity": "sha512-r0nnL/I28Zi/yjk1el6ilj27tKcdjLsNqAOZr0yVjWPrSQyHgKI2INaEWw21bAQSv2LXRt1XuCS/GomNpWOxsQ==", "funding": [ { "type": "opencollective", @@ -6354,8 +4893,6 @@ }, "node_modules/catharsis": { "version": "0.9.0", - "resolved": "https://registry.npmjs.org/catharsis/-/catharsis-0.9.0.tgz", - "integrity": "sha512-prMTQVpcns/tzFgFVkVp6ak6RykZyWb3gu8ckUpd6YkTlacOd3DXGJjIpD4Q6zJirizvaiAjSSHlOsA+6sNh2A==", "license": "MIT", "dependencies": { "lodash": "^4.17.15" @@ -6366,8 +4903,6 @@ }, "node_modules/cbor": { "version": "10.0.11", - "resolved": "https://registry.npmjs.org/cbor/-/cbor-10.0.11.tgz", - "integrity": "sha512-vIwORDd/WyB8Nc23o2zNN5RrtFGlR6Fca61TtjkUXueI3Jf2DOZDl1zsshvBntZ3wZHBM9ztjnkXSmzQDaq3WA==", "dev": true, "license": "MIT", "dependencies": { @@ -6379,8 +4914,6 @@ }, "node_modules/ccount": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/ccount/-/ccount-2.0.1.tgz", - "integrity": "sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==", "license": "MIT", "funding": { "type": "github", @@ -6389,8 +4922,6 @@ }, "node_modules/chalk": { "version": "5.6.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-5.6.2.tgz", - "integrity": "sha512-7NzBL0rN6fMUW+f7A6Io4h40qQlG+xGmtMxfbnH/K7TAtt8JQWVQK+6g0UXKMeVJoyV5EkkNsErQ8pVD3bLHbA==", "license": "MIT", "engines": { "node": "^12.17.0 || ^14.13 || >=16.0.0" @@ -6401,8 +4932,6 @@ }, "node_modules/chalk-template": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/chalk-template/-/chalk-template-0.4.0.tgz", - "integrity": "sha512-/ghrgmhfY8RaSdeo43hNXxpoHAtxdbskUHjPpfqUWGttFgycUhYPGx3YZBCnUCvOa7Doivn1IZec3DEGFoMgLg==", "dev": true, "license": "MIT", "dependencies": { @@ -6417,8 +4946,6 @@ }, "node_modules/chalk-template/node_modules/ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "license": "MIT", "dependencies": { @@ -6433,8 +4960,6 @@ }, "node_modules/chalk-template/node_modules/chalk": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "license": "MIT", "dependencies": { @@ -6450,8 +4975,6 @@ }, "node_modules/character-entities-html4": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/character-entities-html4/-/character-entities-html4-2.1.0.tgz", - "integrity": "sha512-1v7fgQRj6hnSwFpq1Eu0ynr/CDEw0rXo2B61qXrLNdHZmPKgb7fqS1a2JwF0rISo9q77jDI8VMEHoApn8qDoZA==", "license": "MIT", "funding": { "type": "github", @@ -6460,8 +4983,6 @@ }, "node_modules/character-entities-legacy": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/character-entities-legacy/-/character-entities-legacy-3.0.0.tgz", - "integrity": "sha512-RpPp0asT/6ufRm//AJVwpViZbGM/MkjQFxJccQRHmISF/22NBtsHqAWmL+/pmkPWoIUJdWyeVleTl1wydHATVQ==", "license": "MIT", "funding": { "type": "github", @@ -6470,8 +4991,6 @@ }, "node_modules/cheerio": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/cheerio/-/cheerio-1.0.0.tgz", - "integrity": "sha512-quS9HgjQpdaXOvsZz82Oz7uxtXiy6UIsIQcpBj7HRw2M63Skasm9qlDocAM7jNuaxdhpPU7c4kJN+gA5MCu4ww==", "license": "MIT", "dependencies": { "cheerio-select": "^2.1.0", @@ -6495,8 +5014,6 @@ }, "node_modules/cheerio-select": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/cheerio-select/-/cheerio-select-2.1.0.tgz", - "integrity": "sha512-9v9kG0LvzrlcungtnJtpGNxY+fzECQKhK4EGJX2vByejiMX84MFNQw4UxPJl3bFbTMw+Dfs37XaIkCwTZfLh4g==", "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0", @@ -6512,8 +5029,6 @@ }, "node_modules/chokidar": { "version": "3.6.0", - "resolved": "https://registry.npmjs.org/chokidar/-/chokidar-3.6.0.tgz", - "integrity": "sha512-7VT13fmjotKpGipCW9JEQAusEPE+Ei8nl6/g4FBAmIm0GOOLMua9NDDo/DWp0ZAxCr3cPq5ZpBqmPAQgDda2Pw==", "license": "MIT", "dependencies": { "anymatch": "~3.1.2", @@ -6536,8 +5051,6 @@ }, "node_modules/chokidar/node_modules/glob-parent": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "license": "ISC", "dependencies": { "is-glob": "^4.0.1" @@ -6548,8 +5061,6 @@ }, "node_modules/chownr": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/chownr/-/chownr-3.0.0.tgz", - "integrity": "sha512-+IxzY9BZOQd/XuYPRmrvEVjF/nqj5kgT4kEq7VofrDoM1MxoRjEWkrCC3EtLi59TVawxTAn+orJwFQcrqEN1+g==", "license": "BlueOak-1.0.0", "engines": { "node": ">=18" @@ -6557,15 +5068,11 @@ }, "node_modules/chunkd": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/chunkd/-/chunkd-2.0.1.tgz", - "integrity": "sha512-7d58XsFmOq0j6el67Ug9mHf9ELUXsQXYJBkyxhH/k+6Ke0qXRnv0kbemx+Twc6fRJ07C49lcbdgm9FL1Ei/6SQ==", "dev": true, "license": "MIT" }, "node_modules/ci-info": { "version": "4.3.1", - "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-4.3.1.tgz", - "integrity": "sha512-Wdy2Igu8OcBpI2pZePZ5oWjPC38tmDVx5WKUXKwlLYkA0ozo85sLsLvkBbBn/sZaSCMFOGZJ14fvW9t5/d7kdA==", "funding": [ { "type": "github", @@ -6579,15 +5086,11 @@ }, "node_modules/ci-parallel-vars": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/ci-parallel-vars/-/ci-parallel-vars-1.0.1.tgz", - "integrity": "sha512-uvzpYrpmidaoxvIQHM+rKSrigjOe9feHYbw4uOI2gdfe1C3xIlxO+kVXq83WQWNniTf8bAxVpy+cQeFQsMERKg==", "dev": true, "license": "MIT" }, "node_modules/clean-stack": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz", - "integrity": "sha512-4diC9HaTE+KRAMWhDhrGOECgWZxoevMc5TlkObMqNSsVU62PYzXZ/SMTjzyGAFF1YusgxGcSWTEXBhp0CPwQ1A==", "dev": true, "license": "MIT", "engines": { @@ -6596,8 +5099,6 @@ }, "node_modules/cli-boxes": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cli-boxes/-/cli-boxes-3.0.0.tgz", - "integrity": "sha512-/lzGpEWL/8PfI0BmBOPRwp0c/wFNX1RdUML3jK/RcSBA9T8mZDdQpqYBKtCFTOfQbwPqWEOpjqW+Fnayc0969g==", "license": "MIT", "engines": { "node": ">=10" @@ -6608,8 +5109,6 @@ }, "node_modules/cli-progress": { "version": "3.12.0", - "resolved": "https://registry.npmjs.org/cli-progress/-/cli-progress-3.12.0.tgz", - "integrity": "sha512-tRkV3HJ1ASwm19THiiLIXLO7Im7wlTuKnvkYaTkyoAPefqjNg7W7DHKUlGRxy9vxDvbyCYQkQozvptuMkGCg8A==", "license": "MIT", "dependencies": { "string-width": "^4.2.3" @@ -6620,8 +5119,6 @@ }, "node_modules/cli-truncate": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/cli-truncate/-/cli-truncate-4.0.0.tgz", - "integrity": "sha512-nPdaFdQ0h/GEigbPClz11D0v/ZJEwxmeVZGeMo3Z5StPtUTkA9o1lD6QwoirYiSDzbcwn2XcjwmCp68W1IS4TA==", "dev": true, "license": "MIT", "dependencies": { @@ -6637,15 +5134,11 @@ }, "node_modules/cli-truncate/node_modules/emoji-regex": { "version": "10.6.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", "dev": true, "license": "MIT" }, "node_modules/cli-truncate/node_modules/string-width": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", "dev": true, "license": "MIT", "dependencies": { @@ -6662,8 +5155,6 @@ }, "node_modules/cliui": { "version": "8.0.1", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-8.0.1.tgz", - "integrity": "sha512-BSeNnyus75C4//NQ9gQt1/csTXyo/8Sb+afLAkzAptFuMsod9HFokGNudZpi/oQV73hnVK+sR+5PVRMd+Dr7YQ==", "license": "ISC", "dependencies": { "string-width": "^4.2.0", @@ -6676,8 +5167,6 @@ }, "node_modules/cliui/node_modules/ansi-regex": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "license": "MIT", "engines": { "node": ">=8" @@ -6685,8 +5174,6 @@ }, "node_modules/cliui/node_modules/ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -6700,8 +5187,6 @@ }, "node_modules/cliui/node_modules/strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -6712,8 +5197,6 @@ }, "node_modules/cliui/node_modules/wrap-ansi": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", @@ -6729,8 +5212,6 @@ }, "node_modules/clone": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz", - "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==", "license": "MIT", "engines": { "node": ">=0.8" @@ -6738,8 +5219,6 @@ }, "node_modules/cmd-shim": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/cmd-shim/-/cmd-shim-8.0.0.tgz", - "integrity": "sha512-Jk/BK6NCapZ58BKUxlSI+ouKRbjH1NLZCgJkYoab+vEHUY3f6OzpNBN9u7HFSv9J6TRDGs4PLOHezoKGaFRSCA==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -6747,8 +5226,6 @@ }, "node_modules/co": { "version": "4.6.0", - "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz", - "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==", "dev": true, "license": "MIT", "engines": { @@ -6758,8 +5235,6 @@ }, "node_modules/co-body": { "version": "6.2.0", - "resolved": "https://registry.npmjs.org/co-body/-/co-body-6.2.0.tgz", - "integrity": "sha512-Kbpv2Yd1NdL1V/V4cwLVxraHDV6K8ayohr2rmH0J87Er8+zJjcTa6dAn9QMPC9CRgU8+aNajKbSf1TzDB1yKPA==", "dev": true, "license": "MIT", "dependencies": { @@ -6775,8 +5250,6 @@ }, "node_modules/code-excerpt": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/code-excerpt/-/code-excerpt-4.0.0.tgz", - "integrity": "sha512-xxodCmBen3iy2i0WtAK8FlFNrRzjUqjRsMfho58xT/wvZU1YTM3fCnRjcy1gJPMepaRlgm/0e6w8SpWHpn3/cA==", "dev": true, "license": "MIT", "dependencies": { @@ -6788,8 +5261,6 @@ }, "node_modules/color-convert": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", - "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -6800,20 +5271,14 @@ }, "node_modules/color-name": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", - "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", "license": "MIT" }, "node_modules/colord": { "version": "2.9.3", - "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz", - "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw==", "license": "MIT" }, "node_modules/combined-stream": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz", - "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==", "dev": true, "license": "MIT", "dependencies": { @@ -6825,8 +5290,6 @@ }, "node_modules/comma-separated-tokens": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/comma-separated-tokens/-/comma-separated-tokens-2.0.3.tgz", - "integrity": "sha512-Fu4hJdvzeylCfQPp9SGWidpzrMs7tTrlu6Vb8XGaRGck8QSNZJJp538Wrb60Lax4fPwR64ViY468OIUTbRlGZg==", "license": "MIT", "funding": { "type": "github", @@ -6835,14 +5298,10 @@ }, "node_modules/command-exists": { "version": "1.2.9", - "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz", - "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w==", "license": "MIT" }, "node_modules/command-line-args": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/command-line-args/-/command-line-args-6.0.1.tgz", - "integrity": "sha512-Jr3eByUjqyK0qd8W0SGFW1nZwqCaNCtbXjRo2cRJC1OYxWl3MZ5t1US3jq+cO4sPavqgw4l9BMGX0CBe+trepg==", "dev": true, "license": "MIT", "dependencies": { @@ -6865,8 +5324,6 @@ }, "node_modules/command-line-usage": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/command-line-usage/-/command-line-usage-7.0.3.tgz", - "integrity": "sha512-PqMLy5+YGwhMh1wS04mVG44oqDsgyLRSKJBdOo1bnYhMKBW65gZF1dRp2OZRhiTjgUHljy99qkO7bsctLaw35Q==", "dev": true, "license": "MIT", "dependencies": { @@ -6881,8 +5338,6 @@ }, "node_modules/commander": { "version": "10.0.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-10.0.1.tgz", - "integrity": "sha512-y4Mg2tXshplEbSGzx7amzPwKKOCGuoSRP/CjEdwwk0FOGlUbq6lKuoyDZTNZkmxHdJtp54hdfY/JUrdL7Xfdug==", "dev": true, "license": "MIT", "engines": { @@ -6891,8 +5346,6 @@ }, "node_modules/comment-parser": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/comment-parser/-/comment-parser-1.4.1.tgz", - "integrity": "sha512-buhp5kePrmda3vhc5B9t7pUQXAb2Tnd0qgpkIhPhkHXxJpiPJ11H0ZEU0oBpJ2QztSbzG/ZxMj/CHsYJqRHmyg==", "dev": true, "license": "MIT", "engines": { @@ -6901,14 +5354,10 @@ }, "node_modules/common-ancestor-path": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz", - "integrity": "sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==", "license": "ISC" }, "node_modules/common-log-format": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/common-log-format/-/common-log-format-1.0.0.tgz", - "integrity": "sha512-fFn/WPNbsTCGTTwdCpZfVZSa5mgqMEkA0gMTRApFSlEsYN+9B2FPfiqch5FT+jsv5IV1RHV3GeZvCa7Qg+jssw==", "dev": true, "license": "MIT", "bin": { @@ -6920,22 +5369,16 @@ }, "node_modules/common-path-prefix": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/common-path-prefix/-/common-path-prefix-3.0.0.tgz", - "integrity": "sha512-QE33hToZseCH3jS0qN96O/bSh3kaw/h+Tq7ngyY9eWDUnTlTNUyqfqvCXioLe5Na5jFsL78ra/wuBU4iuEgd4w==", "dev": true, "license": "ISC" }, "node_modules/commondir": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz", - "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg==", "dev": true, "license": "MIT" }, "node_modules/compare-func": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/compare-func/-/compare-func-2.0.0.tgz", - "integrity": "sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==", "dev": true, "license": "MIT", "dependencies": { @@ -6945,8 +5388,6 @@ }, "node_modules/component-emitter": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/component-emitter/-/component-emitter-1.3.1.tgz", - "integrity": "sha512-T0+barUSQRTUQASh8bx02dl+DhF54GtIDY13Y3m9oWTklKbb3Wv974meRpeZ3lp1JpLVECWWNHC4vaG2XHXouQ==", "dev": true, "license": "MIT", "funding": { @@ -6955,8 +5396,6 @@ }, "node_modules/compressible": { "version": "2.0.18", - "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz", - "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==", "license": "MIT", "dependencies": { "mime-db": ">= 1.43.0 < 2" @@ -6967,8 +5406,6 @@ }, "node_modules/compression": { "version": "1.8.1", - "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.1.tgz", - "integrity": "sha512-9mAqGPHLakhCLeNyxPkK4xVo746zQ/czLH1Ky+vkitMnWfWZps8r0qXuwhwizagCRttsL4lfG4pIOvaWLpAP0w==", "license": "MIT", "dependencies": { "bytes": "3.1.2", @@ -6985,15 +5422,11 @@ }, "node_modules/concat-map": { "version": "0.0.1", - "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz", - "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==", "dev": true, "license": "MIT" }, "node_modules/concordance": { "version": "5.0.4", - "resolved": "https://registry.npmjs.org/concordance/-/concordance-5.0.4.tgz", - "integrity": "sha512-OAcsnTEYu1ARJqWVGwf4zh4JDfHZEaSNlNccFmt8YjB2l/n19/PF2viLINHc57vO4FKIAFl2FWASIGZZWZ2Kxw==", "dev": true, "license": "ISC", "dependencies": { @@ -7012,8 +5445,6 @@ }, "node_modules/config-chain": { "version": "1.1.13", - "resolved": "https://registry.npmjs.org/config-chain/-/config-chain-1.1.13.tgz", - "integrity": "sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ==", "license": "MIT", "dependencies": { "ini": "^1.3.4", @@ -7022,14 +5453,10 @@ }, "node_modules/config-chain/node_modules/ini": { "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "license": "ISC" }, "node_modules/configstore": { "version": "7.1.0", - "resolved": "https://registry.npmjs.org/configstore/-/configstore-7.1.0.tgz", - "integrity": "sha512-N4oog6YJWbR9kGyXvS7jEykLDXIE2C0ILYqNBZBp9iwiJpoCBWYsuAdW6PPFn6w06jjnC+3JstVvWHO4cZqvRg==", "license": "BSD-2-Clause", "dependencies": { "atomically": "^2.0.3", @@ -7046,8 +5473,6 @@ }, "node_modules/configstore/node_modules/dot-prop": { "version": "9.0.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-9.0.0.tgz", - "integrity": "sha512-1gxPBJpI/pcjQhKgIU91II6Wkay+dLcN3M6rf2uwP8hRur3HtQXjVrdAK3sjC0piaEuxzMwjXChcETiJl47lAQ==", "license": "MIT", "dependencies": { "type-fest": "^4.18.2" @@ -7061,8 +5486,6 @@ }, "node_modules/configstore/node_modules/type-fest": { "version": "4.41.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz", - "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==", "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=16" @@ -7073,8 +5496,6 @@ }, "node_modules/consola": { "version": "3.4.2", - "resolved": "https://registry.npmjs.org/consola/-/consola-3.4.2.tgz", - "integrity": "sha512-5IKcdX0nnYavi6G7TtOhwkYzyjfJlatbjMjuLSfE2kYT5pMDOilZ4OvMhi637CcDICTmz3wARPoyhqyX1Y+XvA==", "dev": true, "license": "MIT", "engines": { @@ -7083,8 +5504,6 @@ }, "node_modules/content-disposition": { "version": "0.5.4", - "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz", - "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==", "license": "MIT", "dependencies": { "safe-buffer": "5.2.1" @@ -7095,8 +5514,6 @@ }, "node_modules/content-type": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz", - "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -7104,8 +5521,6 @@ }, "node_modules/conventional-changelog-angular": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/conventional-changelog-angular/-/conventional-changelog-angular-7.0.0.tgz", - "integrity": "sha512-ROjNchA9LgfNMTTFSIWPzebCwOGFdgkEq45EnvvrmSLvCtAw0HSmrCs7/ty+wAeYUZyNay0YMUNYFTRL72PkBQ==", "dev": true, "license": "ISC", "dependencies": { @@ -7117,8 +5532,6 @@ }, "node_modules/conventional-changelog-conventionalcommits": { "version": "7.0.2", - "resolved": "https://registry.npmjs.org/conventional-changelog-conventionalcommits/-/conventional-changelog-conventionalcommits-7.0.2.tgz", - "integrity": "sha512-NKXYmMR/Hr1DevQegFB4MwfM5Vv0m4UIxKZTTYuD98lpTknaZlSRrDOG4X7wIXpGkfsYxZTghUN+Qq+T0YQI7w==", "dev": true, "license": "ISC", "dependencies": { @@ -7130,8 +5543,6 @@ }, "node_modules/conventional-commits-parser": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/conventional-commits-parser/-/conventional-commits-parser-5.0.0.tgz", - "integrity": "sha512-ZPMl0ZJbw74iS9LuX9YIAiW8pfM5p3yh2o/NbXHbkFuZzY5jvdi5jFycEOkmBW5H5I7nA+D6f3UcsCLP2vvSEA==", "dev": true, "license": "MIT", "dependencies": { @@ -7149,15 +5560,11 @@ }, "node_modules/convert-source-map": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz", - "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg==", "dev": true, "license": "MIT" }, "node_modules/convert-to-spaces": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/convert-to-spaces/-/convert-to-spaces-2.0.1.tgz", - "integrity": "sha512-rcQ1bsQO9799wq24uE5AM2tAILy4gXGIK/njFWcVQkGNZ96edlpY+A7bjwvzjYvLDyzmG1MmMLZhpcsb+klNMQ==", "dev": true, "license": "MIT", "engines": { @@ -7166,8 +5573,6 @@ }, "node_modules/cookie": { "version": "0.7.1", - "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz", - "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -7175,21 +5580,15 @@ }, "node_modules/cookie-signature": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz", - "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ==", "license": "MIT" }, "node_modules/cookiejar": { "version": "2.1.4", - "resolved": "https://registry.npmjs.org/cookiejar/-/cookiejar-2.1.4.tgz", - "integrity": "sha512-LDx6oHrK+PhzLKJU9j5S7/Y3jM/mUHvD/DeI1WQmJn652iPC5Y4TBzC9l+5OMOXlyTTA+SmVUPm0HQUwpD5Jqw==", "dev": true, "license": "MIT" }, "node_modules/cookies": { "version": "0.9.1", - "resolved": "https://registry.npmjs.org/cookies/-/cookies-0.9.1.tgz", - "integrity": "sha512-TG2hpqe4ELx54QER/S3HQ9SRVnQnGBtKUz5bLQWtYAQ+o6GpgMs6sYUvaiJjVxb+UXwhRhAEP3m7LbsIZ77Hmw==", "dev": true, "license": "MIT", "dependencies": { @@ -7202,8 +5601,6 @@ }, "node_modules/copy-anything": { "version": "4.0.5", - "resolved": "https://registry.npmjs.org/copy-anything/-/copy-anything-4.0.5.tgz", - "integrity": "sha512-7Vv6asjS4gMOuILabD3l739tsaxFQmC+a7pLZm02zyvs8p977bL3zEgq3yDk5rn9B0PbYgIv++jmHcuUab4RhA==", "license": "MIT", "dependencies": { "is-what": "^5.2.0" @@ -7217,21 +5614,15 @@ }, "node_modules/copy-to": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/copy-to/-/copy-to-2.0.1.tgz", - "integrity": "sha512-3DdaFaU/Zf1AnpLiFDeNCD4TOWe3Zl2RZaTzUvWiIk5ERzcCodOE20Vqq4fzCbNoHURFHT4/us/Lfq+S2zyY4w==", "dev": true, "license": "MIT" }, "node_modules/core-util-is": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz", - "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ==", "license": "MIT" }, "node_modules/correct-license-metadata": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/correct-license-metadata/-/correct-license-metadata-1.4.0.tgz", - "integrity": "sha512-nvbNpK/aYCbztZWGi9adIPqR+ZcQmZTWNT7eMYLvkaVGroN1nTHiVuuNPl7pK6ZNx1mvDztlRBJtfUdrVwKJ5A==", "dev": true, "license": "MIT", "dependencies": { @@ -7240,8 +5631,6 @@ }, "node_modules/cors": { "version": "2.8.5", - "resolved": "https://registry.npmjs.org/cors/-/cors-2.8.5.tgz", - "integrity": "sha512-KIHbLJqu73RGr/hnbrO9uBeixNGuvSQjul/jdFvS/KFSIH1hWVd1ng7zOHx+YrEfInLG7q4n6GHQ9cDtxv/P6g==", "license": "MIT", "dependencies": { "object-assign": "^4", @@ -7253,8 +5642,6 @@ }, "node_modules/cosmiconfig": { "version": "9.0.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-9.0.0.tgz", - "integrity": "sha512-itvL5h8RETACmOTFc4UfIyB2RfEHi71Ax6E/PivVxq9NseKbOWpeyHEOIbmAw1rs8Ak0VursQNww7lf7YtUwzg==", "dev": true, "license": "MIT", "dependencies": { @@ -7280,8 +5667,6 @@ }, "node_modules/cosmiconfig-typescript-loader": { "version": "6.2.0", - "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-6.2.0.tgz", - "integrity": "sha512-GEN39v7TgdxgIoNcdkRE3uiAzQt3UXLyHbRHD6YoL048XAeOomyxaP+Hh/+2C6C2wYjxJ2onhJcsQp+L4YEkVQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7298,8 +5683,6 @@ }, "node_modules/create-mixin": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/create-mixin/-/create-mixin-3.0.0.tgz", - "integrity": "sha512-LkdMqnWT9LaqBN4huqpUnMz56Yr1mVSoCduAd2xXefgH/YZP2sXCMAyztXjk4q8hTF/TlcDa+zQW2aTgGdjjKQ==", "dev": true, "license": "MIT", "engines": { @@ -7308,8 +5691,6 @@ }, "node_modules/cross-env": { "version": "7.0.3", - "resolved": "https://registry.npmjs.org/cross-env/-/cross-env-7.0.3.tgz", - "integrity": "sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==", "dev": true, "license": "MIT", "dependencies": { @@ -7327,8 +5708,6 @@ }, "node_modules/cross-spawn": { "version": "7.0.6", - "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz", - "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==", "license": "MIT", "dependencies": { "path-key": "^3.1.0", @@ -7341,14 +5720,10 @@ }, "node_modules/cross-spawn/node_modules/isexe": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "license": "ISC" }, "node_modules/cross-spawn/node_modules/which": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "license": "ISC", "dependencies": { "isexe": "^2.0.0" @@ -7362,8 +5737,6 @@ }, "node_modules/crypto-random-string": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-4.0.0.tgz", - "integrity": "sha512-x8dy3RnvYdlUcPOjkEHqozhiwzKNSq7GcPuXFbnyMOCHxX8V3OgIg/pYuabl2sbUPfIJaeAQB7PMOK8DFIdoRA==", "dev": true, "license": "MIT", "dependencies": { @@ -7378,8 +5751,6 @@ }, "node_modules/crypto-random-string/node_modules/type-fest": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-1.4.0.tgz", - "integrity": "sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA==", "dev": true, "license": "(MIT OR CC0-1.0)", "engines": { @@ -7391,8 +5762,6 @@ }, "node_modules/css-declaration-sorter": { "version": "7.3.0", - "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-7.3.0.tgz", - "integrity": "sha512-LQF6N/3vkAMYF4xoHLJfG718HRJh34Z8BnNhd6bosOMIVjMlhuZK5++oZa3uYAgrI5+7x2o27gUqTR2U/KjUOQ==", "license": "ISC", "engines": { "node": "^14 || ^16 || >=18" @@ -7403,8 +5772,6 @@ }, "node_modules/css-select": { "version": "5.2.2", - "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.2.2.tgz", - "integrity": "sha512-TizTzUddG/xYLA3NXodFM0fSbNizXjOKhqiQQwvhlspadZokn1KDy0NZFS0wuEubIYAV5/c1/lAr0TaaFXEXzw==", "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0", @@ -7419,8 +5786,6 @@ }, "node_modules/css-tree": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-3.1.0.tgz", - "integrity": "sha512-0eW44TGN5SQXU1mWSkKwFstI/22X2bG1nYzZTYMAWjylYURhse752YgbE4Cx46AC+bAvI+/dYTPRk1LqSUnu6w==", "license": "MIT", "dependencies": { "mdn-data": "2.12.2", @@ -7432,8 +5797,6 @@ }, "node_modules/css-what": { "version": "6.2.2", - "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.2.2.tgz", - "integrity": "sha512-u/O3vwbptzhMs3L1fQE82ZSLHQQfto5gyZzwteVIEyeaY5Fc7R4dapF/BvRoSYFeqfBk4m0V1Vafq5Pjv25wvA==", "license": "BSD-2-Clause", "engines": { "node": ">= 6" @@ -7444,8 +5807,6 @@ }, "node_modules/cssesc": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz", - "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==", "license": "MIT", "bin": { "cssesc": "bin/cssesc" @@ -7456,8 +5817,6 @@ }, "node_modules/cssnano": { "version": "7.1.2", - "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-7.1.2.tgz", - "integrity": "sha512-HYOPBsNvoiFeR1eghKD5C3ASm64v9YVyJB4Ivnl2gqKoQYvjjN/G0rztvKQq8OxocUtC6sjqY8jwYngIB4AByA==", "license": "MIT", "dependencies": { "cssnano-preset-default": "^7.0.10", @@ -7476,8 +5835,6 @@ }, "node_modules/cssnano-preset-default": { "version": "7.0.10", - "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-7.0.10.tgz", - "integrity": "sha512-6ZBjW0Lf1K1Z+0OKUAUpEN62tSXmYChXWi2NAA0afxEVsj9a+MbcB1l5qel6BHJHmULai2fCGRthCeKSFbScpA==", "license": "MIT", "dependencies": { "browserslist": "^4.27.0", @@ -7520,8 +5877,6 @@ }, "node_modules/cssnano-utils": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-5.0.1.tgz", - "integrity": "sha512-ZIP71eQgG9JwjVZsTPSqhc6GHgEr53uJ7tK5///VfyWj6Xp2DBmixWHqJgPno+PqATzn48pL42ww9x5SSGmhZg==", "license": "MIT", "engines": { "node": "^18.12.0 || ^20.9.0 || >=22.0" @@ -7532,8 +5887,6 @@ }, "node_modules/csso": { "version": "5.0.5", - "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz", - "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==", "license": "MIT", "dependencies": { "css-tree": "~2.2.0" @@ -7545,8 +5898,6 @@ }, "node_modules/csso/node_modules/css-tree": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz", - "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==", "license": "MIT", "dependencies": { "mdn-data": "2.0.28", @@ -7559,20 +5910,14 @@ }, "node_modules/csso/node_modules/mdn-data": { "version": "2.0.28", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz", - "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==", "license": "CC0-1.0" }, "node_modules/csstype": { "version": "3.2.3", - "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.2.3.tgz", - "integrity": "sha512-z1HGKcYy2xA8AGQfwrn0PAy+PB7X/GSj3UVJW9qKyn43xWa+gl5nXmU4qqLMRzWVLFC8KusUX8T/0kCiOYpAIQ==", "license": "MIT" }, "node_modules/current-module-paths": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/current-module-paths/-/current-module-paths-1.1.3.tgz", - "integrity": "sha512-7AH+ZTRKikdK4s1RmY0l6067UD/NZc7p3zZVZxvmnH80G31kr0y0W0E6ibYM4IS01MEm8DiC5FnTcgcgkbFHoA==", "dev": true, "license": "MIT", "engines": { @@ -7581,8 +5926,6 @@ }, "node_modules/currently-unhandled": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz", - "integrity": "sha512-/fITjgjGU50vjQ4FH6eUoYu+iUoUKIXws2hL15JJpIR+BbTxaXQsMuuyjtNh2WqsSBS5nsaZHFsFecyw5CCAng==", "dev": true, "license": "MIT", "dependencies": { @@ -7594,8 +5937,6 @@ }, "node_modules/dargs": { "version": "8.1.0", - "resolved": "https://registry.npmjs.org/dargs/-/dargs-8.1.0.tgz", - "integrity": "sha512-wAV9QHOsNbwnWdNW2FYvE1P56wtgSbM+3SZcdGiWQILwVjACCXDCI3Ai8QlCjMDB8YK5zySiXZYBiwGmNY3lnw==", "dev": true, "license": "MIT", "engines": { @@ -7607,8 +5948,6 @@ }, "node_modules/data-view-buffer": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz", - "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7625,8 +5964,6 @@ }, "node_modules/data-view-byte-length": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz", - "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7643,8 +5980,6 @@ }, "node_modules/data-view-byte-offset": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz", - "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7661,8 +5996,6 @@ }, "node_modules/data-with-position": { "version": "0.5.0", - "resolved": "https://registry.npmjs.org/data-with-position/-/data-with-position-0.5.0.tgz", - "integrity": "sha512-GhsgEIPWk7WCAisjwBkOjvPqpAlVUOSl1CTmy9KyhVMG1wxl29Zj5+J71WhQ/KgoJS/Psxq6Cnioz3xdBjeIWQ==", "license": "BSD-3-Clause", "dependencies": { "yaml-ast-parser": "^0.0.43" @@ -7670,8 +6003,6 @@ }, "node_modules/date-time": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/date-time/-/date-time-3.1.0.tgz", - "integrity": "sha512-uqCUKXE5q1PNBXjPqvwhwJf9SwMoAHBgWJ6DcrnS5o+W2JOiIILl0JEdVD8SGujrNS02GGxgwAg2PN2zONgtjg==", "dev": true, "license": "MIT", "dependencies": { @@ -7683,8 +6014,6 @@ }, "node_modules/debug": { "version": "2.6.9", - "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz", - "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==", "license": "MIT", "dependencies": { "ms": "2.0.0" @@ -7692,8 +6021,6 @@ }, "node_modules/decamelize": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz", - "integrity": "sha512-z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA==", "dev": true, "license": "MIT", "engines": { @@ -7702,15 +6029,11 @@ }, "node_modules/deep-equal": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/deep-equal/-/deep-equal-1.0.1.tgz", - "integrity": "sha512-bHtC0iYvWhyaTzvV3CZgPeZQqCOBGyGsVV7v4eevpdkLHfiSrXUdBG+qAuSz4RI70sszvjQ1QSZ98An1yNwpSw==", "dev": true, "license": "MIT" }, "node_modules/deep-extend": { "version": "0.6.0", - "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz", - "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==", "license": "MIT", "engines": { "node": ">=4.0.0" @@ -7718,15 +6041,11 @@ }, "node_modules/deep-is": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz", - "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==", "dev": true, "license": "MIT" }, "node_modules/default-browser": { "version": "5.4.0", - "resolved": "https://registry.npmjs.org/default-browser/-/default-browser-5.4.0.tgz", - "integrity": "sha512-XDuvSq38Hr1MdN47EDvYtx3U0MTqpCEn+F6ft8z2vYDzMrvQhVp0ui9oQdqW3MvK3vqUETglt1tVGgjLuJ5izg==", "license": "MIT", "dependencies": { "bundle-name": "^4.1.0", @@ -7741,8 +6060,6 @@ }, "node_modules/default-browser-id": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/default-browser-id/-/default-browser-id-5.0.1.tgz", - "integrity": "sha512-x1VCxdX4t+8wVfd1so/9w+vQ4vx7lKd2Qp5tDRutErwmR85OgmfX7RlLRMWafRMY7hbEiXIbudNrjOAPa/hL8Q==", "license": "MIT", "engines": { "node": ">=18" @@ -7753,8 +6070,6 @@ }, "node_modules/default-require-extensions": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/default-require-extensions/-/default-require-extensions-3.0.1.tgz", - "integrity": "sha512-eXTJmRbm2TIt9MgWTsOH1wEuhew6XGZcMeGKCtLedIg/NCsg1iBePXkceTdK4Fii7pzmN9tGsZhKzZ4h7O/fxw==", "dev": true, "license": "MIT", "dependencies": { @@ -7769,8 +6084,6 @@ }, "node_modules/define-data-property": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz", - "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==", "dev": true, "license": "MIT", "dependencies": { @@ -7787,8 +6100,6 @@ }, "node_modules/define-lazy-prop": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz", - "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==", "dev": true, "license": "MIT", "engines": { @@ -7797,8 +6108,6 @@ }, "node_modules/define-properties": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz", - "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==", "dev": true, "license": "MIT", "dependencies": { @@ -7815,8 +6124,6 @@ }, "node_modules/delayed-stream": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz", - "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==", "dev": true, "license": "MIT", "engines": { @@ -7825,15 +6132,11 @@ }, "node_modules/delegates": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/delegates/-/delegates-1.0.0.tgz", - "integrity": "sha512-bd2L678uiWATM6m5Z1VzNCErI3jiGzt6HGY8OVICs40JQq/HALfbyNJmp0UDakEY4pMMaN0Ly5om/B1VI/+xfQ==", "dev": true, "license": "MIT" }, "node_modules/depcheck": { "version": "1.4.7", - "resolved": "https://registry.npmjs.org/depcheck/-/depcheck-1.4.7.tgz", - "integrity": "sha512-1lklS/bV5chOxwNKA/2XUUk/hPORp8zihZsXflr8x0kLwmcZ9Y9BsS6Hs3ssvA+2wUVbG0U2Ciqvm1SokNjPkA==", "dev": true, "license": "MIT", "dependencies": { @@ -7870,8 +6173,6 @@ }, "node_modules/depcheck/node_modules/ansi-regex": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, "license": "MIT", "engines": { @@ -7880,8 +6181,6 @@ }, "node_modules/depcheck/node_modules/ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "license": "MIT", "dependencies": { @@ -7896,8 +6195,6 @@ }, "node_modules/depcheck/node_modules/argparse": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "license": "MIT", "dependencies": { @@ -7906,8 +6203,6 @@ }, "node_modules/depcheck/node_modules/brace-expansion": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -7916,8 +6211,6 @@ }, "node_modules/depcheck/node_modules/cliui": { "version": "7.0.4", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-7.0.4.tgz", - "integrity": "sha512-OcRE68cOsVMXp1Yvonl/fzkQOyjLSu/8bhPDfQt0e0/Eb283TKP20Fs2MqoPsr9SwA595rRCA+QMzYc9nBP+JQ==", "dev": true, "license": "ISC", "dependencies": { @@ -7928,8 +6221,6 @@ }, "node_modules/depcheck/node_modules/cosmiconfig": { "version": "7.1.0", - "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-7.1.0.tgz", - "integrity": "sha512-AdmX6xUzdNASswsFtmwSt7Vj8po9IuqXm0UXz7QKPuEUmPB4XyjGfaAr2PSuELMwkRMVH1EpIkX5bTZGRB3eCA==", "dev": true, "license": "MIT", "dependencies": { @@ -7945,8 +6236,6 @@ }, "node_modules/depcheck/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -7963,8 +6252,6 @@ }, "node_modules/depcheck/node_modules/js-yaml": { "version": "3.14.2", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz", - "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==", "dev": true, "license": "MIT", "dependencies": { @@ -7977,8 +6264,6 @@ }, "node_modules/depcheck/node_modules/minimatch": { "version": "7.4.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-7.4.6.tgz", - "integrity": "sha512-sBz8G/YjVniEz6lKPNpKxXwazJe4c19fEfV2GDMX6AjFz+MX9uDWIZW8XreVhkFW3fkIdTv/gxWr/Kks5FFAVw==", "dev": true, "license": "ISC", "dependencies": { @@ -7993,15 +6278,11 @@ }, "node_modules/depcheck/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/depcheck/node_modules/path-type": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz", - "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==", "dev": true, "license": "MIT", "engines": { @@ -8010,8 +6291,6 @@ }, "node_modules/depcheck/node_modules/strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "license": "MIT", "dependencies": { @@ -8023,8 +6302,6 @@ }, "node_modules/depcheck/node_modules/wrap-ansi": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "dev": true, "license": "MIT", "dependencies": { @@ -8041,8 +6318,6 @@ }, "node_modules/depcheck/node_modules/yargs": { "version": "16.2.0", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-16.2.0.tgz", - "integrity": "sha512-D1mvvtDG0L5ft/jGWkLpG1+m0eQxOfaBvTNELraWj22wSVUMWxZUvYgJYcKh6jGGIkJFhH4IZPQhR4TKpc8mBw==", "dev": true, "license": "MIT", "dependencies": { @@ -8060,8 +6335,6 @@ }, "node_modules/depcheck/node_modules/yargs-parser": { "version": "20.2.9", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-20.2.9.tgz", - "integrity": "sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==", "dev": true, "license": "ISC", "engines": { @@ -8070,8 +6343,6 @@ }, "node_modules/depd": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz", - "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==", "license": "MIT", "engines": { "node": ">= 0.8" @@ -8079,15 +6350,11 @@ }, "node_modules/deps-regex": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/deps-regex/-/deps-regex-0.2.0.tgz", - "integrity": "sha512-PwuBojGMQAYbWkMXOY9Pd/NWCDNHVH12pnS7WHqZkTSeMESe4hwnKKRp0yR87g37113x4JPbo/oIvXY+s/f56Q==", "dev": true, "license": "MIT" }, "node_modules/dequal": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/dequal/-/dequal-2.0.3.tgz", - "integrity": "sha512-0je+qPKHEMohvfRTCEo3CrPG6cAzAYgmzKyxRiYSSDkS6eGJdyVJm7WaYA5ECaAD9wLB2T4EEeymA5aFVcYXCA==", "license": "MIT", "engines": { "node": ">=6" @@ -8095,8 +6362,6 @@ }, "node_modules/destroy": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz", - "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==", "license": "MIT", "engines": { "node": ">= 0.8", @@ -8105,8 +6370,6 @@ }, "node_modules/detect-file": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/detect-file/-/detect-file-1.0.0.tgz", - "integrity": "sha512-DtCOLG98P007x7wiiOmfI0fi3eIKyWiLTGJ2MDnVi/E04lWGbf+JzrRHMm0rgIIZJGtHpKpbVgLWHrv8xXpc3Q==", "dev": true, "license": "MIT", "engines": { @@ -8115,8 +6378,6 @@ }, "node_modules/detect-libc": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-2.1.2.tgz", - "integrity": "sha512-Btj2BOOO83o3WyH59e8MgXsxEQVcarkUOpEYrubB0urwnN10yQ364rsiByU11nZlqWYZm05i/of7io4mzihBtQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -8125,14 +6386,10 @@ }, "node_modules/detect-node": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz", - "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==", "license": "MIT" }, "node_modules/devcert-sanscache": { "version": "0.5.1", - "resolved": "https://registry.npmjs.org/devcert-sanscache/-/devcert-sanscache-0.5.1.tgz", - "integrity": "sha512-9ePmMvWItstun0c35V5WXUlNU4MCHtpXWxKUJcDiZvyKkcA3FxkL6PFHKqTd446mXMmvLpOGBxVD6GjBXeMA5A==", "license": "MIT", "dependencies": { "command-exists": "^1.2.9", @@ -8146,8 +6403,6 @@ }, "node_modules/devcert-sanscache/node_modules/brace-expansion": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" @@ -8155,8 +6410,6 @@ }, "node_modules/devcert-sanscache/node_modules/glob": { "version": "10.5.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", - "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", @@ -8175,14 +6428,10 @@ }, "node_modules/devcert-sanscache/node_modules/lru-cache": { "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "license": "ISC" }, "node_modules/devcert-sanscache/node_modules/minimatch": { "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" @@ -8196,8 +6445,6 @@ }, "node_modules/devcert-sanscache/node_modules/path-scurry": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "license": "BlueOak-1.0.0", "dependencies": { "lru-cache": "^10.2.0", @@ -8212,8 +6459,6 @@ }, "node_modules/devlop": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/devlop/-/devlop-1.1.0.tgz", - "integrity": "sha512-RWmIqhcFf1lRYBvNmr7qTNuyCt/7/ns2jbpp1+PalgE/rDQcBT0fioSMUpJ93irlUhC5hrg4cYqe6U+0ImW0rA==", "license": "MIT", "dependencies": { "dequal": "^2.0.0" @@ -8225,8 +6470,6 @@ }, "node_modules/dezalgo": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/dezalgo/-/dezalgo-1.0.4.tgz", - "integrity": "sha512-rXSP0bf+5n0Qonsb+SVVfNfIsimO4HEtmnIpPHY8Q1UCzKlQrDMfdobr8nJOOsRgWCyMRqeSBQzmWUMq7zvVig==", "dev": true, "license": "ISC", "dependencies": { @@ -8236,14 +6479,10 @@ }, "node_modules/didyoumean": { "version": "1.2.2", - "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz", - "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw==", "license": "Apache-2.0" }, "node_modules/diff": { - "version": "8.0.3", - "resolved": "https://registry.npmjs.org/diff/-/diff-8.0.3.tgz", - "integrity": "sha512-qejHi7bcSD4hQAZE0tNAawRK1ZtafHDmMTMkrrIGgSLl7hTnQHmKCeB45xAcbfTqK2zowkM3j3bHt/4b/ARbYQ==", + "version": "7.0.0", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -8252,14 +6491,10 @@ }, "node_modules/dlv": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz", - "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA==", "license": "MIT" }, "node_modules/docdash": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/docdash/-/docdash-2.0.2.tgz", - "integrity": "sha512-3SDDheh9ddrwjzf6dPFe1a16M6ftstqTNjik2+1fx46l24H9dD2osT2q9y+nBEC1wWz4GIqA48JmicOLQ0R8xA==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -8268,8 +6503,6 @@ }, "node_modules/docopt": { "version": "0.6.2", - "resolved": "https://registry.npmjs.org/docopt/-/docopt-0.6.2.tgz", - "integrity": "sha512-NqTbaYeE4gA/wU1hdKFdU+AFahpDOpgGLzHP42k6H6DKExJd0A55KEVWYhL9FEmHmgeLvEU2vuKXDuU+4yToOw==", "dev": true, "engines": { "node": ">=0.10.0" @@ -8277,8 +6510,6 @@ }, "node_modules/dom-serializer": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz", - "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==", "license": "MIT", "dependencies": { "domelementtype": "^2.3.0", @@ -8291,8 +6522,6 @@ }, "node_modules/domelementtype": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz", - "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==", "funding": [ { "type": "github", @@ -8303,8 +6532,6 @@ }, "node_modules/domhandler": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz", - "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==", "license": "BSD-2-Clause", "dependencies": { "domelementtype": "^2.3.0" @@ -8318,8 +6545,6 @@ }, "node_modules/domutils": { "version": "3.2.2", - "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz", - "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==", "license": "BSD-2-Clause", "dependencies": { "dom-serializer": "^2.0.0", @@ -8332,8 +6557,6 @@ }, "node_modules/dot-prop": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/dot-prop/-/dot-prop-5.3.0.tgz", - "integrity": "sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==", "dev": true, "license": "MIT", "dependencies": { @@ -8345,8 +6568,6 @@ }, "node_modules/dunder-proto": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz", - "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==", "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.1", @@ -8359,14 +6580,10 @@ }, "node_modules/eastasianwidth": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz", - "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==", "license": "MIT" }, "node_modules/editorconfig": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/editorconfig/-/editorconfig-1.0.4.tgz", - "integrity": "sha512-L9Qe08KWTlqYMVvMcTIvMAdl1cDUubzRNYL+WfA4bLDMHe4nemKkpmYzkznE1FwLKu0EEmy6obgQKzMJrg4x9Q==", "dev": true, "license": "MIT", "dependencies": { @@ -8384,8 +6601,6 @@ }, "node_modules/editorconfig/node_modules/brace-expansion": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -8394,8 +6609,6 @@ }, "node_modules/editorconfig/node_modules/minimatch": { "version": "9.0.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.1.tgz", - "integrity": "sha512-0jWhJpD/MdhPXwPuiRkCbfYfSKp2qnn2eOc279qI7f+osl/l+prKSrvhg157zSYvx/1nmgn2NqdT6k2Z7zSH9w==", "dev": true, "license": "ISC", "dependencies": { @@ -8410,20 +6623,14 @@ }, "node_modules/ee-first": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz", - "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow==", "license": "MIT" }, "node_modules/electron-to-chromium": { "version": "1.5.259", - "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.259.tgz", - "integrity": "sha512-I+oLXgpEJzD6Cwuwt1gYjxsDmu/S/Kd41mmLA3O+/uH2pFRO/DvOjUyGozL8j3KeLV6WyZ7ssPwELMsXCcsJAQ==", "license": "ISC" }, "node_modules/emittery": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/emittery/-/emittery-1.2.0.tgz", - "integrity": "sha512-KxdRyyFcS85pH3dnU8Y5yFUm2YJdaHwcBZWrfG8o89ZY9a13/f9itbN+YG3ELbBo9Pg5zvIozstmuV8bX13q6g==", "dev": true, "license": "MIT", "engines": { @@ -8435,29 +6642,29 @@ }, "node_modules/emoji-regex": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-8.0.0.tgz", - "integrity": "sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A==", "license": "MIT" }, "node_modules/emoji-regex-xs": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/emoji-regex-xs/-/emoji-regex-xs-1.0.0.tgz", - "integrity": "sha512-LRlerrMYoIDrT6jgpeZ2YYl/L8EulRTt5hQcYjy5AInh7HWXKimpqx68aknBFpGL2+/IcogTcaydJEgaTmOpDg==", "license": "MIT" }, "node_modules/encodeurl": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz", - "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==", "license": "MIT", "engines": { "node": ">= 0.8" } }, + "node_modules/encoding": { + "version": "0.1.13", + "license": "MIT", + "optional": true, + "dependencies": { + "iconv-lite": "^0.6.2" + } + }, "node_modules/encoding-sniffer": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/encoding-sniffer/-/encoding-sniffer-0.2.1.tgz", - "integrity": "sha512-5gvq20T6vfpekVtqrYQsSCFZ1wEg5+wW0/QaZMWkFr6BqD3NfKs0rLCx4rrVlSWJeZb5NBJgVLswK/w2MWU+Gw==", "license": "MIT", "dependencies": { "iconv-lite": "^0.6.3", @@ -8469,8 +6676,6 @@ }, "node_modules/encoding-sniffer/node_modules/iconv-lite": { "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -8479,10 +6684,19 @@ "node": ">=0.10.0" } }, + "node_modules/encoding/node_modules/iconv-lite": { + "version": "0.6.3", + "license": "MIT", + "optional": true, + "dependencies": { + "safer-buffer": ">= 2.1.2 < 3.0.0" + }, + "engines": { + "node": ">=0.10.0" + } + }, "node_modules/enhance-visitors": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/enhance-visitors/-/enhance-visitors-1.0.0.tgz", - "integrity": "sha512-+29eJLiUixTEDRaZ35Vu8jP3gPLNcQQkQkOQjLp2X+6cZGGPDD/uasbFzvLsJKnGZnvmyZ0srxudwOtskHeIDA==", "dev": true, "license": "MIT", "dependencies": { @@ -8494,8 +6708,6 @@ }, "node_modules/entities": { "version": "4.5.0", - "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", - "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==", "license": "BSD-2-Clause", "engines": { "node": ">=0.12" @@ -8506,8 +6718,6 @@ }, "node_modules/env-paths": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/env-paths/-/env-paths-2.2.1.tgz", - "integrity": "sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==", "license": "MIT", "engines": { "node": ">=6" @@ -8515,14 +6725,10 @@ }, "node_modules/err-code": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz", - "integrity": "sha512-2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA==", "license": "MIT" }, "node_modules/error-ex": { "version": "1.3.4", - "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.4.tgz", - "integrity": "sha512-sqQamAnR14VgCr1A618A3sGrygcpK+HEbenA/HiEAkkUwcZIIB/tgWqHFxWgOyDh4nB4JCRimh79dR5Ywc9MDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -8531,8 +6737,6 @@ }, "node_modules/es-abstract": { "version": "1.24.0", - "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.24.0.tgz", - "integrity": "sha512-WSzPgsdLtTcQwm4CROfS5ju2Wa1QQcVeT37jFjYzdFz1r9ahadC8B8/a4qxJxM+09F18iumCdRmlr96ZYkQvEg==", "dev": true, "license": "MIT", "dependencies": { @@ -8600,8 +6804,6 @@ }, "node_modules/es-define-property": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz", - "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -8609,8 +6811,6 @@ }, "node_modules/es-errors": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz", - "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -8618,8 +6818,6 @@ }, "node_modules/es-object-atoms": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz", - "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==", "license": "MIT", "dependencies": { "es-errors": "^1.3.0" @@ -8630,8 +6828,6 @@ }, "node_modules/es-set-tostringtag": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz", - "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==", "dev": true, "license": "MIT", "dependencies": { @@ -8646,8 +6842,6 @@ }, "node_modules/es-to-primitive": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz", - "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==", "dev": true, "license": "MIT", "dependencies": { @@ -8664,15 +6858,11 @@ }, "node_modules/es6-error": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/es6-error/-/es6-error-4.1.1.tgz", - "integrity": "sha512-Um/+FxMr9CISWh0bi5Zv0iOD+4cFh5qLeks1qhAopKVAJw3drgKbKySikp7wGhDL0HPeaja0P5ULZrxLkniUVg==", "dev": true, "license": "MIT" }, "node_modules/esbuild": { "version": "0.21.5", - "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.21.5.tgz", - "integrity": "sha512-mg3OPMV4hXywwpoDxu3Qda5xCKQi+vCTZq8S9J/EpkhB2HzKXq4SNFZE3+NK93JYxc8VMSep+lOUSC/RVKaBqw==", "hasInstallScript": true, "license": "MIT", "bin": { @@ -8709,8 +6899,6 @@ }, "node_modules/escalade": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz", - "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==", "license": "MIT", "engines": { "node": ">=6" @@ -8718,8 +6906,6 @@ }, "node_modules/escape-goat": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-goat/-/escape-goat-4.0.0.tgz", - "integrity": "sha512-2Sd4ShcWxbx6OY1IHyla/CVNwvg7XwZVoXZHcSu9w9SReNP1EzzD5T8NWKIR38fIqEns9kDWKUQTXXAmlDrdPg==", "license": "MIT", "engines": { "node": ">=12" @@ -8730,14 +6916,10 @@ }, "node_modules/escape-html": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz", - "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow==", "license": "MIT" }, "node_modules/escape-string-regexp": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-5.0.0.tgz", - "integrity": "sha512-/veY75JbMK4j1yjvuUxuVsiS/hr/4iHs9FTT6cgTexxdE0Ly/glccBAkloH/DofkjRbZU3bnoj38mOmhkZ0lHw==", "license": "MIT", "engines": { "node": ">=12" @@ -8748,8 +6930,6 @@ }, "node_modules/escape-unicode": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/escape-unicode/-/escape-unicode-0.3.0.tgz", - "integrity": "sha512-4Lr9Prysw8FBwpW8dURr4T3/VRU4RYlhayLgy34zavplBG9bUsTtaCuM7Lw3szWTuidQvkZ2a1qJxG3e5+o99w==", "funding": [ { "type": "individual", @@ -8764,8 +6944,6 @@ }, "node_modules/escope": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escope/-/escope-4.0.0.tgz", - "integrity": "sha512-E36qlD/r6RJHVpPKArgMoMlNJzoRJFH8z/cAZlI9lbc45zB3+S7i9k6e/MNb+7bZQzNEa6r8WKN3BovpeIBwgA==", "license": "BSD-2-Clause", "dependencies": { "esrecurse": "^4.1.0", @@ -8777,8 +6955,6 @@ }, "node_modules/eslint": { "version": "9.39.1", - "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.39.1.tgz", - "integrity": "sha512-BhHmn2yNOFA9H9JmmIVKJmd288g9hrVRDkdoIgRCRuSySRUHH7r/DI6aAXW9T1WwUuY3DFgrcaqB+deURBLR5g==", "dev": true, "license": "MIT", "dependencies": { @@ -8837,8 +7013,6 @@ }, "node_modules/eslint-config-google": { "version": "0.14.0", - "resolved": "https://registry.npmjs.org/eslint-config-google/-/eslint-config-google-0.14.0.tgz", - "integrity": "sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw==", "dev": true, "license": "Apache-2.0", "engines": { @@ -8850,8 +7024,6 @@ }, "node_modules/eslint-plugin-ava": { "version": "15.1.0", - "resolved": "https://registry.npmjs.org/eslint-plugin-ava/-/eslint-plugin-ava-15.1.0.tgz", - "integrity": "sha512-+6Zxk1uYW3mf7lxCLWIQsFYgn3hfuCMbsKc0MtqfloOz1F6fiV5/PaWEaLgkL1egrSQmnyR7vOFP1wSPJbVUbw==", "dev": true, "license": "MIT", "dependencies": { @@ -8873,8 +7045,6 @@ }, "node_modules/eslint-plugin-ava/node_modules/eslint-visitor-keys": { "version": "3.4.3", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.4.3.tgz", - "integrity": "sha512-wpc+LXeiyiisxPlEkUzU6svyS1frIO3Mgxj1fdy7Pm8Ygzguax2N3Fa/D/ag1WqbOprdI+uY6wMUl8/a2G+iag==", "dev": true, "license": "Apache-2.0", "engines": { @@ -8886,8 +7056,6 @@ }, "node_modules/eslint-plugin-ava/node_modules/espree": { "version": "9.6.1", - "resolved": "https://registry.npmjs.org/espree/-/espree-9.6.1.tgz", - "integrity": "sha512-oruZaFkjorTpF32kDSI5/75ViwGeZginGGy2NoOSg3Q9bnwlnmDm4HLnkl0RE3n+njDXR037aY1+x58Z/zFdwQ==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -8904,8 +7072,6 @@ }, "node_modules/eslint-plugin-jsdoc": { "version": "61.4.1", - "resolved": "https://registry.npmjs.org/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-61.4.1.tgz", - "integrity": "sha512-3c1QW/bV25sJ1MsIvsvW+EtLtN6yZMduw7LVQNVt72y2/5BbV5Pg5b//TE5T48LRUxoEQGaZJejCmcj3wCxBzw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -8933,8 +7099,6 @@ }, "node_modules/eslint-plugin-jsdoc/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -8951,8 +7115,6 @@ }, "node_modules/eslint-plugin-jsdoc/node_modules/escape-string-regexp": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, "license": "MIT", "engines": { @@ -8964,15 +7126,11 @@ }, "node_modules/eslint-plugin-jsdoc/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/eslint-scope": { "version": "8.4.0", - "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.4.0.tgz", - "integrity": "sha512-sNXOfKCn74rt8RICKMvJS7XKV/Xk9kA7DyJr8mJik3S7Cwgy3qlkkmyS2uQB3jiJg6VNdZd/pDBJu0nvG2NlTg==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -8988,8 +7146,6 @@ }, "node_modules/eslint-scope/node_modules/estraverse": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, "license": "BSD-2-Clause", "engines": { @@ -8998,8 +7154,6 @@ }, "node_modules/eslint-utils": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/eslint-utils/-/eslint-utils-3.0.0.tgz", - "integrity": "sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==", "dev": true, "license": "MIT", "dependencies": { @@ -9017,8 +7171,6 @@ }, "node_modules/eslint-utils/node_modules/eslint-visitor-keys": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz", - "integrity": "sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==", "dev": true, "license": "Apache-2.0", "engines": { @@ -9027,8 +7179,6 @@ }, "node_modules/eslint-visitor-keys": { "version": "4.2.1", - "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.1.tgz", - "integrity": "sha512-Uhdk5sfqcee/9H/rCOJikYz67o0a2Tw2hGRPOG2Y1R2dg7brRe1uG0yaNQDHu+TO/uQPF/5eCapvYSmHUjt7JQ==", "license": "Apache-2.0", "engines": { "node": "^18.18.0 || ^20.9.0 || >=21.1.0" @@ -9039,8 +7189,6 @@ }, "node_modules/eslint/node_modules/ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "license": "MIT", "dependencies": { @@ -9055,8 +7203,6 @@ }, "node_modules/eslint/node_modules/chalk": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", - "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", "dev": true, "license": "MIT", "dependencies": { @@ -9072,8 +7218,6 @@ }, "node_modules/eslint/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -9090,8 +7234,6 @@ }, "node_modules/eslint/node_modules/escape-string-regexp": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz", - "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==", "dev": true, "license": "MIT", "engines": { @@ -9103,8 +7245,6 @@ }, "node_modules/eslint/node_modules/find-up": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "license": "MIT", "dependencies": { @@ -9120,8 +7260,6 @@ }, "node_modules/eslint/node_modules/locate-path": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, "license": "MIT", "dependencies": { @@ -9136,8 +7274,6 @@ }, "node_modules/eslint/node_modules/minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "license": "ISC", "dependencies": { @@ -9149,15 +7285,11 @@ }, "node_modules/eslint/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/eslint/node_modules/p-limit": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "license": "MIT", "dependencies": { @@ -9172,8 +7304,6 @@ }, "node_modules/eslint/node_modules/p-locate": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, "license": "MIT", "dependencies": { @@ -9188,8 +7318,6 @@ }, "node_modules/eslint/node_modules/path-exists": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, "license": "MIT", "engines": { @@ -9198,8 +7326,6 @@ }, "node_modules/eslint/node_modules/yocto-queue": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, "license": "MIT", "engines": { @@ -9211,8 +7337,6 @@ }, "node_modules/esmock": { "version": "2.7.3", - "resolved": "https://registry.npmjs.org/esmock/-/esmock-2.7.3.tgz", - "integrity": "sha512-/M/YZOjgyLaVoY6K83pwCsGE1AJQnj4S4GyXLYgi/Y79KL8EeW6WU7Rmjc89UO7jv6ec8+j34rKeWOfiLeEu0A==", "dev": true, "license": "ISC", "engines": { @@ -9221,8 +7345,6 @@ }, "node_modules/espree": { "version": "10.4.0", - "resolved": "https://registry.npmjs.org/espree/-/espree-10.4.0.tgz", - "integrity": "sha512-j6PAQ2uUr79PZhBjP5C5fhl8e39FmRnOjsD5lGnWrFU8i2G776tBK7+nP8KuQUTTyAZUwfQqXAgrVH5MbH9CYQ==", "license": "BSD-2-Clause", "dependencies": { "acorn": "^8.15.0", @@ -9238,8 +7360,6 @@ }, "node_modules/esprima": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz", - "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==", "dev": true, "license": "BSD-2-Clause", "bin": { @@ -9252,15 +7372,11 @@ }, "node_modules/espurify": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/espurify/-/espurify-2.1.1.tgz", - "integrity": "sha512-zttWvnkhcDyGOhSH4vO2qCBILpdCMv/MX8lp4cqgRkQoDRGK2oZxi2GfWhlP2dIXmk7BaKeOTuzbHhyC68o8XQ==", "dev": true, "license": "MIT" }, "node_modules/esquery": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz", - "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -9272,8 +7388,6 @@ }, "node_modules/esquery/node_modules/estraverse": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "dev": true, "license": "BSD-2-Clause", "engines": { @@ -9282,8 +7396,6 @@ }, "node_modules/esrecurse": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz", - "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==", "license": "BSD-2-Clause", "dependencies": { "estraverse": "^5.2.0" @@ -9294,8 +7406,6 @@ }, "node_modules/esrecurse/node_modules/estraverse": { "version": "5.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz", - "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==", "license": "BSD-2-Clause", "engines": { "node": ">=4.0" @@ -9303,8 +7413,6 @@ }, "node_modules/estraverse": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz", - "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==", "license": "BSD-2-Clause", "engines": { "node": ">=4.0" @@ -9312,14 +7420,10 @@ }, "node_modules/estree-walker": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/estree-walker/-/estree-walker-2.0.2.tgz", - "integrity": "sha512-Rfkk/Mp/DL7JVje3u18FxFujQlTNR2q6QfMSMB7AvCBx91NGj/ba3kCfza0f6dVDbw7YlRf/nDrn7pQrCCyQ/w==", "license": "MIT" }, "node_modules/esutils": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz", - "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==", "dev": true, "license": "BSD-2-Clause", "engines": { @@ -9328,8 +7432,6 @@ }, "node_modules/etag": { "version": "1.8.1", - "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz", - "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -9337,8 +7439,6 @@ }, "node_modules/event-target-shim": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz", - "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==", "dev": true, "license": "MIT", "engines": { @@ -9347,8 +7447,6 @@ }, "node_modules/events": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz", - "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==", "dev": true, "license": "MIT", "engines": { @@ -9357,8 +7455,6 @@ }, "node_modules/execa": { "version": "9.6.0", - "resolved": "https://registry.npmjs.org/execa/-/execa-9.6.0.tgz", - "integrity": "sha512-jpWzZ1ZhwUmeWRhS7Qv3mhpOhLfwI+uAX4e5fOcXqwMR7EcJ0pj2kV1CVzHVMX/LphnKWD3LObjZCoJ71lKpHw==", "dev": true, "license": "MIT", "dependencies": { @@ -9384,8 +7480,6 @@ }, "node_modules/expand-tilde": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz", - "integrity": "sha512-A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw==", "dev": true, "license": "MIT", "dependencies": { @@ -9397,14 +7491,10 @@ }, "node_modules/exponential-backoff": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.3.tgz", - "integrity": "sha512-ZgEeZXj30q+I0EN+CbSSpIyPaJ5HVQD18Z1m+u1FXbAeT94mr1zw50q4q6jiiC447Nl/YTcIYSAftiGqetwXCA==", "license": "Apache-2.0" }, "node_modules/express": { "version": "4.22.1", - "resolved": "https://registry.npmjs.org/express/-/express-4.22.1.tgz", - "integrity": "sha512-F2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+bZczqq7hVKxTR4NWnu+g==", "license": "MIT", "dependencies": { "accepts": "~1.3.8", @@ -9447,23 +7537,30 @@ "url": "https://opencollective.com/express" } }, + "node_modules/express/node_modules/qs": { + "version": "6.14.0", + "license": "BSD-3-Clause", + "dependencies": { + "side-channel": "^1.1.0" + }, + "engines": { + "node": ">=0.6" + }, + "funding": { + "url": "https://github.com/sponsors/ljharb" + } + }, "node_modules/fast-deep-equal": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz", - "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==", "license": "MIT" }, "node_modules/fast-diff": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/fast-diff/-/fast-diff-1.3.0.tgz", - "integrity": "sha512-VxPP4NqbUjj6MaAOafWeUn2cXWLcCtljklUtZf0Ind4XQ+QPtmA0b18zZy0jIQx+ExRVCR/ZQpBmik5lXshNsw==", "dev": true, "license": "Apache-2.0" }, "node_modules/fast-glob": { "version": "3.3.3", - "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz", - "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==", "license": "MIT", "dependencies": { "@nodelib/fs.stat": "^2.0.2", @@ -9478,8 +7575,6 @@ }, "node_modules/fast-glob/node_modules/glob-parent": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz", - "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==", "license": "ISC", "dependencies": { "is-glob": "^4.0.1" @@ -9490,28 +7585,20 @@ }, "node_modules/fast-json-stable-stringify": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz", - "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==", "license": "MIT" }, "node_modules/fast-levenshtein": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz", - "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==", "dev": true, "license": "MIT" }, "node_modules/fast-safe-stringify": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz", - "integrity": "sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA==", "dev": true, "license": "MIT" }, "node_modules/fast-uri": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.1.0.tgz", - "integrity": "sha512-iPeeDKJSWf4IEOasVVrknXpaBV0IApz/gp7S2bb7Z4Lljbl2MGJRqInZiUrQwV16cpzw/D3S5j5Julj/gT52AA==", "dev": true, "funding": [ { @@ -9527,8 +7614,6 @@ }, "node_modules/fastq": { "version": "1.19.1", - "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.1.tgz", - "integrity": "sha512-GwLTyxkCXjXbxqIhTsMI2Nui8huMPtnxg7krajPJAjnEG/iiOS7i+zCtWGZR9G0NBKbXKh6X9m9UIsYX/N6vvQ==", "license": "ISC", "dependencies": { "reusify": "^1.0.4" @@ -9536,8 +7621,6 @@ }, "node_modules/fdir": { "version": "6.5.0", - "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.5.0.tgz", - "integrity": "sha512-tIbYtZbucOs0BRGqPJkshJUYdL+SDH7dVM8gjy+ERp3WAUjLEFJE+02kanyHtwjWOnwrKYBiwAmM0p4kLJAnXg==", "license": "MIT", "engines": { "node": ">=12.0.0" @@ -9553,8 +7636,6 @@ }, "node_modules/figures": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/figures/-/figures-6.1.0.tgz", - "integrity": "sha512-d+l3qxjSesT4V7v2fh+QnmFnUWv9lSpjarhShNTgBOfA0ttejbQUAlHLitbjkoRiDulW0OPoQPYIGhIC8ohejg==", "license": "MIT", "dependencies": { "is-unicode-supported": "^2.0.0" @@ -9568,8 +7649,6 @@ }, "node_modules/file-entry-cache": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz", - "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==", "dev": true, "license": "MIT", "dependencies": { @@ -9581,8 +7660,6 @@ }, "node_modules/file-type": { "version": "18.7.0", - "resolved": "https://registry.npmjs.org/file-type/-/file-type-18.7.0.tgz", - "integrity": "sha512-ihHtXRzXEziMrQ56VSgU7wkxh55iNchFkosu7Y9/S+tXHdKyrGjVK0ujbqNnsxzea+78MaLhN6PGmfYSAv1ACw==", "dev": true, "license": "MIT", "dependencies": { @@ -9599,15 +7676,11 @@ }, "node_modules/file-uri-to-path": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz", - "integrity": "sha512-0Zt+s3L7Vf1biwWZ29aARiVYLx7iMGnEUl9x33fbB/j3jR81u/O2LbqK+Bm1CDSNDKVtJ/YjwY7TUd5SkeLQLw==", "dev": true, "license": "MIT" }, "node_modules/fill-range": { "version": "7.1.1", - "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz", - "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==", "license": "MIT", "dependencies": { "to-regex-range": "^5.0.1" @@ -9618,8 +7691,6 @@ }, "node_modules/finalhandler": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz", - "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==", "license": "MIT", "dependencies": { "debug": "2.6.9", @@ -9636,8 +7707,6 @@ }, "node_modules/find-cache-dir": { "version": "3.3.2", - "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz", - "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==", "dev": true, "license": "MIT", "dependencies": { @@ -9654,8 +7723,6 @@ }, "node_modules/find-cache-dir/node_modules/find-up": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "license": "MIT", "dependencies": { @@ -9668,8 +7735,6 @@ }, "node_modules/find-cache-dir/node_modules/locate-path": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "license": "MIT", "dependencies": { @@ -9681,8 +7746,6 @@ }, "node_modules/find-cache-dir/node_modules/make-dir": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "license": "MIT", "dependencies": { @@ -9697,8 +7760,6 @@ }, "node_modules/find-cache-dir/node_modules/p-limit": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "license": "MIT", "dependencies": { @@ -9713,8 +7774,6 @@ }, "node_modules/find-cache-dir/node_modules/p-locate": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "license": "MIT", "dependencies": { @@ -9726,8 +7785,6 @@ }, "node_modules/find-cache-dir/node_modules/path-exists": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, "license": "MIT", "engines": { @@ -9736,8 +7793,6 @@ }, "node_modules/find-cache-dir/node_modules/pkg-dir": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "dev": true, "license": "MIT", "dependencies": { @@ -9749,8 +7804,6 @@ }, "node_modules/find-cache-dir/node_modules/semver": { "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "license": "ISC", "bin": { @@ -9759,8 +7812,6 @@ }, "node_modules/find-replace": { "version": "5.0.2", - "resolved": "https://registry.npmjs.org/find-replace/-/find-replace-5.0.2.tgz", - "integrity": "sha512-Y45BAiE3mz2QsrN2fb5QEtO4qb44NcS7en/0y9PEVsg351HsLeVclP8QPMH79Le9sH3rs5RSwJu99W0WPZO43Q==", "dev": true, "license": "MIT", "engines": { @@ -9777,8 +7828,6 @@ }, "node_modules/find-up": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-7.0.0.tgz", - "integrity": "sha512-YyZM99iHrqLKjmt4LJDj58KI+fYyufRLBSYcqycxf//KpBk9FoewoGX0450m9nB44qrZnovzC2oeP5hUibxc/g==", "dev": true, "license": "MIT", "dependencies": { @@ -9795,8 +7844,6 @@ }, "node_modules/find-up-simple": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/find-up-simple/-/find-up-simple-1.0.1.tgz", - "integrity": "sha512-afd4O7zpqHeRyg4PfDQsXmlDe2PfdHtJt6Akt8jOWaApLOZk5JXs6VMR29lz03pRe9mpykrRCYIYxaJYcfpncQ==", "license": "MIT", "engines": { "node": ">=18" @@ -9807,8 +7854,6 @@ }, "node_modules/findup-sync": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/findup-sync/-/findup-sync-5.0.0.tgz", - "integrity": "sha512-MzwXju70AuyflbgeOhzvQWAvvQdo1XL0A9bVvlXsYcFEBM87WR4OakL4OfZq+QRmr+duJubio+UtNQCPsVESzQ==", "dev": true, "license": "MIT", "dependencies": { @@ -9823,8 +7868,6 @@ }, "node_modules/flat-cache": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz", - "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==", "dev": true, "license": "MIT", "dependencies": { @@ -9837,15 +7880,11 @@ }, "node_modules/flatted": { "version": "3.3.3", - "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz", - "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==", "dev": true, "license": "ISC" }, "node_modules/focus-trap": { "version": "7.6.6", - "resolved": "https://registry.npmjs.org/focus-trap/-/focus-trap-7.6.6.tgz", - "integrity": "sha512-v/Z8bvMCajtx4mEXmOo7QEsIzlIOqRXTIwgUfsFOF9gEsespdbD0AkPIka1bSXZ8Y8oZ+2IVDQZePkTfEHZl7Q==", "license": "MIT", "dependencies": { "tabbable": "^6.3.0" @@ -9853,8 +7892,6 @@ }, "node_modules/for-each": { "version": "0.3.5", - "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz", - "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==", "dev": true, "license": "MIT", "dependencies": { @@ -9869,8 +7906,6 @@ }, "node_modules/foreground-child": { "version": "3.3.1", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.1.tgz", - "integrity": "sha512-gIXjKqtFuWEgzFRJA9WCQeSJLZDjgJUOMCMzxtvFq/37KojM1BFGufqsCy0r4qSQmYLsZYMeyRqzIWOMup03sw==", "license": "ISC", "dependencies": { "cross-spawn": "^7.0.6", @@ -9885,8 +7920,6 @@ }, "node_modules/form-data": { "version": "4.0.5", - "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.5.tgz", - "integrity": "sha512-8RipRLol37bNs2bhoV67fiTEvdTrbMUYcFTiy3+wuuOnUog2QBHCZWXDRijWQfAkhBj2Uf5UnVaiWwA5vdd82w==", "dev": true, "license": "MIT", "dependencies": { @@ -9902,8 +7935,6 @@ }, "node_modules/formidable": { "version": "3.5.4", - "resolved": "https://registry.npmjs.org/formidable/-/formidable-3.5.4.tgz", - "integrity": "sha512-YikH+7CUTOtP44ZTnUhR7Ic2UASBPOqmaRkRKxRbywPTe5VxF7RRCck4af9wutiZ/QKM5nME9Bie2fFaPz5Gug==", "dev": true, "license": "MIT", "dependencies": { @@ -9920,8 +7951,6 @@ }, "node_modules/forwarded": { "version": "0.2.0", - "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz", - "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -9929,8 +7958,6 @@ }, "node_modules/fraction.js": { "version": "5.3.4", - "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-5.3.4.tgz", - "integrity": "sha512-1X1NTtiJphryn/uLQz3whtY6jK3fTqoE3ohKs0tT+Ujr1W59oopxmoEh7Lu5p6vBaPbgoM0bzveAW4Qi5RyWDQ==", "license": "MIT", "engines": { "node": "*" @@ -9942,8 +7969,6 @@ }, "node_modules/fresh": { "version": "0.5.2", - "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz", - "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -9951,8 +7976,6 @@ }, "node_modules/fromentries": { "version": "1.3.2", - "resolved": "https://registry.npmjs.org/fromentries/-/fromentries-1.3.2.tgz", - "integrity": "sha512-cHEpEQHUg0f8XdtZCc2ZAhrHzKzT0MrFUTcvx+hfxYu7rGMDc5SKoXFh+n4YigxsHXRzc6OrCshdR1bWH6HHyg==", "dev": true, "funding": [ { @@ -9972,8 +7995,6 @@ }, "node_modules/fs-minipass": { "version": "3.0.3", - "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz", - "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==", "license": "ISC", "dependencies": { "minipass": "^7.0.3" @@ -9984,16 +8005,11 @@ }, "node_modules/fs.realpath": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz", - "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==", "dev": true, "license": "ISC" }, "node_modules/fsevents": { "version": "2.3.3", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz", - "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==", - "hasInstallScript": true, "license": "MIT", "optional": true, "os": [ @@ -10005,8 +8021,6 @@ }, "node_modules/function-bind": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz", - "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -10014,8 +8028,6 @@ }, "node_modules/function.prototype.name": { "version": "1.1.8", - "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz", - "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==", "dev": true, "license": "MIT", "dependencies": { @@ -10035,8 +8047,6 @@ }, "node_modules/functions-have-names": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz", - "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==", "dev": true, "license": "MIT", "funding": { @@ -10045,8 +8055,6 @@ }, "node_modules/generator-function": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/generator-function/-/generator-function-2.0.1.tgz", - "integrity": "sha512-SFdFmIJi+ybC0vjlHN0ZGVGHc3lgE0DxPAT0djjVg+kjOnSqclqmj0KQ7ykTOLP6YxoqOvuAODGdcHJn+43q3g==", "dev": true, "license": "MIT", "engines": { @@ -10055,8 +8063,6 @@ }, "node_modules/gensync": { "version": "1.0.0-beta.2", - "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz", - "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==", "dev": true, "license": "MIT", "engines": { @@ -10065,8 +8071,6 @@ }, "node_modules/get-caller-file": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz", - "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==", "license": "ISC", "engines": { "node": "6.* || 8.* || >= 10.*" @@ -10074,8 +8078,6 @@ }, "node_modules/get-east-asian-width": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/get-east-asian-width/-/get-east-asian-width-1.4.0.tgz", - "integrity": "sha512-QZjmEOC+IT1uk6Rx0sX22V6uHWVwbdbxf1faPqJ1QhLdGgsRGCZoyaQBm/piRdJy/D2um6hM1UP7ZEeQ4EkP+Q==", "license": "MIT", "engines": { "node": ">=18" @@ -10086,8 +8088,6 @@ }, "node_modules/get-intrinsic": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz", - "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==", "license": "MIT", "dependencies": { "call-bind-apply-helpers": "^1.0.2", @@ -10110,8 +8110,6 @@ }, "node_modules/get-package-type": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz", - "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==", "dev": true, "license": "MIT", "engines": { @@ -10120,8 +8118,6 @@ }, "node_modules/get-port": { "version": "6.1.2", - "resolved": "https://registry.npmjs.org/get-port/-/get-port-6.1.2.tgz", - "integrity": "sha512-BrGGraKm2uPqurfGVj/z97/zv8dPleC6x9JBNRTrDNtCkkRF4rPwrQXFgL7+I+q8QSdU4ntLQX2D7KIxSy8nGw==", "license": "MIT", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" @@ -10132,8 +8128,6 @@ }, "node_modules/get-proto": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz", - "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==", "license": "MIT", "dependencies": { "dunder-proto": "^1.0.1", @@ -10145,8 +8139,6 @@ }, "node_modules/get-stdin": { "version": "9.0.0", - "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-9.0.0.tgz", - "integrity": "sha512-dVKBjfWisLAicarI2Sf+JuBE/DghV4UzNAVe9yhEJuzeREd3JhOTE9cUaJTeSa77fsbQUK3pcOpJfM59+VKZaA==", "dev": true, "license": "MIT", "engines": { @@ -10158,8 +8150,6 @@ }, "node_modules/get-stream": { "version": "9.0.1", - "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-9.0.1.tgz", - "integrity": "sha512-kVCxPF3vQM/N0B1PmoqVUqgHP+EeVjmZSQn+1oCRPxd2P21P2F19lIgbR3HBosbB1PUhOAoctJnfEn2GbN2eZA==", "dev": true, "license": "MIT", "dependencies": { @@ -10175,8 +8165,6 @@ }, "node_modules/get-symbol-description": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz", - "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==", "dev": true, "license": "MIT", "dependencies": { @@ -10193,8 +8181,6 @@ }, "node_modules/git-raw-commits": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/git-raw-commits/-/git-raw-commits-4.0.0.tgz", - "integrity": "sha512-ICsMM1Wk8xSGMowkOmPrzo2Fgmfo4bMHLNX6ytHjajRJUqvHOw/TFapQ+QG75c3X/tTDDhOSRPGC52dDbNM8FQ==", "dev": true, "license": "MIT", "dependencies": { @@ -10211,8 +8197,6 @@ }, "node_modules/glob": { "version": "13.0.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-13.0.0.tgz", - "integrity": "sha512-tvZgpqk6fz4BaNZ66ZsRaZnbHvP/jG3uKJvAZOwEVUL4RTA5nJeeLYfyN9/VA8NX/V3IBG+hkeuGpKjvELkVhA==", "license": "BlueOak-1.0.0", "dependencies": { "minimatch": "^10.1.1", @@ -10228,8 +8212,6 @@ }, "node_modules/glob-parent": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz", - "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==", "license": "ISC", "dependencies": { "is-glob": "^4.0.3" @@ -10240,8 +8222,6 @@ }, "node_modules/global-directory": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/global-directory/-/global-directory-4.0.1.tgz", - "integrity": "sha512-wHTUcDUoZ1H5/0iVqEudYW4/kAlN5cZ3j/bXn0Dpbizl9iaUVeWSHqiOjsgk6OW2bkLclbBjzewBz6weQ1zA2Q==", "license": "MIT", "dependencies": { "ini": "4.1.1" @@ -10255,8 +8235,6 @@ }, "node_modules/global-directory/node_modules/ini": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/ini/-/ini-4.1.1.tgz", - "integrity": "sha512-QQnnxNyfvmHFIsj7gkPcYymR8Jdw/o7mp5ZFihxn6h8Ci6fh3Dx4E1gPjpQEpIuPo9XVNY/ZUwh4BPMjGyL01g==", "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -10264,8 +8242,6 @@ }, "node_modules/global-modules": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/global-modules/-/global-modules-1.0.0.tgz", - "integrity": "sha512-sKzpEkf11GpOFuw0Zzjzmt4B4UZwjOcG757PPvrfhxcLFbq0wpsgpOqxpxtxFiCG4DtG93M6XRVbF2oGdev7bg==", "dev": true, "license": "MIT", "dependencies": { @@ -10279,8 +8255,6 @@ }, "node_modules/global-prefix": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz", - "integrity": "sha512-5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg==", "dev": true, "license": "MIT", "dependencies": { @@ -10296,22 +8270,16 @@ }, "node_modules/global-prefix/node_modules/ini": { "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "dev": true, "license": "ISC" }, "node_modules/global-prefix/node_modules/isexe": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true, "license": "ISC" }, "node_modules/global-prefix/node_modules/which": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz", - "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==", "dev": true, "license": "ISC", "dependencies": { @@ -10323,8 +8291,6 @@ }, "node_modules/globals": { "version": "16.5.0", - "resolved": "https://registry.npmjs.org/globals/-/globals-16.5.0.tgz", - "integrity": "sha512-c/c15i26VrJ4IRt5Z89DnIzCGDn9EcebibhAOjw5ibqEHsE1wLUgkPn9RDmNcUKyU87GeaL633nyJ+pplFR2ZQ==", "dev": true, "license": "MIT", "engines": { @@ -10336,8 +8302,6 @@ }, "node_modules/globalthis": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz", - "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -10353,8 +8317,6 @@ }, "node_modules/globby": { "version": "14.1.0", - "resolved": "https://registry.npmjs.org/globby/-/globby-14.1.0.tgz", - "integrity": "sha512-0Ia46fDOaT7k4og1PDW4YbodWWr3scS2vAr2lTbsplOt2WkKp0vQbkI9wKis/T5LV/dqPjO3bpS/z6GTJB82LA==", "license": "MIT", "dependencies": { "@sindresorhus/merge-streams": "^2.1.0", @@ -10373,8 +8335,6 @@ }, "node_modules/globby/node_modules/@sindresorhus/merge-streams": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/@sindresorhus/merge-streams/-/merge-streams-2.3.0.tgz", - "integrity": "sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==", "license": "MIT", "engines": { "node": ">=18" @@ -10385,8 +8345,6 @@ }, "node_modules/globby/node_modules/ignore": { "version": "7.0.5", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-7.0.5.tgz", - "integrity": "sha512-Hs59xBNfUIunMFgWAbGX5cq6893IbWg4KnrjbYwX3tx0ztorVgTDA6B2sxf8ejHJ4wz8BqGUMYlnzNBer5NvGg==", "license": "MIT", "engines": { "node": ">= 4" @@ -10394,8 +8352,6 @@ }, "node_modules/globby/node_modules/unicorn-magic": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz", - "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==", "license": "MIT", "engines": { "node": ">=18" @@ -10406,8 +8362,6 @@ }, "node_modules/gopd": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz", - "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -10418,20 +8372,14 @@ }, "node_modules/graceful-fs": { "version": "4.2.11", - "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz", - "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ==", "license": "ISC" }, "node_modules/handle-thing": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz", - "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==", "license": "MIT" }, "node_modules/handlebars": { "version": "4.7.8", - "resolved": "https://registry.npmjs.org/handlebars/-/handlebars-4.7.8.tgz", - "integrity": "sha512-vafaFqs8MZkRrSX7sFVUdo3ap/eNiLnb4IakshzvP56X5Nr1iGKAIqdX6tMlm6HcNRIkr6AxO5jFEoJzzpT8aQ==", "dev": true, "license": "MIT", "dependencies": { @@ -10452,8 +8400,6 @@ }, "node_modules/has-bigints": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz", - "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==", "dev": true, "license": "MIT", "engines": { @@ -10465,8 +8411,6 @@ }, "node_modules/has-flag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", - "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", "dev": true, "license": "MIT", "engines": { @@ -10475,8 +8419,6 @@ }, "node_modules/has-property-descriptors": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz", - "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==", "dev": true, "license": "MIT", "dependencies": { @@ -10488,8 +8430,6 @@ }, "node_modules/has-proto": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz", - "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==", "dev": true, "license": "MIT", "dependencies": { @@ -10504,8 +8444,6 @@ }, "node_modules/has-symbols": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz", - "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -10516,8 +8454,6 @@ }, "node_modules/has-tostringtag": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz", - "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==", "dev": true, "license": "MIT", "dependencies": { @@ -10532,8 +8468,6 @@ }, "node_modules/hasha": { "version": "5.2.2", - "resolved": "https://registry.npmjs.org/hasha/-/hasha-5.2.2.tgz", - "integrity": "sha512-Hrp5vIK/xr5SkeN2onO32H0MgNZ0f17HRNH39WfL0SYUNOTZ5Lz1TJ8Pajo/87dYGEFlLMm7mIc/k/s6Bvz9HQ==", "dev": true, "license": "MIT", "dependencies": { @@ -10549,8 +8483,6 @@ }, "node_modules/hasha/node_modules/is-stream": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz", - "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==", "dev": true, "license": "MIT", "engines": { @@ -10562,8 +8494,6 @@ }, "node_modules/hasown": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz", - "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==", "license": "MIT", "dependencies": { "function-bind": "^1.1.2" @@ -10574,8 +8504,6 @@ }, "node_modules/hast-util-to-html": { "version": "9.0.5", - "resolved": "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-9.0.5.tgz", - "integrity": "sha512-OguPdidb+fbHQSU4Q4ZiLKnzWo8Wwsf5bZfbvu7//a9oTYoqD/fWpe96NuHkoS9h0ccGOTe0C4NGXdtS0iObOw==", "license": "MIT", "dependencies": { "@types/hast": "^3.0.0", @@ -10597,8 +8525,6 @@ }, "node_modules/hast-util-whitespace": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/hast-util-whitespace/-/hast-util-whitespace-3.0.0.tgz", - "integrity": "sha512-88JUN06ipLwsnv+dVn+OIYOvAuvBMy/Qoi6O7mQHxdPXpjy+Cd6xRkWwux7DKO+4sYILtLBRIKgsdpS2gQc7qw==", "license": "MIT", "dependencies": { "@types/hast": "^3.0.0" @@ -10610,8 +8536,6 @@ }, "node_modules/homedir-polyfill": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/homedir-polyfill/-/homedir-polyfill-1.0.3.tgz", - "integrity": "sha512-eSmmWE5bZTK2Nou4g0AI3zZ9rswp7GRKoKXS1BLUkvPviOqs4YTN1djQIqrXy9k5gEtdLPy86JjRwsNM9tnDcA==", "dev": true, "license": "MIT", "dependencies": { @@ -10623,14 +8547,10 @@ }, "node_modules/hookable": { "version": "5.5.3", - "resolved": "https://registry.npmjs.org/hookable/-/hookable-5.5.3.tgz", - "integrity": "sha512-Yc+BQe8SvoXH1643Qez1zqLRmbA5rCL+sSmk6TVos0LWVfNIB7PGncdlId77WzLGSIB5KaWgTaNTs2lNVEI6VQ==", "license": "MIT" }, "node_modules/hosted-git-info": { "version": "9.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-9.0.2.tgz", - "integrity": "sha512-M422h7o/BR3rmCQ8UHi7cyyMqKltdP9Uo+J2fXK+RSAY+wTcKOIRyhTuKv4qn+DJf3g+PL890AzId5KZpX+CBg==", "license": "ISC", "dependencies": { "lru-cache": "^11.1.0" @@ -10641,8 +8561,6 @@ }, "node_modules/hpack.js": { "version": "2.1.6", - "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz", - "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==", "license": "MIT", "dependencies": { "inherits": "^2.0.1", @@ -10653,8 +8571,6 @@ }, "node_modules/hpack.js/node_modules/readable-stream": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", @@ -10668,14 +8584,10 @@ }, "node_modules/hpack.js/node_modules/safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "license": "MIT" }, "node_modules/hpack.js/node_modules/string_decoder": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" @@ -10683,8 +8595,6 @@ }, "node_modules/html-entities": { "version": "2.6.0", - "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz", - "integrity": "sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==", "dev": true, "funding": [ { @@ -10700,15 +8610,11 @@ }, "node_modules/html-escaper": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz", - "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg==", "dev": true, "license": "MIT" }, "node_modules/html-void-elements": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/html-void-elements/-/html-void-elements-3.0.0.tgz", - "integrity": "sha512-bEqo66MRXsUGxWHV5IP0PUiAWwoEjba4VCzg0LjFJBpchPaTfyfCKTG6bc5F8ucKec3q5y6qOdGyYTSBEvhCrg==", "license": "MIT", "funding": { "type": "github", @@ -10717,8 +8623,6 @@ }, "node_modules/htmlparser2": { "version": "9.1.0", - "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-9.1.0.tgz", - "integrity": "sha512-5zfg6mHUoaer/97TxnGpxmbR7zJtPwIYFMZ/H5ucTlPZhKvtum05yiPK3Mgai3a0DyVxv7qYqoweaEd2nrYQzQ==", "funding": [ "https://github.com/fb55/htmlparser2?sponsor=1", { @@ -10736,8 +8640,6 @@ }, "node_modules/http-assert": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/http-assert/-/http-assert-1.5.0.tgz", - "integrity": "sha512-uPpH7OKX4H25hBmU6G1jWNaqJGpTXxey+YOUizJUAgu0AjLUeC8D73hTrhvDS5D+GJN1DN1+hhc/eF/wpxtp0w==", "dev": true, "license": "MIT", "dependencies": { @@ -10750,8 +8652,6 @@ }, "node_modules/http-assert/node_modules/depd": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", "dev": true, "license": "MIT", "engines": { @@ -10760,8 +8660,6 @@ }, "node_modules/http-assert/node_modules/http-errors": { "version": "1.8.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", - "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", "dev": true, "license": "MIT", "dependencies": { @@ -10777,8 +8675,6 @@ }, "node_modules/http-assert/node_modules/statuses": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", "dev": true, "license": "MIT", "engines": { @@ -10787,20 +8683,14 @@ }, "node_modules/http-cache-semantics": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.2.0.tgz", - "integrity": "sha512-dTxcvPXqPvXBQpq5dUr6mEMJX4oIEFv6bwom3FDwKRDsuIjjJGANqhBuoAn9c1RQJIdAKav33ED65E2ys+87QQ==", "license": "BSD-2-Clause" }, "node_modules/http-deceiver": { "version": "1.2.7", - "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz", - "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw==", "license": "MIT" }, "node_modules/http-errors": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz", - "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==", "license": "MIT", "dependencies": { "depd": "2.0.0", @@ -10815,8 +8705,6 @@ }, "node_modules/http-proxy-agent": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz", - "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==", "dev": true, "license": "MIT", "dependencies": { @@ -10830,8 +8718,6 @@ }, "node_modules/http-proxy-agent/node_modules/agent-base": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "dev": true, "license": "MIT", "dependencies": { @@ -10843,8 +8729,6 @@ }, "node_modules/http-proxy-agent/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -10861,15 +8745,11 @@ }, "node_modules/http-proxy-agent/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/https-proxy-agent": { "version": "7.0.6", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", - "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", "license": "MIT", "dependencies": { "agent-base": "^7.1.2", @@ -10881,8 +8761,6 @@ }, "node_modules/https-proxy-agent/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -10898,14 +8776,10 @@ }, "node_modules/https-proxy-agent/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, "node_modules/human-signals": { "version": "8.0.1", - "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-8.0.1.tgz", - "integrity": "sha512-eKCa6bwnJhvxj14kZk5NCPc6Hb6BdsU9DZcOnmQKSnO1VKrfV0zCvtttPZUsBvjmNDn8rpcJfpwSYnHBjc95MQ==", "dev": true, "license": "Apache-2.0", "engines": { @@ -10914,8 +8788,6 @@ }, "node_modules/husky": { "version": "9.1.7", - "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz", - "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==", "dev": true, "license": "MIT", "bin": { @@ -10930,8 +8802,6 @@ }, "node_modules/iconv-lite": { "version": "0.4.24", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz", - "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==", "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3" @@ -10942,8 +8812,6 @@ }, "node_modules/ieee754": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz", - "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==", "dev": true, "funding": [ { @@ -10963,8 +8831,6 @@ }, "node_modules/ignore": { "version": "5.3.2", - "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz", - "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==", "dev": true, "license": "MIT", "engines": { @@ -10973,8 +8839,6 @@ }, "node_modules/ignore-by-default": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/ignore-by-default/-/ignore-by-default-2.1.0.tgz", - "integrity": "sha512-yiWd4GVmJp0Q6ghmM2B/V3oZGRmjrKLXvHR3TE1nfoXsmoggllfZUQe74EN0fJdPFZu2NIvNdrMMLm3OsV7Ohw==", "dev": true, "license": "ISC", "engines": { @@ -10983,8 +8847,6 @@ }, "node_modules/ignore-walk": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/ignore-walk/-/ignore-walk-8.0.0.tgz", - "integrity": "sha512-FCeMZT4NiRQGh+YkeKMtWrOmBgWjHjMJ26WQWrRQyoyzqevdaGSakUaJW5xQYmjLlUVk2qUnCjYVBax9EKKg8A==", "license": "ISC", "dependencies": { "minimatch": "^10.0.3" @@ -10995,8 +8857,6 @@ }, "node_modules/import-fresh": { "version": "3.3.1", - "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-3.3.1.tgz", - "integrity": "sha512-TR3KfrTZTYLPB6jUjfx6MF9WcWrHL9su5TObK4ZkYgBdWKPOFoSoQIdEuTuR82pmtxH2spWG9h6etwfr1pLBqQ==", "dev": true, "license": "MIT", "dependencies": { @@ -11012,8 +8872,6 @@ }, "node_modules/import-fresh/node_modules/resolve-from": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz", - "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==", "dev": true, "license": "MIT", "engines": { @@ -11022,8 +8880,6 @@ }, "node_modules/import-local": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz", - "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==", "license": "MIT", "dependencies": { "pkg-dir": "^4.2.0", @@ -11041,8 +8897,6 @@ }, "node_modules/import-local/node_modules/find-up": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "license": "MIT", "dependencies": { "locate-path": "^5.0.0", @@ -11054,8 +8908,6 @@ }, "node_modules/import-local/node_modules/locate-path": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "license": "MIT", "dependencies": { "p-locate": "^4.1.0" @@ -11066,8 +8918,6 @@ }, "node_modules/import-local/node_modules/p-limit": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "license": "MIT", "dependencies": { "p-try": "^2.0.0" @@ -11081,8 +8931,6 @@ }, "node_modules/import-local/node_modules/p-locate": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "license": "MIT", "dependencies": { "p-limit": "^2.2.0" @@ -11093,8 +8941,6 @@ }, "node_modules/import-local/node_modules/path-exists": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "license": "MIT", "engines": { "node": ">=8" @@ -11102,8 +8948,6 @@ }, "node_modules/import-local/node_modules/pkg-dir": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz", - "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==", "license": "MIT", "dependencies": { "find-up": "^4.0.0" @@ -11114,8 +8958,6 @@ }, "node_modules/import-meta-resolve": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/import-meta-resolve/-/import-meta-resolve-4.2.0.tgz", - "integrity": "sha512-Iqv2fzaTQN28s/FwZAoFq0ZSs/7hMAHJVX+w8PZl3cY19Pxk6jFFalxQoIfW2826i/fDLXv8IiEZRIT0lDuWcg==", "dev": true, "license": "MIT", "funding": { @@ -11125,8 +8967,6 @@ }, "node_modules/import-modules": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/import-modules/-/import-modules-2.1.0.tgz", - "integrity": "sha512-8HEWcnkbGpovH9yInoisxaSoIg9Brbul+Ju3Kqe2UsYDUBJD/iQjSgEj0zPcTDPKfPp2fs5xlv1i+JSye/m1/A==", "dev": true, "license": "MIT", "engines": { @@ -11138,8 +8978,6 @@ }, "node_modules/imurmurhash": { "version": "0.1.4", - "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz", - "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==", "license": "MIT", "engines": { "node": ">=0.8.19" @@ -11147,8 +8985,6 @@ }, "node_modules/indent-string": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-5.0.0.tgz", - "integrity": "sha512-m6FAo/spmsW2Ab2fU35JTYwtOKa2yAwXSwgjSv1TJzh4Mh7mC3lzAOVLBprb72XsTrgkEIsl7YrFNAiDiRhIGg==", "dev": true, "license": "MIT", "engines": { @@ -11160,8 +8996,6 @@ }, "node_modules/index-to-position": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/index-to-position/-/index-to-position-1.2.0.tgz", - "integrity": "sha512-Yg7+ztRkqslMAS2iFaU+Oa4KTSidr63OsFGlOrJoW981kIYO3CGCS3wA95P1mUi/IVSJkn0D479KTJpVpvFNuw==", "license": "MIT", "engines": { "node": ">=18" @@ -11172,8 +9006,6 @@ }, "node_modules/inflation": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/inflation/-/inflation-2.1.0.tgz", - "integrity": "sha512-t54PPJHG1Pp7VQvxyVCJ9mBbjG3Hqryges9bXoOO6GExCPa+//i/d5GSuFtpx3ALLd7lgIAur6zrIlBQyJuMlQ==", "dev": true, "license": "MIT", "engines": { @@ -11182,9 +9014,6 @@ }, "node_modules/inflight": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", - "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==", - "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.", "dev": true, "license": "ISC", "dependencies": { @@ -11194,14 +9023,10 @@ }, "node_modules/inherits": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", "license": "ISC" }, "node_modules/ini": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/ini/-/ini-5.0.0.tgz", - "integrity": "sha512-+N0ngpO3e7cRUWOJAS7qw0IZIVc6XPrW4MlFBdD066F2L4k1L6ker3hLqSq7iXxU5tgS4WGkIUElWn5vogAEnw==", "license": "ISC", "engines": { "node": "^18.17.0 || >=20.5.0" @@ -11209,8 +9034,6 @@ }, "node_modules/internal-slot": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz", - "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==", "dev": true, "license": "MIT", "dependencies": { @@ -11224,8 +9047,6 @@ }, "node_modules/ip-address": { "version": "10.1.0", - "resolved": "https://registry.npmjs.org/ip-address/-/ip-address-10.1.0.tgz", - "integrity": "sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==", "license": "MIT", "engines": { "node": ">= 12" @@ -11233,8 +9054,6 @@ }, "node_modules/ipaddr.js": { "version": "1.9.1", - "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz", - "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==", "license": "MIT", "engines": { "node": ">= 0.10" @@ -11242,8 +9061,6 @@ }, "node_modules/irregular-plurals": { "version": "3.5.0", - "resolved": "https://registry.npmjs.org/irregular-plurals/-/irregular-plurals-3.5.0.tgz", - "integrity": "sha512-1ANGLZ+Nkv1ptFb2pa8oG8Lem4krflKuX/gINiHJHjJUKaJHk/SXk5x6K3J+39/p0h1RQ2saROclJJ+QLvETCQ==", "dev": true, "license": "MIT", "engines": { @@ -11252,8 +9069,6 @@ }, "node_modules/is-array-buffer": { "version": "3.0.5", - "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz", - "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==", "dev": true, "license": "MIT", "dependencies": { @@ -11270,15 +9085,11 @@ }, "node_modules/is-arrayish": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz", - "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg==", "dev": true, "license": "MIT" }, "node_modules/is-async-function": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz", - "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==", "dev": true, "license": "MIT", "dependencies": { @@ -11297,8 +9108,6 @@ }, "node_modules/is-bigint": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz", - "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==", "dev": true, "license": "MIT", "dependencies": { @@ -11313,8 +9122,6 @@ }, "node_modules/is-binary-path": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz", - "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==", "license": "MIT", "dependencies": { "binary-extensions": "^2.0.0" @@ -11325,8 +9132,6 @@ }, "node_modules/is-boolean-object": { "version": "1.2.2", - "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz", - "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==", "dev": true, "license": "MIT", "dependencies": { @@ -11342,8 +9147,6 @@ }, "node_modules/is-callable": { "version": "1.2.7", - "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz", - "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==", "dev": true, "license": "MIT", "engines": { @@ -11355,8 +9158,6 @@ }, "node_modules/is-core-module": { "version": "2.16.1", - "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz", - "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==", "license": "MIT", "dependencies": { "hasown": "^2.0.2" @@ -11370,8 +9171,6 @@ }, "node_modules/is-data-view": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz", - "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==", "dev": true, "license": "MIT", "dependencies": { @@ -11388,8 +9187,6 @@ }, "node_modules/is-date-object": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz", - "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==", "dev": true, "license": "MIT", "dependencies": { @@ -11405,8 +9202,6 @@ }, "node_modules/is-docker": { "version": "2.2.1", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz", - "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==", "dev": true, "license": "MIT", "bin": { @@ -11421,8 +9216,6 @@ }, "node_modules/is-extglob": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz", - "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==", "license": "MIT", "engines": { "node": ">=0.10.0" @@ -11430,8 +9223,6 @@ }, "node_modules/is-finalizationregistry": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz", - "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==", "dev": true, "license": "MIT", "dependencies": { @@ -11446,8 +9237,6 @@ }, "node_modules/is-fullwidth-code-point": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-4.0.0.tgz", - "integrity": "sha512-O4L094N2/dZ7xqVdrXhh9r1KODPJpFms8B5sGdJLPy664AgvXsreZUyCQQNItZRDlYug4xStLjNp/sz3HvBowQ==", "dev": true, "license": "MIT", "engines": { @@ -11459,8 +9248,6 @@ }, "node_modules/is-generator-function": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.2.tgz", - "integrity": "sha512-upqt1SkGkODW9tsGNG5mtXTXtECizwtS2kA161M+gJPc1xdb/Ax629af6YrTwcOeQHbewrPNlE5Dx7kzvXTizA==", "dev": true, "license": "MIT", "dependencies": { @@ -11479,8 +9266,6 @@ }, "node_modules/is-glob": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz", - "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==", "license": "MIT", "dependencies": { "is-extglob": "^2.1.1" @@ -11491,8 +9276,6 @@ }, "node_modules/is-in-ci": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-in-ci/-/is-in-ci-1.0.0.tgz", - "integrity": "sha512-eUuAjybVTHMYWm/U+vBO1sY/JOCgoPCXRxzdju0K+K0BiGW0SChEL1MLC0PoCIR1OlPo5YAp8HuQoUlsWEICwg==", "license": "MIT", "bin": { "is-in-ci": "cli.js" @@ -11506,8 +9289,6 @@ }, "node_modules/is-inside-container": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-inside-container/-/is-inside-container-1.0.0.tgz", - "integrity": "sha512-KIYLCCJghfHZxqjYBE7rEy0OBuTd5xCHS7tHVgvCLkx7StIoaxwNW3hCALgEUjFfeRk+MG/Qxmp/vtETEF3tRA==", "license": "MIT", "dependencies": { "is-docker": "^3.0.0" @@ -11524,8 +9305,6 @@ }, "node_modules/is-inside-container/node_modules/is-docker": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-3.0.0.tgz", - "integrity": "sha512-eljcgEDlEns/7AXFosB5K/2nCM4P7FQPkGc/DWLy5rmFEWvZayGrik1d9/QIY5nJ4f9YsVvBkA6kJpHn9rISdQ==", "license": "MIT", "bin": { "is-docker": "cli.js" @@ -11539,8 +9318,6 @@ }, "node_modules/is-installed-globally": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-installed-globally/-/is-installed-globally-1.0.0.tgz", - "integrity": "sha512-K55T22lfpQ63N4KEN57jZUAaAYqYHEe8veb/TycJRk9DdSCLLcovXz/mL6mOnhQaZsQGwPhuFopdQIlqGSEjiQ==", "license": "MIT", "dependencies": { "global-directory": "^4.0.1", @@ -11555,15 +9332,11 @@ }, "node_modules/is-lambda": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/is-lambda/-/is-lambda-1.0.1.tgz", - "integrity": "sha512-z7CMFGNrENq5iFB9Bqo64Xk6Y9sg+epq1myIcdHaGnbMTYOxvzsEtdYqQUylB7LxfkvgrrjP32T6Ywciio9UIQ==", "dev": true, "license": "MIT" }, "node_modules/is-map": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz", - "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==", "dev": true, "license": "MIT", "engines": { @@ -11575,8 +9348,6 @@ }, "node_modules/is-negative-zero": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-negative-zero/-/is-negative-zero-2.0.3.tgz", - "integrity": "sha512-5KoIu2Ngpyek75jXodFvnafB6DJgr3u8uuK0LEZJjrU19DrMD3EVERaR8sjz8CCGgpZvxPl9SuE1GMVPFHx1mw==", "dev": true, "license": "MIT", "engines": { @@ -11588,8 +9359,6 @@ }, "node_modules/is-npm": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/is-npm/-/is-npm-6.1.0.tgz", - "integrity": "sha512-O2z4/kNgyjhQwVR1Wpkbfc19JIhggF97NZNCpWTnjH7kVcZMUrnut9XSN7txI7VdyIYk5ZatOq3zvSuWpU8hoA==", "license": "MIT", "engines": { "node": "^12.20.0 || ^14.13.1 || >=16.0.0" @@ -11600,8 +9369,6 @@ }, "node_modules/is-number": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz", - "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==", "license": "MIT", "engines": { "node": ">=0.12.0" @@ -11609,8 +9376,6 @@ }, "node_modules/is-number-like": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/is-number-like/-/is-number-like-1.0.8.tgz", - "integrity": "sha512-6rZi3ezCyFcn5L71ywzz2bS5b2Igl1En3eTlZlvKjpz1n3IZLAYMbKYAIQgFmEu0GENg92ziU/faEOA/aixjbA==", "license": "ISC", "dependencies": { "lodash.isfinite": "^3.3.2" @@ -11618,8 +9383,6 @@ }, "node_modules/is-number-object": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz", - "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==", "dev": true, "license": "MIT", "dependencies": { @@ -11635,8 +9398,6 @@ }, "node_modules/is-obj": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-obj/-/is-obj-2.0.0.tgz", - "integrity": "sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==", "dev": true, "license": "MIT", "engines": { @@ -11645,8 +9406,6 @@ }, "node_modules/is-path-inside": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-4.0.0.tgz", - "integrity": "sha512-lJJV/5dYS+RcL8uQdBDW9c9uWFLLBNRyFhnAKXw5tVqLlKZ4RMGZKv+YQ/IA3OhD+RpbJa1LLFM1FQPGyIXvOA==", "license": "MIT", "engines": { "node": ">=12" @@ -11657,8 +9416,6 @@ }, "node_modules/is-plain-obj": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-4.1.0.tgz", - "integrity": "sha512-+Pgi+vMuUNkJyExiMBt5IlFoMyKnr5zhJ4Uspz58WOhBF5QoIZkFyNHIbBAtHwzVAgk5RtndVNsDRN61/mmDqg==", "dev": true, "license": "MIT", "engines": { @@ -11670,8 +9427,6 @@ }, "node_modules/is-plain-object": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-5.0.0.tgz", - "integrity": "sha512-VRSzKkbMm5jMDoKLbltAkFQ5Qr7VDiTFGXxYFXXowVj387GeGNOCsOH6Msy00SGZ3Fp84b1Naa1psqgcCIEP5Q==", "dev": true, "license": "MIT", "engines": { @@ -11680,14 +9435,10 @@ }, "node_modules/is-promise": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/is-promise/-/is-promise-4.0.0.tgz", - "integrity": "sha512-hvpoI6korhJMnej285dSg6nu1+e6uxs7zG3BYAm5byqDsgJNWwxzM6z6iZiAgQR4TJ30JmBTOwqZUw3WlyH3AQ==", "license": "MIT" }, "node_modules/is-regex": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz", - "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==", "dev": true, "license": "MIT", "dependencies": { @@ -11705,8 +9456,6 @@ }, "node_modules/is-regexp": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz", - "integrity": "sha512-7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA==", "dev": true, "license": "MIT", "engines": { @@ -11715,8 +9464,6 @@ }, "node_modules/is-set": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz", - "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==", "dev": true, "license": "MIT", "engines": { @@ -11728,8 +9475,6 @@ }, "node_modules/is-shared-array-buffer": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz", - "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==", "dev": true, "license": "MIT", "dependencies": { @@ -11744,8 +9489,6 @@ }, "node_modules/is-stream": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-4.0.1.tgz", - "integrity": "sha512-Dnz92NInDqYckGEUJv689RbRiTSEHCQ7wOVeALbkOz999YpqT46yMRIGtSNl2iCL1waAZSx40+h59NV/EwzV/A==", "dev": true, "license": "MIT", "engines": { @@ -11757,8 +9500,6 @@ }, "node_modules/is-string": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz", - "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==", "dev": true, "license": "MIT", "dependencies": { @@ -11774,8 +9515,6 @@ }, "node_modules/is-symbol": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz", - "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==", "dev": true, "license": "MIT", "dependencies": { @@ -11792,8 +9531,6 @@ }, "node_modules/is-text-path": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/is-text-path/-/is-text-path-2.0.0.tgz", - "integrity": "sha512-+oDTluR6WEjdXEJMnC2z6A4FRwFoYuvShVVEGsS7ewc0UTi2QtAKMDJuL4BDEVt+5T7MjFo12RP8ghOM75oKJw==", "dev": true, "license": "MIT", "dependencies": { @@ -11805,8 +9542,6 @@ }, "node_modules/is-typed-array": { "version": "1.1.15", - "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz", - "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==", "dev": true, "license": "MIT", "dependencies": { @@ -11821,15 +9556,11 @@ }, "node_modules/is-typedarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz", - "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", "dev": true, "license": "MIT" }, "node_modules/is-unicode-supported": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-2.1.0.tgz", - "integrity": "sha512-mE00Gnza5EEB3Ds0HfMyllZzbBrmLOX3vfWoj9A9PEnTfratQ/BcaJOuMhnkhjXvb2+FkY3VuHqtAGpTPmglFQ==", "license": "MIT", "engines": { "node": ">=18" @@ -11840,8 +9571,6 @@ }, "node_modules/is-weakmap": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz", - "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==", "dev": true, "license": "MIT", "engines": { @@ -11853,8 +9582,6 @@ }, "node_modules/is-weakref": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz", - "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==", "dev": true, "license": "MIT", "dependencies": { @@ -11869,8 +9596,6 @@ }, "node_modules/is-weakset": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz", - "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==", "dev": true, "license": "MIT", "dependencies": { @@ -11886,8 +9611,6 @@ }, "node_modules/is-what": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/is-what/-/is-what-5.5.0.tgz", - "integrity": "sha512-oG7cgbmg5kLYae2N5IVd3jm2s+vldjxJzK1pcu9LfpGuQ93MQSzo0okvRna+7y5ifrD+20FE8FvjusyGaz14fw==", "license": "MIT", "engines": { "node": ">=18" @@ -11898,8 +9621,6 @@ }, "node_modules/is-windows": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/is-windows/-/is-windows-1.0.2.tgz", - "integrity": "sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==", "dev": true, "license": "MIT", "engines": { @@ -11908,8 +9629,6 @@ }, "node_modules/is-wsl": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz", - "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==", "dev": true, "license": "MIT", "dependencies": { @@ -11921,14 +9640,10 @@ }, "node_modules/isarray": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz", - "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ==", "license": "MIT" }, "node_modules/isexe": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-3.1.1.tgz", - "integrity": "sha512-LpB/54B+/2J5hqQ7imZHfdU31OlgQqx7ZicVlkm9kzg9/w8GKLEcFfJl/t7DCEDueOyBAD6zCCwTO6Fzs0NoEQ==", "license": "ISC", "engines": { "node": ">=16" @@ -11936,8 +9651,6 @@ }, "node_modules/isobject": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz", - "integrity": "sha512-+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA==", "dev": true, "license": "MIT", "dependencies": { @@ -11949,8 +9662,6 @@ }, "node_modules/istanbul-lib-coverage": { "version": "3.2.2", - "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz", - "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==", "dev": true, "license": "BSD-3-Clause", "engines": { @@ -11959,8 +9670,6 @@ }, "node_modules/istanbul-lib-hook": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz", - "integrity": "sha512-Pt/uge1Q9s+5VAZ+pCo16TYMWPBIl+oaNIjgLQxcX0itS6ueeaA+pEfThZpH8WxhFgCiEb8sAJY6MdUKgiIWaQ==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -11972,8 +9681,6 @@ }, "node_modules/istanbul-lib-instrument": { "version": "6.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-6.0.3.tgz", - "integrity": "sha512-Vtgk7L/R2JHyyGW07spoFlB8/lpjiOLTjMdms6AFMraYt3BaJauod/NGrfnVG/y4Ix1JEuMRPDPEj2ua+zz1/Q==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -11989,8 +9696,6 @@ }, "node_modules/istanbul-lib-processinfo": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/istanbul-lib-processinfo/-/istanbul-lib-processinfo-2.0.3.tgz", - "integrity": "sha512-NkwHbo3E00oybX6NGJi6ar0B29vxyvNwoC7eJ4G4Yq28UfY758Hgn/heV8VRFhevPED4LXfFz0DQ8z/0kw9zMg==", "dev": true, "license": "ISC", "dependencies": { @@ -12007,9 +9712,6 @@ }, "node_modules/istanbul-lib-processinfo/node_modules/glob": { "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "license": "ISC", "dependencies": { @@ -12029,8 +9731,6 @@ }, "node_modules/istanbul-lib-processinfo/node_modules/minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "license": "ISC", "dependencies": { @@ -12042,8 +9742,6 @@ }, "node_modules/istanbul-lib-processinfo/node_modules/p-map": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", - "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", "dev": true, "license": "MIT", "dependencies": { @@ -12055,9 +9753,6 @@ }, "node_modules/istanbul-lib-processinfo/node_modules/rimraf": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, "license": "ISC", "dependencies": { @@ -12072,8 +9767,6 @@ }, "node_modules/istanbul-lib-report": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz", - "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -12087,8 +9780,6 @@ }, "node_modules/istanbul-lib-source-maps": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz", - "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -12102,8 +9793,6 @@ }, "node_modules/istanbul-lib-source-maps/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -12120,15 +9809,11 @@ }, "node_modules/istanbul-lib-source-maps/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/istanbul-reports": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.2.0.tgz", - "integrity": "sha512-HGYWWS/ehqTV3xN10i23tkPkpH46MLCIMFNCaaKNavAXTF1RkqxawEPtnjnGZ6XKSInBKkiOA5BKS+aZiY3AvA==", "dev": true, "license": "BSD-3-Clause", "dependencies": { @@ -12141,8 +9826,6 @@ }, "node_modules/jackspeak": { "version": "3.4.3", - "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz", - "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==", "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/cliui": "^8.0.2" @@ -12156,8 +9839,6 @@ }, "node_modules/jiti": { "version": "2.6.1", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-2.6.1.tgz", - "integrity": "sha512-ekilCSN1jwRvIbgeg/57YFh8qQDNbwDb9xT/qu2DAHbFFZUicIl4ygVaAvzveMhMVr3LnpSKTNnwt8PoOfmKhQ==", "devOptional": true, "license": "MIT", "bin": { @@ -12166,8 +9847,6 @@ }, "node_modules/js-beautify": { "version": "1.15.4", - "resolved": "https://registry.npmjs.org/js-beautify/-/js-beautify-1.15.4.tgz", - "integrity": "sha512-9/KXeZUKKJwqCXUdBxFJ3vPh467OCckSBmYDwSK/EtV090K+iMJ7zx2S3HLVDIWFQdqMIsZWbnaGiba18aWhaA==", "dev": true, "license": "MIT", "dependencies": { @@ -12188,8 +9867,6 @@ }, "node_modules/js-beautify/node_modules/abbrev": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-2.0.0.tgz", - "integrity": "sha512-6/mh1E2u2YgEsCHdY0Yx5oW+61gZU+1vXaoiHHrpKeuRNNgFvS+/jrwHiQhB5apAf5oB7UB7E19ol2R2LKH8hQ==", "dev": true, "license": "ISC", "engines": { @@ -12198,8 +9875,6 @@ }, "node_modules/js-beautify/node_modules/brace-expansion": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "dev": true, "license": "MIT", "dependencies": { @@ -12208,8 +9883,6 @@ }, "node_modules/js-beautify/node_modules/glob": { "version": "10.5.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", - "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", "dev": true, "license": "ISC", "dependencies": { @@ -12229,15 +9902,11 @@ }, "node_modules/js-beautify/node_modules/lru-cache": { "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "dev": true, "license": "ISC" }, "node_modules/js-beautify/node_modules/minimatch": { "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "dev": true, "license": "ISC", "dependencies": { @@ -12252,8 +9921,6 @@ }, "node_modules/js-beautify/node_modules/nopt": { "version": "7.2.1", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-7.2.1.tgz", - "integrity": "sha512-taM24ViiimT/XntxbPyJQzCG+p4EKOpgD3mxFwW38mGjVUrfERQOeY4EDHjdnptttfHuHQXFx+lTP08Q+mLa/w==", "dev": true, "license": "ISC", "dependencies": { @@ -12268,8 +9935,6 @@ }, "node_modules/js-beautify/node_modules/path-scurry": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -12285,8 +9950,6 @@ }, "node_modules/js-cookie": { "version": "3.0.5", - "resolved": "https://registry.npmjs.org/js-cookie/-/js-cookie-3.0.5.tgz", - "integrity": "sha512-cEiJEAEoIbWfCZYKWhVwFuvPX1gETRYPw6LlaTKoxD3s2AkXzkCjnp6h0V77ozyqj0jakteJ4YqDJT830+lVGw==", "dev": true, "license": "MIT", "engines": { @@ -12295,8 +9958,6 @@ }, "node_modules/js-string-escape": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/js-string-escape/-/js-string-escape-1.0.1.tgz", - "integrity": "sha512-Smw4xcfIQ5LVjAOuJCvN/zIodzA/BBSsluuoSykP+lUvScIi4U6RJLfwHet5cxFnCswUjISV8oAXaqaJDY3chg==", "dev": true, "license": "MIT", "engines": { @@ -12305,14 +9966,10 @@ }, "node_modules/js-tokens": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz", - "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==", "license": "MIT" }, "node_modules/js-yaml": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.1.tgz", - "integrity": "sha512-qQKT4zQxXl8lLwBtHMWwaTcGfFOZviOJet3Oy/xmGk2gZH677CJM9EvtfdSkgWcATZhj/55JZ0rmy3myCT5lsA==", "license": "MIT", "dependencies": { "argparse": "^2.0.1" @@ -12323,8 +9980,6 @@ }, "node_modules/js2xmlparser": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/js2xmlparser/-/js2xmlparser-4.0.2.tgz", - "integrity": "sha512-6n4D8gLlLf1n5mNLQPRfViYzu9RATblzPEtm1SthMX1Pjao0r9YI9nw7ZIfRxQMERS87mcswrg+r/OYrPRX6jA==", "license": "Apache-2.0", "dependencies": { "xmlcreate": "^2.0.4" @@ -12332,8 +9987,6 @@ }, "node_modules/jsdoc": { "version": "4.0.5", - "resolved": "https://registry.npmjs.org/jsdoc/-/jsdoc-4.0.5.tgz", - "integrity": "sha512-P4C6MWP9yIlMiK8nwoZvxN84vb6MsnXcHuy7XzVOvQoCizWX5JFCBsWIIWKXBltpoRZXddUOVQmCTOZt9yDj9g==", "license": "Apache-2.0", "dependencies": { "@babel/parser": "^7.20.15", @@ -12361,8 +10014,6 @@ }, "node_modules/jsdoc-type-pratt-parser": { "version": "6.10.0", - "resolved": "https://registry.npmjs.org/jsdoc-type-pratt-parser/-/jsdoc-type-pratt-parser-6.10.0.tgz", - "integrity": "sha512-+LexoTRyYui5iOhJGn13N9ZazL23nAHGkXsa1p/C8yeq79WRfLBag6ZZ0FQG2aRoc9yfo59JT9EYCQonOkHKkQ==", "dev": true, "license": "MIT", "engines": { @@ -12371,8 +10022,6 @@ }, "node_modules/jsdoc/node_modules/escape-string-regexp": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", "license": "MIT", "engines": { "node": ">=8" @@ -12380,8 +10029,6 @@ }, "node_modules/jsesc": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz", - "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==", "dev": true, "license": "MIT", "bin": { @@ -12393,15 +10040,11 @@ }, "node_modules/json-buffer": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz", - "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==", "dev": true, "license": "MIT" }, "node_modules/json-parse-even-better-errors": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-5.0.0.tgz", - "integrity": "sha512-ZF1nxZ28VhQouRWhUcVlUIN3qwSgPuswK05s/HIaoetAoE/9tngVmCHjSxmSQPav1nd+lPtTL0YZ/2AFdR/iYQ==", "license": "MIT", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -12409,21 +10052,15 @@ }, "node_modules/json-schema-traverse": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz", - "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==", "license": "MIT" }, "node_modules/json-stable-stringify-without-jsonify": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz", - "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==", "dev": true, "license": "MIT" }, "node_modules/json-stringify-nice": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/json-stringify-nice/-/json-stringify-nice-1.1.4.tgz", - "integrity": "sha512-5Z5RFW63yxReJ7vANgW6eZFGWaQvnPE3WNmZoOJrSkGju2etKA2L5rrOa1sm877TVTFt57A80BH1bArcmlLfPw==", "license": "ISC", "funding": { "url": "https://github.com/sponsors/isaacs" @@ -12431,15 +10068,11 @@ }, "node_modules/json-stringify-safe": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz", - "integrity": "sha512-ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA==", "dev": true, "license": "ISC" }, "node_modules/json5": { "version": "2.2.3", - "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz", - "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==", "dev": true, "license": "MIT", "bin": { @@ -12451,8 +10084,6 @@ }, "node_modules/jsonparse": { "version": "1.3.1", - "resolved": "https://registry.npmjs.org/jsonparse/-/jsonparse-1.3.1.tgz", - "integrity": "sha512-POQXvpdL69+CluYsillJ7SUhKvytYjW9vG/GKpnf+xP8UWgYEM/RaMzHHofbALDiKbbP1W8UEYmgGl39WkPZsg==", "engines": [ "node >= 0.2.0" ], @@ -12460,8 +10091,6 @@ }, "node_modules/JSONStream": { "version": "1.3.5", - "resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.5.tgz", - "integrity": "sha512-E+iruNOY8VV9s4JEbe1aNEm6MiszPRr/UfcHMz0TQh1BXSxHK+ASV1R6W4HpjBhSeS+54PIsAMCBmwD06LLsqQ==", "dev": true, "license": "(MIT OR Apache-2.0)", "dependencies": { @@ -12477,21 +10106,14 @@ }, "node_modules/just-diff": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/just-diff/-/just-diff-6.0.2.tgz", - "integrity": "sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==", "license": "MIT" }, "node_modules/just-diff-apply": { "version": "5.5.0", - "resolved": "https://registry.npmjs.org/just-diff-apply/-/just-diff-apply-5.5.0.tgz", - "integrity": "sha512-OYTthRfSh55WOItVqwpefPtNt2VdKsq5AnAK6apdtR6yCH8pr0CmSr710J0Mf+WdQy7K/OzMy7K2MgAfdQURDw==", "license": "MIT" }, "node_modules/keygrip": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/keygrip/-/keygrip-1.1.0.tgz", - "integrity": "sha512-iYSchDJ+liQ8iwbSI2QqsQOvqv58eJCEanyJPJi+Khyu8smkcKSFUCbPwzFcL7YVtZ6eONjqRX/38caJ7QjRAQ==", - "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.", "dev": true, "license": "MIT", "dependencies": { @@ -12503,8 +10125,6 @@ }, "node_modules/keyv": { "version": "4.5.4", - "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz", - "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==", "dev": true, "license": "MIT", "dependencies": { @@ -12513,8 +10133,6 @@ }, "node_modules/klaw": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/klaw/-/klaw-3.0.0.tgz", - "integrity": "sha512-0Fo5oir+O9jnXu5EefYbVK+mHMBeEVEy2cmctR1O1NECcCkPRreJKrS6Qt/j3KC2C148Dfo9i3pCmCMsdqGr0g==", "license": "MIT", "dependencies": { "graceful-fs": "^4.1.9" @@ -12522,8 +10140,6 @@ }, "node_modules/koa": { "version": "2.16.3", - "resolved": "https://registry.npmjs.org/koa/-/koa-2.16.3.tgz", - "integrity": "sha512-zPPuIt+ku1iCpFBRwseMcPYQ1cJL8l60rSmKeOuGfOXyE6YnTBmf2aEFNL2HQGrD0cPcLO/t+v9RTgC+fwEh/g==", "dev": true, "license": "MIT", "dependencies": { @@ -12557,8 +10173,6 @@ }, "node_modules/koa-bodyparser": { "version": "4.4.1", - "resolved": "https://registry.npmjs.org/koa-bodyparser/-/koa-bodyparser-4.4.1.tgz", - "integrity": "sha512-kBH3IYPMb+iAXnrxIhXnW+gXV8OTzCu8VPDqvcDHW9SQrbkHmqPQtiZwrltNmSq6/lpipHnT7k7PsjlVD7kK0w==", "dev": true, "license": "MIT", "dependencies": { @@ -12572,15 +10186,11 @@ }, "node_modules/koa-compose": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/koa-compose/-/koa-compose-4.1.0.tgz", - "integrity": "sha512-8ODW8TrDuMYvXRwra/Kh7/rJo9BtOfPc6qO8eAfC80CnCvSjSl0bkRM24X6/XBBEyj0v1nRUQ1LyOy3dbqOWXw==", "dev": true, "license": "MIT" }, "node_modules/koa-compress": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/koa-compress/-/koa-compress-5.1.1.tgz", - "integrity": "sha512-UgMIN7ZoEP2DuoSQmD6CYvFSLt0NReGlc2qSY4bO4Oq0L56OiD9pDG41Kj/zFmVY/A3Wvmn4BqKcfq5H30LGIg==", "dev": true, "license": "MIT", "dependencies": { @@ -12595,8 +10205,6 @@ }, "node_modules/koa-compress/node_modules/depd": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", "dev": true, "license": "MIT", "engines": { @@ -12605,8 +10213,6 @@ }, "node_modules/koa-compress/node_modules/http-errors": { "version": "1.8.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", - "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", "dev": true, "license": "MIT", "dependencies": { @@ -12622,8 +10228,6 @@ }, "node_modules/koa-compress/node_modules/statuses": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", "dev": true, "license": "MIT", "engines": { @@ -12632,15 +10236,11 @@ }, "node_modules/koa-conditional-get": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/koa-conditional-get/-/koa-conditional-get-2.0.0.tgz", - "integrity": "sha512-FTZYr681zfyW0bz8FDc55RJrRnicz6KPv2oA3GOf6knksJd0uJdfenKud+RtBjHzO0g1tVHNjwN6gk7OfHAtbQ==", "dev": true, "license": "MIT" }, "node_modules/koa-convert": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/koa-convert/-/koa-convert-2.0.0.tgz", - "integrity": "sha512-asOvN6bFlSnxewce2e/DK3p4tltyfC4VM7ZwuTuepI7dEQVcvpyFuBcEARu1+Hxg8DIwytce2n7jrZtRlPrARA==", "dev": true, "license": "MIT", "dependencies": { @@ -12653,8 +10253,6 @@ }, "node_modules/koa-etag": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/koa-etag/-/koa-etag-4.0.0.tgz", - "integrity": "sha512-1cSdezCkBWlyuB9l6c/IFoe1ANCDdPBxkDkRiaIup40xpUub6U/wwRXoKBZw/O5BifX9OlqAjYnDyzM6+l+TAg==", "dev": true, "license": "MIT", "dependencies": { @@ -12663,15 +10261,11 @@ }, "node_modules/koa-is-json": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/koa-is-json/-/koa-is-json-1.0.0.tgz", - "integrity": "sha512-+97CtHAlWDx0ndt0J8y3P12EWLwTLMXIfMnYDev3wOTwH/RpBGMlfn4bDXlMEg1u73K6XRE9BbUp+5ZAYoRYWw==", "dev": true, "license": "MIT" }, "node_modules/koa-json": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/koa-json/-/koa-json-2.0.2.tgz", - "integrity": "sha512-8+dz0T2ekDuNN1svYoKPCV2txotQ3Ufg8Fn5bft1T48MPJWiC/HKmkk+3xj9EC/iNZuFYeLRazN2h2o3RSUXuQ==", "dev": true, "license": "MIT", "dependencies": { @@ -12681,8 +10275,6 @@ }, "node_modules/koa-morgan": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/koa-morgan/-/koa-morgan-1.0.1.tgz", - "integrity": "sha512-JOUdCNlc21G50afBXfErUrr1RKymbgzlrO5KURY+wmDG1Uvd2jmxUJcHgylb/mYXy2SjiNZyYim/ptUBGsIi3A==", "dev": true, "license": "MIT", "dependencies": { @@ -12691,8 +10283,6 @@ }, "node_modules/koa-range": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/koa-range/-/koa-range-0.3.0.tgz", - "integrity": "sha512-Ich3pCz6RhtbajYXRWjIl6O5wtrLs6kE3nkXc9XmaWe+MysJyZO7K4L3oce1Jpg/iMgCbj+5UCiMm/rqVtcDIg==", "dev": true, "license": "MIT", "dependencies": { @@ -12704,8 +10294,6 @@ }, "node_modules/koa-route": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/koa-route/-/koa-route-4.0.1.tgz", - "integrity": "sha512-ytLrdDPF/qTMh20BxZCNpIUY329SoGu84xjGYeNsp/jkGT3OpZfkuK646sDScVJQ9XdsLXJVMml1dXMA5EIuxQ==", "dev": true, "license": "MIT", "dependencies": { @@ -12716,15 +10304,11 @@ }, "node_modules/koa-route/node_modules/path-to-regexp": { "version": "6.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", - "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", "dev": true, "license": "MIT" }, "node_modules/koa-send": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/koa-send/-/koa-send-5.0.1.tgz", - "integrity": "sha512-tmcyQ/wXXuxpDxyNXv5yNNkdAMdFRqwtegBXUaowiQzUKqJehttS0x2j0eOZDQAyloAth5w6wwBImnFzkUz3pQ==", "dev": true, "license": "MIT", "dependencies": { @@ -12738,8 +10322,6 @@ }, "node_modules/koa-send/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -12756,8 +10338,6 @@ }, "node_modules/koa-send/node_modules/depd": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", "dev": true, "license": "MIT", "engines": { @@ -12766,8 +10346,6 @@ }, "node_modules/koa-send/node_modules/http-errors": { "version": "1.8.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", - "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", "dev": true, "license": "MIT", "dependencies": { @@ -12783,15 +10361,11 @@ }, "node_modules/koa-send/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/koa-send/node_modules/statuses": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", "dev": true, "license": "MIT", "engines": { @@ -12800,8 +10374,6 @@ }, "node_modules/koa-static": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/koa-static/-/koa-static-5.0.0.tgz", - "integrity": "sha512-UqyYyH5YEXaJrf9S8E23GoJFQZXkBVJ9zYYMPGz919MSX1KuvAcycIuS0ci150HCoPf4XQVhQ84Qf8xRPWxFaQ==", "dev": true, "license": "MIT", "dependencies": { @@ -12814,8 +10386,6 @@ }, "node_modules/koa-static/node_modules/debug": { "version": "3.2.7", - "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz", - "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==", "dev": true, "license": "MIT", "dependencies": { @@ -12824,15 +10394,11 @@ }, "node_modules/koa-static/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/koa/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -12849,8 +10415,6 @@ }, "node_modules/koa/node_modules/encodeurl": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", "dev": true, "license": "MIT", "engines": { @@ -12859,8 +10423,6 @@ }, "node_modules/koa/node_modules/http-errors": { "version": "1.8.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz", - "integrity": "sha512-Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g==", "dev": true, "license": "MIT", "dependencies": { @@ -12876,8 +10438,6 @@ }, "node_modules/koa/node_modules/http-errors/node_modules/depd": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", "dev": true, "license": "MIT", "engines": { @@ -12886,15 +10446,11 @@ }, "node_modules/koa/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/koa/node_modules/statuses": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", "dev": true, "license": "MIT", "engines": { @@ -12903,8 +10459,6 @@ }, "node_modules/ky": { "version": "1.14.0", - "resolved": "https://registry.npmjs.org/ky/-/ky-1.14.0.tgz", - "integrity": "sha512-Rczb6FMM6JT0lvrOlP5WUOCB7s9XKxzwgErzhKlKde1bEV90FXplV1o87fpt4PU/asJFiqjYJxAJyzJhcrxOsQ==", "license": "MIT", "engines": { "node": ">=18" @@ -12915,8 +10469,6 @@ }, "node_modules/latest-version": { "version": "9.0.0", - "resolved": "https://registry.npmjs.org/latest-version/-/latest-version-9.0.0.tgz", - "integrity": "sha512-7W0vV3rqv5tokqkBAFV1LbR7HPOWzXQDpDgEuib/aJ1jsZZx6x3c2mBI+TJhJzOhkGeaLbCKEHXEXLfirtG2JA==", "license": "MIT", "dependencies": { "package-json": "^10.0.0" @@ -12930,8 +10482,6 @@ }, "node_modules/less-openui5": { "version": "0.11.6", - "resolved": "https://registry.npmjs.org/less-openui5/-/less-openui5-0.11.6.tgz", - "integrity": "sha512-sQmU+G2pJjFfzRI+XtXkk+T9G0s6UmWWUfOW0utPR46C9lfhNr4DH1lNJuImj64reXYi+vOwyNxPRkj0F3mofA==", "license": "Apache-2.0", "dependencies": { "@adobe/css-tools": "^4.0.2", @@ -12945,8 +10495,6 @@ }, "node_modules/levn": { "version": "0.4.1", - "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz", - "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==", "dev": true, "license": "MIT", "dependencies": { @@ -12959,8 +10507,6 @@ }, "node_modules/licensee": { "version": "11.1.1", - "resolved": "https://registry.npmjs.org/licensee/-/licensee-11.1.1.tgz", - "integrity": "sha512-FpgdKKjvJULlBqYiKtrK7J4Oo7sQO1lHQTUOcxxE4IPQccx6c0tJWMgwVdG46+rPnLPSV7EWD6eWUtAjGO52Lg==", "dev": true, "license": "Apache-2.0", "dependencies": { @@ -12985,8 +10531,6 @@ }, "node_modules/lilconfig": { "version": "3.1.3", - "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz", - "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==", "license": "MIT", "engines": { "node": ">=14" @@ -12997,8 +10541,6 @@ }, "node_modules/line-column": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/line-column/-/line-column-1.0.2.tgz", - "integrity": "sha512-Ktrjk5noGYlHsVnYWh62FLVs4hTb8A3e+vucNZMgPeAOITdshMSgv4cCZQeRDjm7+goqmo6+liZwTXo+U3sVww==", "dev": true, "license": "MIT", "dependencies": { @@ -13008,14 +10550,10 @@ }, "node_modules/lines-and-columns": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz", - "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg==", "license": "MIT" }, "node_modules/linkify-it": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/linkify-it/-/linkify-it-5.0.0.tgz", - "integrity": "sha512-5aHCbzQRADcdP+ATqnDuhhJ/MRIqDkZX5pyjFHRRysS8vZ5AbqGEoFIb6pYHPZ+L/OC2Lc+xT8uHVVR5CAK/wQ==", "license": "MIT", "dependencies": { "uc.micro": "^2.0.0" @@ -13023,8 +10561,6 @@ }, "node_modules/lit-html": { "version": "2.8.0", - "resolved": "https://registry.npmjs.org/lit-html/-/lit-html-2.8.0.tgz", - "integrity": "sha512-o9t+MQM3P4y7M7yNzqAyjp7z+mQGa4NS4CxiyLqFPyFWyc4O+nodLrkrxSaCTrla6M5YOLaT3RpbbqjszB5g3Q==", "license": "BSD-3-Clause", "dependencies": { "@types/trusted-types": "^2.0.2" @@ -13032,8 +10568,6 @@ }, "node_modules/load-json-file": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-7.0.1.tgz", - "integrity": "sha512-Gnxj3ev3mB5TkVBGad0JM6dmLiQL+o0t23JPBZ9sd+yvSLk05mFoqKBw5N8gbbkU4TNXyqCgIrl/VM17OgUIgQ==", "dev": true, "license": "MIT", "engines": { @@ -13045,8 +10579,6 @@ }, "node_modules/load-module": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/load-module/-/load-module-5.0.0.tgz", - "integrity": "sha512-zZBnYIvAuP2TprnRisam+N/A3v+JX60pvdKoHQRKyl4xlHLQQLpp7JKNyEQ6D3Si0/QIQMgXko3PtV+cx6L7mA==", "dev": true, "license": "MIT", "dependencies": { @@ -13058,8 +10590,6 @@ }, "node_modules/local-web-server": { "version": "5.4.0", - "resolved": "https://registry.npmjs.org/local-web-server/-/local-web-server-5.4.0.tgz", - "integrity": "sha512-FkQT6ZuX+8ywks3Mol5nHtuKzf+Rhtp88PPJUkcU0fP6JzNi7s9a+dWRQ8WrCxlGe3vHij85A4R1uL4wRg06WA==", "dev": true, "license": "MIT", "dependencies": { @@ -13090,8 +10620,6 @@ }, "node_modules/locate-path": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-7.2.0.tgz", - "integrity": "sha512-gvVijfZvn7R+2qyPX8mAuKcFGDf6Nc61GdvGafQsHL0sBIxfKzA+usWn4GFC/bk+QdwPUD4kWFJLhElipq+0VA==", "dev": true, "license": "MIT", "dependencies": { @@ -13106,8 +10634,6 @@ }, "node_modules/lockfile": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/lockfile/-/lockfile-1.0.4.tgz", - "integrity": "sha512-cvbTwETRfsFh4nHsL1eGWapU1XFi5Ot9E85sWAwia7Y7EgB7vfqcZhTKZ+l7hCGxSPoushMv5GKhT5PdLv03WA==", "license": "ISC", "dependencies": { "signal-exit": "^3.0.2" @@ -13115,108 +10641,76 @@ }, "node_modules/lockfile/node_modules/signal-exit": { "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "license": "ISC" }, "node_modules/lodash": { "version": "4.17.21", - "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz", - "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==", "license": "MIT" }, "node_modules/lodash.camelcase": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz", - "integrity": "sha512-TwuEnCnxbc3rAvhf/LbG7tJUDzhqXyFnv3dtzLOPgCG/hODL7WFnsbwktkD7yUV0RrreP/l1PALq/YSg6VvjlA==", "dev": true, "license": "MIT" }, "node_modules/lodash.flattendeep": { "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.flattendeep/-/lodash.flattendeep-4.4.0.tgz", - "integrity": "sha512-uHaJFihxmJcEX3kT4I23ABqKKalJ/zDrDg0lsFtc1h+3uw49SIJ5beyhx5ExVRti3AvKoOJngIj7xz3oylPdWQ==", "dev": true, "license": "MIT" }, "node_modules/lodash.isfinite": { "version": "3.3.2", - "resolved": "https://registry.npmjs.org/lodash.isfinite/-/lodash.isfinite-3.3.2.tgz", - "integrity": "sha512-7FGG40uhC8Mm633uKW1r58aElFlBlxCrg9JfSi3P6aYiWmfiWF0PgMd86ZUsxE5GwWPdHoS2+48bwTh2VPkIQA==", "license": "MIT" }, "node_modules/lodash.isplainobject": { "version": "4.0.6", - "resolved": "https://registry.npmjs.org/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz", - "integrity": "sha512-oSXzaWypCMHkPC3NvBEaPHf0KsA5mvPrOPgQWDsbg8n7orZ290M0BmC/jgRZ4vcJ6DTAhjrsSYgdsW/F+MFOBA==", "dev": true, "license": "MIT" }, "node_modules/lodash.kebabcase": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.kebabcase/-/lodash.kebabcase-4.1.1.tgz", - "integrity": "sha512-N8XRTIMMqqDgSy4VLKPnJ/+hpGZN+PHQiJnSenYqPaVV/NCqEogTnAdZLQiGKhxX+JCs8waWq2t1XHWKOmlY8g==", "dev": true, "license": "MIT" }, "node_modules/lodash.memoize": { "version": "4.1.2", - "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz", - "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag==", "license": "MIT" }, "node_modules/lodash.merge": { "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz", - "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==", "dev": true, "license": "MIT" }, "node_modules/lodash.mergewith": { "version": "4.6.2", - "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz", - "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ==", "dev": true, "license": "MIT" }, "node_modules/lodash.snakecase": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.snakecase/-/lodash.snakecase-4.1.1.tgz", - "integrity": "sha512-QZ1d4xoBHYUeuouhEq3lk3Uq7ldgyFXGBhg04+oRLnIz8o9T65Eh+8YdroUwn846zchkA9yDsDl5CVVaV2nqYw==", "dev": true, "license": "MIT" }, "node_modules/lodash.startcase": { "version": "4.4.0", - "resolved": "https://registry.npmjs.org/lodash.startcase/-/lodash.startcase-4.4.0.tgz", - "integrity": "sha512-+WKqsK294HMSc2jEbNgpHpd0JfIBhp7rEV4aqXWqFr6AlXov+SlcgB1Fv01y2kGe3Gc8nMW7VA0SrGuSkRfIEg==", "dev": true, "license": "MIT" }, "node_modules/lodash.throttle": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz", - "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ==", "dev": true, "license": "MIT" }, "node_modules/lodash.uniq": { "version": "4.5.0", - "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz", - "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ==", "license": "MIT" }, "node_modules/lodash.upperfirst": { "version": "4.3.1", - "resolved": "https://registry.npmjs.org/lodash.upperfirst/-/lodash.upperfirst-4.3.1.tgz", - "integrity": "sha512-sReKOYJIJf74dhJONhU4e0/shzi1trVbSWDOhKYE5XV2O+H7Sb2Dihwuc7xWxVl+DgFPyTqIN3zMfT9cq5iWDg==", "dev": true, "license": "MIT" }, "node_modules/lru-cache": { "version": "11.2.2", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-11.2.2.tgz", - "integrity": "sha512-F9ODfyqML2coTIsQpSkRHnLSZMtkU8Q+mSfcaIyKwy58u+8k5nvAYeiNhsyMARvzNcXJ9QfWVrcPsC9e9rAxtg==", "license": "ISC", "engines": { "node": "20 || >=22" @@ -13224,8 +10718,6 @@ }, "node_modules/lws": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/lws/-/lws-4.2.0.tgz", - "integrity": "sha512-J6mZB9mNauMBjIEh0wCF3U5bdhhuiamwTmDQ0nCTXWp6tvXNi/3RCgc4F1UN6rGpTaKgEfDnDQEo9ThLsc0UAg==", "dev": true, "license": "MIT", "dependencies": { @@ -13253,8 +10745,6 @@ }, "node_modules/lws-basic-auth": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lws-basic-auth/-/lws-basic-auth-2.0.0.tgz", - "integrity": "sha512-zzyoGFLQPuKaQJvHMLmmSyfT6lIvocwcDXllTVW5brD0t0YgHYopILkzja+x+MIlJX/YhNKniaTSasujniYVjw==", "dev": true, "license": "MIT", "dependencies": { @@ -13266,8 +10756,6 @@ }, "node_modules/lws-blacklist": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lws-blacklist/-/lws-blacklist-3.0.0.tgz", - "integrity": "sha512-KNXGDBmbj+UGfWMBAefe2vrfuWpEQms/9Fd7kfMScTqAKF6nrVoEs4pkxfefArG3bX0bu7jWLyB4tJGma5WC6Q==", "dev": true, "license": "MIT", "dependencies": { @@ -13280,8 +10768,6 @@ }, "node_modules/lws-blacklist/node_modules/array-back": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", - "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", "dev": true, "license": "MIT", "engines": { @@ -13290,15 +10776,11 @@ }, "node_modules/lws-blacklist/node_modules/path-to-regexp": { "version": "6.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", - "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", "dev": true, "license": "MIT" }, "node_modules/lws-body-parser": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/lws-body-parser/-/lws-body-parser-3.0.1.tgz", - "integrity": "sha512-HUlTGYukWRXnmAFlpJhaJWSFsfkOP4fC9fjEiYeyI0kTy0/SaMLwcLzi5hQ/eriLZNGuF+PqnhBMtOys6nPdfw==", "dev": true, "license": "MIT", "dependencies": { @@ -13310,8 +10792,6 @@ }, "node_modules/lws-compress": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/lws-compress/-/lws-compress-3.1.0.tgz", - "integrity": "sha512-uBlpYFNBUD3FuQjXbtwasvD90w3HH6GRivknvbibSSsDQf1MtIM8WZ5fS4795n1ozTYnQD+Ai8T+Cpy0q0xuhA==", "dev": true, "license": "MIT", "dependencies": { @@ -13323,8 +10803,6 @@ }, "node_modules/lws-conditional-get": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lws-conditional-get/-/lws-conditional-get-3.0.0.tgz", - "integrity": "sha512-/O+JSIB889kIYgo8QFyJJayW3W0BMRc8zPHE6F5FBGtdqpsl+UsKZHFiSmJSTRn/1HGgnmcXQz2UpbB1PQYVSw==", "dev": true, "license": "MIT", "dependencies": { @@ -13337,8 +10815,6 @@ }, "node_modules/lws-cors": { "version": "4.2.1", - "resolved": "https://registry.npmjs.org/lws-cors/-/lws-cors-4.2.1.tgz", - "integrity": "sha512-KXsAn0Wn8n0riJ3SDHQzEAuzTrdeQZDJIxPHWEupsImW2hnQuBZVW5zqsmfzxD8SkCDDnQyFNuQZjSlBZmexKg==", "dev": true, "license": "MIT", "dependencies": { @@ -13350,8 +10826,6 @@ }, "node_modules/lws-index": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lws-index/-/lws-index-3.1.1.tgz", - "integrity": "sha512-f1rjsCkrKHVbSe03lm6xQ1GNnqzq/tL5f0ge8kXJFRorpS8Sv7WDXzUsGswmGAgxPPvDj8L7E6zwD+BCjQRU8w==", "dev": true, "license": "MIT", "dependencies": { @@ -13363,8 +10837,6 @@ }, "node_modules/lws-json": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lws-json/-/lws-json-2.0.0.tgz", - "integrity": "sha512-vqUFrAQ5BGpkMS2Mm/ZhgvUMi6Tgia7YtESG7pKjNoiSsD+TxncG0nqp8YjUh2xrEzi/SYFc/ed+9ZOl/t0A0g==", "dev": true, "license": "MIT", "dependencies": { @@ -13376,8 +10848,6 @@ }, "node_modules/lws-log": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/lws-log/-/lws-log-3.0.0.tgz", - "integrity": "sha512-I0P5dcZkR97GQ92lyJHQlCZ6eRDota+4OQrEoVXSJQD1Dc8CFxy0+4ELYJke6RwEWmr0BwU65C1cCcSC1w5NFA==", "dev": true, "license": "MIT", "dependencies": { @@ -13390,8 +10860,6 @@ }, "node_modules/lws-mime": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lws-mime/-/lws-mime-2.0.0.tgz", - "integrity": "sha512-mfrAgRQ5+hkQ7LJ6EAgwnUeymNeYxwLXZY3UQ6C2hSTr7BqMSzm9k5O0C8wWP2dzdhChzITYKwzWbUnAYVBwtA==", "dev": true, "license": "MIT", "engines": { @@ -13400,8 +10868,6 @@ }, "node_modules/lws-range": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/lws-range/-/lws-range-4.0.1.tgz", - "integrity": "sha512-rUkHpsRv5Ixr+8/E4cDCz6jUi6En6hnEaDZhPb0a1GU1vasOHhGcW0qilkgf0dtS0xDJzdKixdfcCW40ankIeQ==", "dev": true, "license": "MIT", "dependencies": { @@ -13413,8 +10879,6 @@ }, "node_modules/lws-request-monitor": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/lws-request-monitor/-/lws-request-monitor-2.0.0.tgz", - "integrity": "sha512-ZTo0/pS42qiejcYlL+wlpurSbDSS0J7pDDohqBx7jjUQkgni2Qd8cPzn/kW8QI82gXgDmdZH+ps0vheLHlgdgg==", "dev": true, "license": "MIT", "dependencies": { @@ -13426,8 +10890,6 @@ }, "node_modules/lws-request-monitor/node_modules/byte-size": { "version": "6.2.0", - "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-6.2.0.tgz", - "integrity": "sha512-6EspYUCAPMc7E2rltBgKwhG+Cmk0pDm9zDtF1Awe2dczNUL3YpZ8mTs/dueOTS1hqGWBOatqef4jYMGjln7WmA==", "dev": true, "license": "MIT", "engines": { @@ -13436,8 +10898,6 @@ }, "node_modules/lws-rewrite": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/lws-rewrite/-/lws-rewrite-4.0.0.tgz", - "integrity": "sha512-I9rNDyAuy/1Wz2WMWTqjxFMlUTr8CugdHlUCjIudQkt04YnRdhP32iAoRnVnLsgP1UOiM44dxTW2EomQHHfirw==", "dev": true, "license": "MIT", "dependencies": { @@ -13456,8 +10916,6 @@ }, "node_modules/lws-rewrite/node_modules/agent-base": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz", - "integrity": "sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==", "dev": true, "license": "MIT", "dependencies": { @@ -13469,8 +10927,6 @@ }, "node_modules/lws-rewrite/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -13487,8 +10943,6 @@ }, "node_modules/lws-rewrite/node_modules/https-proxy-agent": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz", - "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==", "dev": true, "license": "MIT", "dependencies": { @@ -13501,22 +10955,16 @@ }, "node_modules/lws-rewrite/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/lws-rewrite/node_modules/path-to-regexp": { "version": "6.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-6.3.0.tgz", - "integrity": "sha512-Yhpw4T9C6hPpgPeA28us07OJeqZ5EzQTkbfwuhsUg0c237RomFoETJgmp2sa3F/41gfLE6G5cqcYwznmeEeOlQ==", "dev": true, "license": "MIT" }, "node_modules/lws-spa": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/lws-spa/-/lws-spa-4.1.1.tgz", - "integrity": "sha512-v032GXet8j818l6vUyAlQm1HfcxPVM+Flvxptv6EcDveUJqvfNX5j1bo9PqKB8HbyEScek5OH8guFAqrSOwBNw==", "dev": true, "license": "MIT", "dependencies": { @@ -13528,8 +10976,6 @@ }, "node_modules/lws-static": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/lws-static/-/lws-static-3.1.1.tgz", - "integrity": "sha512-4Xb6rE4gVp2ZmuiVYwvFaSsMUbQ8CwxSxzHzfK6URFz4g3vVT8+e+ekGlItp8ePf9w7u9l96HU7+QDswsmwhCg==", "dev": true, "license": "MIT", "dependencies": { @@ -13541,8 +10987,6 @@ }, "node_modules/magic-string": { "version": "0.30.21", - "resolved": "https://registry.npmjs.org/magic-string/-/magic-string-0.30.21.tgz", - "integrity": "sha512-vd2F4YUyEXKGcLHoq+TEyCjxueSeHnFxyyjNp80yg0XV4vUhnDer/lvvlqM/arB5bXQN5K2/3oinyCRyx8T2CQ==", "license": "MIT", "dependencies": { "@jridgewell/sourcemap-codec": "^1.5.5" @@ -13550,8 +10994,6 @@ }, "node_modules/make-dir": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz", - "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==", "dev": true, "license": "MIT", "dependencies": { @@ -13564,73 +11006,12 @@ "url": "https://github.com/sponsors/sindresorhus" } }, - "node_modules/make-fetch-happen": { - "version": "15.0.3", - "resolved": "https://registry.npmjs.org/make-fetch-happen/-/make-fetch-happen-15.0.3.tgz", - "integrity": "sha512-iyyEpDty1mwW3dGlYXAJqC/azFn5PPvgKVwXayOGBSmKLxhKZ9fg4qIan2ePpp1vJIwfFiO34LAPZgq9SZW9Aw==", - "license": "ISC", - "dependencies": { - "@npmcli/agent": "^4.0.0", - "cacache": "^20.0.1", - "http-cache-semantics": "^4.1.1", - "minipass": "^7.0.2", - "minipass-fetch": "^5.0.0", - "minipass-flush": "^1.0.5", - "minipass-pipeline": "^1.2.4", - "negotiator": "^1.0.0", - "proc-log": "^6.0.0", - "promise-retry": "^2.0.1", - "ssri": "^13.0.0" - }, - "engines": { - "node": "^20.17.0 || >=22.9.0" - } - }, - "node_modules/make-fetch-happen/node_modules/minipass-fetch": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-5.0.0.tgz", - "integrity": "sha512-fiCdUALipqgPWrOVTz9fw0XhcazULXOSU6ie40DDbX1F49p1dBrSRBuswndTx1x3vEb/g0FT7vC4c4C2u/mh3A==", - "license": "MIT", - "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^3.0.1" - }, - "engines": { - "node": "^20.17.0 || >=22.9.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" - } - }, - "node_modules/make-fetch-happen/node_modules/negotiator": { - "version": "1.0.0", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-1.0.0.tgz", - "integrity": "sha512-8Ofs/AUQh8MaEcrlq5xOX0CQ9ypTF5dl78mjlMNfOK08fzpgTHQRQPBxcPlEtIw0yRpws+Zo/3r+5WRby7u3Gg==", - "license": "MIT", - "engines": { - "node": ">= 0.6" - } - }, - "node_modules/make-fetch-happen/node_modules/proc-log": { - "version": "6.1.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz", - "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==", - "license": "ISC", - "engines": { - "node": "^20.17.0 || >=22.9.0" - } - }, "node_modules/mark.js": { "version": "8.11.1", - "resolved": "https://registry.npmjs.org/mark.js/-/mark.js-8.11.1.tgz", - "integrity": "sha512-1I+1qpDt4idfgLQG+BNWmrqku+7/2bi5nLf4YwF8y8zXvmfiTBY3PV3ZibfrjBueCByROpuBjLLFCajqkgYoLQ==", "license": "MIT" }, "node_modules/markdown-it": { "version": "14.1.0", - "resolved": "https://registry.npmjs.org/markdown-it/-/markdown-it-14.1.0.tgz", - "integrity": "sha512-a54IwgWPaeBCAAsv13YgmALOF1elABB08FxO9i+r4VFk5Vl4pKokRPeX8u5TCgSsPi6ec1otfLjdOpVcgbpshg==", "license": "MIT", "dependencies": { "argparse": "^2.0.1", @@ -13646,8 +11027,6 @@ }, "node_modules/markdown-it-anchor": { "version": "8.6.7", - "resolved": "https://registry.npmjs.org/markdown-it-anchor/-/markdown-it-anchor-8.6.7.tgz", - "integrity": "sha512-FlCHFwNnutLgVTflOYHPW2pPcl2AACqVzExlkGQNsi4CJgqOHN7YTgDd4LuhgN1BFO3TS0vLAruV1Td6dwWPJA==", "license": "Unlicense", "peerDependencies": { "@types/markdown-it": "*", @@ -13656,8 +11035,6 @@ }, "node_modules/markdown-it-implicit-figures": { "version": "0.12.0", - "resolved": "https://registry.npmjs.org/markdown-it-implicit-figures/-/markdown-it-implicit-figures-0.12.0.tgz", - "integrity": "sha512-IeD2V74f3ZBYrZ+bz/9uEGii0S61BYoD2731qsHTgYLlENUrTevlgODScScS1CK44/TV9ddlufGHCYCQueh1rw==", "license": "MIT", "engines": { "node": ">=0.10.0" @@ -13665,8 +11042,6 @@ }, "node_modules/marked": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/marked/-/marked-4.3.0.tgz", - "integrity": "sha512-PRsaiG84bK+AMvxziE/lCFss8juXjNaWzVbN5tXAm4XjeaS9NAHhop+PjQxz2A9h8Q4M/xGmzP8vqNwy6JeK0A==", "license": "MIT", "bin": { "marked": "bin/marked.js" @@ -13677,8 +11052,6 @@ }, "node_modules/matcher": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/matcher/-/matcher-5.0.0.tgz", - "integrity": "sha512-s2EMBOWtXFc8dgqvoAzKJXxNHibcdJMV0gwqKUaw9E2JBJuGUK7DrNKrA6g/i+v72TT16+6sVm5mS3thaMLQUw==", "dev": true, "license": "MIT", "dependencies": { @@ -13693,8 +11066,6 @@ }, "node_modules/math-intrinsics": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz", - "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -13702,8 +11073,6 @@ }, "node_modules/md5-hex": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/md5-hex/-/md5-hex-3.0.1.tgz", - "integrity": "sha512-BUiRtTtV39LIJwinWBjqVsU9xhdnz7/i889V859IBFpuqGAj6LuOvHv5XLbgZ2R7ptJoJaEcxkv88/h25T7Ciw==", "dev": true, "license": "MIT", "dependencies": { @@ -13715,8 +11084,6 @@ }, "node_modules/mdast-util-to-hast": { "version": "13.2.1", - "resolved": "https://registry.npmjs.org/mdast-util-to-hast/-/mdast-util-to-hast-13.2.1.tgz", - "integrity": "sha512-cctsq2wp5vTsLIcaymblUriiTcZd0CwWtCbLvrOzYCDZoWyMNV8sZ7krj09FSnsiJi3WVsHLM4k6Dq/yaPyCXA==", "license": "MIT", "dependencies": { "@types/hast": "^3.0.0", @@ -13736,20 +11103,14 @@ }, "node_modules/mdn-data": { "version": "2.12.2", - "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.12.2.tgz", - "integrity": "sha512-IEn+pegP1aManZuckezWCO+XZQDplx1366JoVhTpMpBB1sPey/SbveZQUosKiKiGYjg1wH4pMlNgXbCiYgihQA==", "license": "CC0-1.0" }, "node_modules/mdurl": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/mdurl/-/mdurl-2.0.0.tgz", - "integrity": "sha512-Lf+9+2r+Tdp5wXDXC4PcIBjTDtq4UKjCPMQhKIuzpJNW0b96kVqSwW0bT7FhRSfmAiFYgP+SCRvdrDozfh0U5w==", "license": "MIT" }, "node_modules/media-typer": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz", - "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -13757,8 +11118,6 @@ }, "node_modules/memoize": { "version": "10.2.0", - "resolved": "https://registry.npmjs.org/memoize/-/memoize-10.2.0.tgz", - "integrity": "sha512-DeC6b7QBrZsRs3Y02A6A7lQyzFbsQbqgjI6UW0GigGWV+u1s25TycMr0XHZE4cJce7rY/vyw2ctMQqfDkIhUEA==", "dev": true, "license": "MIT", "dependencies": { @@ -13773,8 +11132,6 @@ }, "node_modules/meow": { "version": "12.1.1", - "resolved": "https://registry.npmjs.org/meow/-/meow-12.1.1.tgz", - "integrity": "sha512-BhXM0Au22RwUneMPwSCnyhTOizdWoIEPU9sp0Aqa1PnDMR5Wv2FGXYDjuzJEIX+Eo2Rb8xuYe5jrnm5QowQFkw==", "dev": true, "license": "MIT", "engines": { @@ -13786,8 +11143,6 @@ }, "node_modules/merge-descriptors": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz", - "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/sindresorhus" @@ -13795,8 +11150,6 @@ }, "node_modules/merge2": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz", - "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "license": "MIT", "engines": { "node": ">= 8" @@ -13804,8 +11157,6 @@ }, "node_modules/methods": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", - "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -13813,15 +11164,11 @@ }, "node_modules/micro-spelling-correcter": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/micro-spelling-correcter/-/micro-spelling-correcter-1.1.1.tgz", - "integrity": "sha512-lkJ3Rj/mtjlRcHk6YyCbvZhyWTOzdBvTHsxMmZSk5jxN1YyVSQ+JETAom55mdzfcyDrY/49Z7UCW760BK30crg==", "dev": true, "license": "CC0-1.0" }, "node_modules/micromark-util-character": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/micromark-util-character/-/micromark-util-character-2.1.1.tgz", - "integrity": "sha512-wv8tdUTJ3thSFFFJKtpYKOYiGP2+v96Hvk4Tu8KpCAsTMs6yi+nVmGh1syvSCsaxz45J6Jbw+9DD6g97+NV67Q==", "funding": [ { "type": "GitHub Sponsors", @@ -13840,8 +11187,6 @@ }, "node_modules/micromark-util-encode": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/micromark-util-encode/-/micromark-util-encode-2.0.1.tgz", - "integrity": "sha512-c3cVx2y4KqUnwopcO9b/SCdo2O67LwJJ/UyqGfbigahfegL9myoEFoDYZgkT7f36T0bLrM9hZTAaAyH+PCAXjw==", "funding": [ { "type": "GitHub Sponsors", @@ -13856,8 +11201,6 @@ }, "node_modules/micromark-util-sanitize-uri": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/micromark-util-sanitize-uri/-/micromark-util-sanitize-uri-2.0.1.tgz", - "integrity": "sha512-9N9IomZ/YuGGZZmQec1MbgxtlgougxTodVwDzzEouPKo3qFWvymFHWcnDi2vzV1ff6kas9ucW+o3yzJK9YB1AQ==", "funding": [ { "type": "GitHub Sponsors", @@ -13877,8 +11220,6 @@ }, "node_modules/micromark-util-symbol": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/micromark-util-symbol/-/micromark-util-symbol-2.0.1.tgz", - "integrity": "sha512-vs5t8Apaud9N28kgCrRUdEed4UJ+wWNvicHLPxCa9ENlYuAY31M0ETy5y1vA33YoNPDFTghEbnh6efaE8h4x0Q==", "funding": [ { "type": "GitHub Sponsors", @@ -13893,8 +11234,6 @@ }, "node_modules/micromark-util-types": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/micromark-util-types/-/micromark-util-types-2.0.2.tgz", - "integrity": "sha512-Yw0ECSpJoViF1qTU4DC6NwtC4aWGt1EkzaQB8KPPyCRR8z9TWeV0HbEFGTO+ZY1wB22zmxnJqhPyTpOVCpeHTA==", "funding": [ { "type": "GitHub Sponsors", @@ -13909,8 +11248,6 @@ }, "node_modules/micromatch": { "version": "4.0.8", - "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz", - "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==", "license": "MIT", "dependencies": { "braces": "^3.0.3", @@ -13922,8 +11259,6 @@ }, "node_modules/micromatch/node_modules/picomatch": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "license": "MIT", "engines": { "node": ">=8.6" @@ -13934,8 +11269,6 @@ }, "node_modules/mime": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz", - "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==", "license": "MIT", "bin": { "mime": "cli.js" @@ -13946,8 +11279,6 @@ }, "node_modules/mime-db": { "version": "1.54.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.54.0.tgz", - "integrity": "sha512-aU5EJuIN2WDemCcAp2vFBfp/m4EAhWJnUNSSw0ixs7/kXbd6Pg64EmwJkNdFhB8aWt1sH2CTXrLxo/iAGV3oPQ==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -13955,8 +11286,6 @@ }, "node_modules/mime-types": { "version": "2.1.35", - "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz", - "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==", "license": "MIT", "dependencies": { "mime-db": "1.52.0" @@ -13967,8 +11296,6 @@ }, "node_modules/mime-types/node_modules/mime-db": { "version": "1.52.0", - "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz", - "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -13976,8 +11303,6 @@ }, "node_modules/mimic-function": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/mimic-function/-/mimic-function-5.0.1.tgz", - "integrity": "sha512-VP79XUPxV2CigYP3jWwAUFSku2aKqBH7uTAapFWCBqutsbmDo96KY5o8uh6U+/YSIn5OxJnXp73beVkpqMIGhA==", "dev": true, "license": "MIT", "engines": { @@ -13989,14 +11314,10 @@ }, "node_modules/minimalistic-assert": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz", - "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==", "license": "ISC" }, "node_modules/minimatch": { "version": "10.1.1", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-10.1.1.tgz", - "integrity": "sha512-enIvLvRAFZYXJzkCYG5RKmPfrFArdLv+R+lbQ53BmIMLIry74bjKzX6iHAm8WYamJkhSSEabrWN5D97XnKObjQ==", "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/brace-expansion": "^5.0.0" @@ -14010,8 +11331,6 @@ }, "node_modules/minimist": { "version": "1.2.8", - "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz", - "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==", "license": "MIT", "funding": { "url": "https://github.com/sponsors/ljharb" @@ -14019,8 +11338,6 @@ }, "node_modules/minipass": { "version": "7.1.2", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", - "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", "license": "ISC", "engines": { "node": ">=16 || 14 >=14.17" @@ -14028,8 +11345,6 @@ }, "node_modules/minipass-collect": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz", - "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==", "license": "ISC", "dependencies": { "minipass": "^7.0.3" @@ -14038,10 +11353,23 @@ "node": ">=16 || 14 >=14.17" } }, + "node_modules/minipass-fetch": { + "version": "5.0.0", + "license": "MIT", + "dependencies": { + "minipass": "^7.0.3", + "minipass-sized": "^1.0.3", + "minizlib": "^3.0.1" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + }, + "optionalDependencies": { + "encoding": "^0.1.13" + } + }, "node_modules/minipass-flush": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz", - "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==", "license": "ISC", "dependencies": { "minipass": "^3.0.0" @@ -14052,8 +11380,6 @@ }, "node_modules/minipass-flush/node_modules/minipass": { "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "license": "ISC", "dependencies": { "yallist": "^4.0.0" @@ -14064,14 +11390,10 @@ }, "node_modules/minipass-flush/node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "license": "ISC" }, "node_modules/minipass-pipeline": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz", - "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==", "license": "ISC", "dependencies": { "minipass": "^3.0.0" @@ -14082,8 +11404,6 @@ }, "node_modules/minipass-pipeline/node_modules/minipass": { "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "license": "ISC", "dependencies": { "yallist": "^4.0.0" @@ -14094,14 +11414,10 @@ }, "node_modules/minipass-pipeline/node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "license": "ISC" }, "node_modules/minipass-sized": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/minipass-sized/-/minipass-sized-1.0.3.tgz", - "integrity": "sha512-MbkQQ2CTiBMlA2Dm/5cY+9SWFEN8pzzOXi6rlM5Xxq0Yqbda5ZQy9sU75a673FE9ZK0Zsbr6Y5iP6u9nktfg2g==", "license": "ISC", "dependencies": { "minipass": "^3.0.0" @@ -14112,8 +11428,6 @@ }, "node_modules/minipass-sized/node_modules/minipass": { "version": "3.3.6", - "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz", - "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==", "license": "ISC", "dependencies": { "yallist": "^4.0.0" @@ -14124,20 +11438,14 @@ }, "node_modules/minipass-sized/node_modules/yallist": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz", - "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==", "license": "ISC" }, "node_modules/minisearch": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/minisearch/-/minisearch-7.2.0.tgz", - "integrity": "sha512-dqT2XBYUOZOiC5t2HRnwADjhNS2cecp9u+TJRiJ1Qp/f5qjkeT5APcGPjHw+bz89Ms8Jp+cG4AlE+QZ/QnDglg==", "license": "MIT" }, "node_modules/minizlib": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-3.1.0.tgz", - "integrity": "sha512-KZxYo1BUkWD2TVFLr0MQoM8vUUigWD3LlD83a/75BqC+4qE0Hb1Vo5v1FgcfaNXvfXzr+5EhQ6ing/CaBijTlw==", "license": "MIT", "dependencies": { "minipass": "^7.1.2" @@ -14148,14 +11456,10 @@ }, "node_modules/mitt": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/mitt/-/mitt-3.0.1.tgz", - "integrity": "sha512-vKivATfr97l2/QBCYAkXYDbrIWPM2IIKEl7YPhjCvKlG3kE2gm+uBo6nEXK3M5/Ffh/FLpKExzOQ3JJoJGFKBw==", "license": "MIT" }, "node_modules/mkdirp": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz", - "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "license": "MIT", "bin": { "mkdirp": "bin/cmd.js" @@ -14166,8 +11470,6 @@ }, "node_modules/morgan": { "version": "1.10.1", - "resolved": "https://registry.npmjs.org/morgan/-/morgan-1.10.1.tgz", - "integrity": "sha512-223dMRJtI/l25dJKWpgij2cMtywuG/WiUKXdvwfbhGKBhy1puASqXwFzmWZ7+K73vUPoR7SS2Qz2cI/g9MKw0A==", "dev": true, "license": "MIT", "dependencies": { @@ -14183,8 +11485,6 @@ }, "node_modules/morgan/node_modules/on-finished": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz", - "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==", "dev": true, "license": "MIT", "dependencies": { @@ -14196,14 +11496,10 @@ }, "node_modules/ms": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz", - "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==", "license": "MIT" }, "node_modules/multimatch": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/multimatch/-/multimatch-5.0.0.tgz", - "integrity": "sha512-ypMKuglUrZUD99Tk2bUQ+xNQj43lPEfAeX2o9cTteAmShXy2VHDJpuwu1o0xqoKCt9jLVAvwyFKdLTPXKAfJyA==", "dev": true, "license": "MIT", "dependencies": { @@ -14222,8 +11518,6 @@ }, "node_modules/multimatch/node_modules/arrify": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/arrify/-/arrify-2.0.1.tgz", - "integrity": "sha512-3duEwti880xqi4eAMN8AyR4a0ByT90zoYdLlevfrvU43vb0YZwZVfxOgxWrLXXXpyugL0hNZc9G6BiB5B3nUug==", "dev": true, "license": "MIT", "engines": { @@ -14232,8 +11526,6 @@ }, "node_modules/multimatch/node_modules/minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "license": "ISC", "dependencies": { @@ -14245,8 +11537,6 @@ }, "node_modules/mz": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz", - "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==", "license": "MIT", "dependencies": { "any-promise": "^1.0.0", @@ -14256,8 +11546,6 @@ }, "node_modules/nanoid": { "version": "3.3.11", - "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.11.tgz", - "integrity": "sha512-N8SpfPUnUp1bK+PMYW8qSWdl9U+wwNWI4QKxOYDy9JAro3WMX7p2OeVRF9v+347pnakNevPmiHhNmZ2HbFA76w==", "funding": [ { "type": "github", @@ -14274,15 +11562,11 @@ }, "node_modules/natural-compare": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", - "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw==", "dev": true, "license": "MIT" }, "node_modules/negotiator": { "version": "0.6.4", - "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz", - "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==", "license": "MIT", "engines": { "node": ">= 0.6" @@ -14290,15 +11574,11 @@ }, "node_modules/neo-async": { "version": "2.6.2", - "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz", - "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw==", "dev": true, "license": "MIT" }, "node_modules/node-fetch": { "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", "dev": true, "license": "MIT", "dependencies": { @@ -14318,8 +11598,6 @@ }, "node_modules/node-gyp": { "version": "12.1.0", - "resolved": "https://registry.npmjs.org/node-gyp/-/node-gyp-12.1.0.tgz", - "integrity": "sha512-W+RYA8jBnhSr2vrTtlPYPc1K+CSjGpVDRZxcqJcERZ8ND3A1ThWPHRwctTx3qC3oW99jt726jhdz3Y6ky87J4g==", "license": "MIT", "dependencies": { "env-paths": "^2.2.0", @@ -14342,8 +11620,6 @@ }, "node_modules/node-gyp-build": { "version": "4.8.4", - "resolved": "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-4.8.4.tgz", - "integrity": "sha512-LA4ZjwlnUblHVgq0oBF3Jl/6h/Nvs5fzBLwdEF4nuxnFdsfajde4WfxtJr3CaiH+F6ewcIB/q4jQ4UzPyid+CQ==", "dev": true, "license": "MIT", "bin": { @@ -14354,17 +11630,40 @@ }, "node_modules/node-gyp/node_modules/abbrev": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/abbrev/-/abbrev-4.0.0.tgz", - "integrity": "sha512-a1wflyaL0tHtJSmLSOVybYhy22vRih4eduhhrkcjgrWGnRfrZtovJ2FRjxuTtkkj47O/baf0R86QU5OuYpz8fA==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" } }, + "node_modules/node-gyp/node_modules/make-fetch-happen": { + "version": "15.0.3", + "license": "ISC", + "dependencies": { + "@npmcli/agent": "^4.0.0", + "cacache": "^20.0.1", + "http-cache-semantics": "^4.1.1", + "minipass": "^7.0.2", + "minipass-fetch": "^5.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^1.0.0", + "proc-log": "^6.0.0", + "promise-retry": "^2.0.1", + "ssri": "^13.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "node_modules/node-gyp/node_modules/negotiator": { + "version": "1.0.0", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "node_modules/node-gyp/node_modules/nopt": { "version": "9.0.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-9.0.0.tgz", - "integrity": "sha512-Zhq3a+yFKrYwSBluL4H9XP3m3y5uvQkB/09CwDruCiRmR/UJYnn9W4R48ry0uGC70aeTPKLynBtscP9efFFcPw==", "license": "ISC", "dependencies": { "abbrev": "^4.0.0" @@ -14378,8 +11677,6 @@ }, "node_modules/node-gyp/node_modules/proc-log": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.0.0.tgz", - "integrity": "sha512-KG/XsTDN901PNfPfAMmj6N/Ywg9tM+bHK8pAz+27fS4N4Pcr+4zoYBOcGSBu6ceXYNPxkLpa4ohtfxV1XcLAfA==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -14387,8 +11684,6 @@ }, "node_modules/node-preload": { "version": "0.2.1", - "resolved": "https://registry.npmjs.org/node-preload/-/node-preload-0.2.1.tgz", - "integrity": "sha512-RM5oyBy45cLEoHqCeh+MNuFAxO0vTFBLskvQbOKnEE7YTTSN4tbN8QWDIPQ6L+WvKsB/qLEGpYe2ZZ9d4W9OIQ==", "dev": true, "license": "MIT", "dependencies": { @@ -14400,14 +11695,10 @@ }, "node_modules/node-releases": { "version": "2.0.27", - "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.27.tgz", - "integrity": "sha512-nmh3lCkYZ3grZvqcCH+fjmQ7X+H0OeZgP40OierEaAptX4XofMh5kwNbWh7lBduUzCcV/8kZ+NDLCwm2iorIlA==", "license": "MIT" }, "node_modules/node-stream-zip": { "version": "1.15.0", - "resolved": "https://registry.npmjs.org/node-stream-zip/-/node-stream-zip-1.15.0.tgz", - "integrity": "sha512-LN4fydt9TqhZhThkZIVQnF9cwjU3qmUH9h78Mx/K7d3VvfRqqwthLwJEUOEL0QPZ0XQmNN7be5Ggit5+4dq3Bw==", "license": "MIT", "engines": { "node": ">=0.12.0" @@ -14419,8 +11710,6 @@ }, "node_modules/nofilter": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/nofilter/-/nofilter-3.1.0.tgz", - "integrity": "sha512-l2NNj07e9afPnhAhvgVrCD/oy2Ai1yfLpuo3EpiO1jFTsB4sFz6oIfAfSZyQzVpkZQ9xS8ZS5g1jCBgq4Hwo0g==", "dev": true, "license": "MIT", "engines": { @@ -14429,8 +11718,6 @@ }, "node_modules/nopt": { "version": "8.1.0", - "resolved": "https://registry.npmjs.org/nopt/-/nopt-8.1.0.tgz", - "integrity": "sha512-ieGu42u/Qsa4TFktmaKEwM6MQH0pOWnaB3htzh0JRtx84+Mebc0cbZYN5bC+6WTZ4+77xrL9Pn5m7CV6VIkV7A==", "license": "ISC", "dependencies": { "abbrev": "^3.0.0" @@ -14444,8 +11731,6 @@ }, "node_modules/normalize-package-data": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-6.0.2.tgz", - "integrity": "sha512-V6gygoYb/5EmNI+MEGrWkC+e6+Rr7mTmfHrxDbLzxQogBkgzo76rkok0Am6thgSF7Mv2nLOajAJj5vDJZEFn7g==", "license": "BSD-2-Clause", "dependencies": { "hosted-git-info": "^7.0.0", @@ -14458,8 +11743,6 @@ }, "node_modules/normalize-package-data/node_modules/hosted-git-info": { "version": "7.0.2", - "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz", - "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==", "license": "ISC", "dependencies": { "lru-cache": "^10.0.1" @@ -14470,14 +11753,10 @@ }, "node_modules/normalize-package-data/node_modules/lru-cache": { "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "license": "ISC" }, "node_modules/normalize-path": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", - "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==", "license": "MIT", "engines": { "node": ">=0.10.0" @@ -14485,8 +11764,6 @@ }, "node_modules/normalize-range": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz", - "integrity": "sha512-bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA==", "license": "MIT", "engines": { "node": ">=0.10.0" @@ -14494,8 +11771,6 @@ }, "node_modules/npm-bundled": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/npm-bundled/-/npm-bundled-5.0.0.tgz", - "integrity": "sha512-JLSpbzh6UUXIEoqPsYBvVNVmyrjVZ1fzEFbqxKkTJQkWBO3xFzFT+KDnSKQWwOQNbuWRwt5LSD6HOTLGIWzfrw==", "license": "ISC", "dependencies": { "npm-normalize-package-bin": "^5.0.0" @@ -14506,8 +11781,6 @@ }, "node_modules/npm-install-checks": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/npm-install-checks/-/npm-install-checks-8.0.0.tgz", - "integrity": "sha512-ScAUdMpyzkbpxoNekQ3tNRdFI8SJ86wgKZSQZdUxT+bj0wVFpsEMWnkXP0twVe1gJyNF5apBWDJhhIbgrIViRA==", "license": "BSD-2-Clause", "dependencies": { "semver": "^7.1.1" @@ -14518,15 +11791,11 @@ }, "node_modules/npm-license-corrections": { "version": "1.9.0", - "resolved": "https://registry.npmjs.org/npm-license-corrections/-/npm-license-corrections-1.9.0.tgz", - "integrity": "sha512-9Tq6y6zop5lsZy6dInbgrCLnqtuN+3jBc9NCusKjbeQL4LRudDkvmCYyInsDOaKN7GIVbBSvDto5MnEqYXVhxQ==", "dev": true, "license": "CC0-1.0" }, "node_modules/npm-normalize-package-bin": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-5.0.0.tgz", - "integrity": "sha512-CJi3OS4JLsNMmr2u07OJlhcrPxCeOeP/4xq67aWNai6TNWWbTrlNDgl8NcFKVlcBKp18GPj+EzbNIgrBfZhsag==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -14534,8 +11803,6 @@ }, "node_modules/npm-package-arg": { "version": "13.0.2", - "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-13.0.2.tgz", - "integrity": "sha512-IciCE3SY3uE84Ld8WZU23gAPPV9rIYod4F+rc+vJ7h7cwAJt9Vk6TVsK60ry7Uj3SRS3bqRRIGuTp9YVlk6WNA==", "license": "ISC", "dependencies": { "hosted-git-info": "^9.0.0", @@ -14549,8 +11816,6 @@ }, "node_modules/npm-package-arg/node_modules/proc-log": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.0.0.tgz", - "integrity": "sha512-KG/XsTDN901PNfPfAMmj6N/Ywg9tM+bHK8pAz+27fS4N4Pcr+4zoYBOcGSBu6ceXYNPxkLpa4ohtfxV1XcLAfA==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -14558,8 +11823,6 @@ }, "node_modules/npm-packlist": { "version": "10.0.3", - "resolved": "https://registry.npmjs.org/npm-packlist/-/npm-packlist-10.0.3.tgz", - "integrity": "sha512-zPukTwJMOu5X5uvm0fztwS5Zxyvmk38H/LfidkOMt3gbZVCyro2cD/ETzwzVPcWZA3JOyPznfUN/nkyFiyUbxg==", "license": "ISC", "dependencies": { "ignore-walk": "^8.0.0", @@ -14571,8 +11834,6 @@ }, "node_modules/npm-packlist/node_modules/proc-log": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.0.0.tgz", - "integrity": "sha512-KG/XsTDN901PNfPfAMmj6N/Ywg9tM+bHK8pAz+27fS4N4Pcr+4zoYBOcGSBu6ceXYNPxkLpa4ohtfxV1XcLAfA==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -14580,8 +11841,6 @@ }, "node_modules/npm-pick-manifest": { "version": "11.0.3", - "resolved": "https://registry.npmjs.org/npm-pick-manifest/-/npm-pick-manifest-11.0.3.tgz", - "integrity": "sha512-buzyCfeoGY/PxKqmBqn1IUJrZnUi1VVJTdSSRPGI60tJdUhUoSQFhs0zycJokDdOznQentgrpf8LayEHyyYlqQ==", "license": "ISC", "dependencies": { "npm-install-checks": "^8.0.0", @@ -14595,8 +11854,6 @@ }, "node_modules/npm-registry-fetch": { "version": "19.1.1", - "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-19.1.1.tgz", - "integrity": "sha512-TakBap6OM1w0H73VZVDf44iFXsOS3h+L4wVMXmbWOQroZgFhMch0juN6XSzBNlD965yIKvWg2dfu7NSiaYLxtw==", "license": "ISC", "dependencies": { "@npmcli/redact": "^4.0.0", @@ -14612,27 +11869,35 @@ "node": "^20.17.0 || >=22.9.0" } }, - "node_modules/npm-registry-fetch/node_modules/minipass-fetch": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/minipass-fetch/-/minipass-fetch-5.0.0.tgz", - "integrity": "sha512-fiCdUALipqgPWrOVTz9fw0XhcazULXOSU6ie40DDbX1F49p1dBrSRBuswndTx1x3vEb/g0FT7vC4c4C2u/mh3A==", - "license": "MIT", + "node_modules/npm-registry-fetch/node_modules/make-fetch-happen": { + "version": "15.0.3", + "license": "ISC", "dependencies": { - "minipass": "^7.0.3", - "minipass-sized": "^1.0.3", - "minizlib": "^3.0.1" + "@npmcli/agent": "^4.0.0", + "cacache": "^20.0.1", + "http-cache-semantics": "^4.1.1", + "minipass": "^7.0.2", + "minipass-fetch": "^5.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^1.0.0", + "proc-log": "^6.0.0", + "promise-retry": "^2.0.1", + "ssri": "^13.0.0" }, "engines": { "node": "^20.17.0 || >=22.9.0" - }, - "optionalDependencies": { - "encoding": "^0.1.13" + } + }, + "node_modules/npm-registry-fetch/node_modules/negotiator": { + "version": "1.0.0", + "license": "MIT", + "engines": { + "node": ">= 0.6" } }, "node_modules/npm-registry-fetch/node_modules/proc-log": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.0.0.tgz", - "integrity": "sha512-KG/XsTDN901PNfPfAMmj6N/Ywg9tM+bHK8pAz+27fS4N4Pcr+4zoYBOcGSBu6ceXYNPxkLpa4ohtfxV1XcLAfA==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -14640,8 +11905,6 @@ }, "node_modules/npm-run-path": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-6.0.0.tgz", - "integrity": "sha512-9qny7Z9DsQU8Ou39ERsPU4OZQlSTP47ShQzuKZ6PRXpYLtIFgl/DEBYEXKlvcEa+9tHVcK8CF81Y2V72qaZhWA==", "dev": true, "license": "MIT", "dependencies": { @@ -14657,8 +11920,6 @@ }, "node_modules/npm-run-path/node_modules/path-key": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-4.0.0.tgz", - "integrity": "sha512-haREypq7xkM7ErfgIyA0z+Bj4AGKlMSdlQE2jvJo6huWD1EdkKYV+G/T4nq0YEF2vgTT8kqMFKo1uHn950r4SQ==", "dev": true, "license": "MIT", "engines": { @@ -14670,8 +11931,6 @@ }, "node_modules/npm-run-path/node_modules/unicorn-magic": { "version": "0.3.0", - "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.3.0.tgz", - "integrity": "sha512-+QBBXBCvifc56fsbuxZQ6Sic3wqqc3WWaqxs58gvJrcOuN83HGTCwz3oS5phzU9LthRNE9VrJCFCLUgHeeFnfA==", "dev": true, "license": "MIT", "engines": { @@ -14683,8 +11942,6 @@ }, "node_modules/nth-check": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz", - "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==", "license": "BSD-2-Clause", "dependencies": { "boolbase": "^1.0.0" @@ -14695,8 +11952,6 @@ }, "node_modules/nyc": { "version": "17.1.0", - "resolved": "https://registry.npmjs.org/nyc/-/nyc-17.1.0.tgz", - "integrity": "sha512-U42vQ4czpKa0QdI1hu950XuNhYqgoM+ZF1HT+VuUHL9hPfDPVvNQyltmMqdE9bUHMVa+8yNbc3QKTj8zQhlVxQ==", "dev": true, "license": "ISC", "dependencies": { @@ -14737,8 +11992,6 @@ }, "node_modules/nyc/node_modules/ansi-regex": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "dev": true, "license": "MIT", "engines": { @@ -14747,8 +12000,6 @@ }, "node_modules/nyc/node_modules/ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "dev": true, "license": "MIT", "dependencies": { @@ -14763,8 +12014,6 @@ }, "node_modules/nyc/node_modules/camelcase": { "version": "5.3.1", - "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz", - "integrity": "sha512-L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg==", "dev": true, "license": "MIT", "engines": { @@ -14773,8 +12022,6 @@ }, "node_modules/nyc/node_modules/cliui": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz", - "integrity": "sha512-t6wbgtoCXvAzst7QgXxJYqPt0usEfbgQdftEPbLL/cvv6HPE5VgvqCuAIDR0NgU52ds6rFwqrgakNLrHEjCbrQ==", "dev": true, "license": "ISC", "dependencies": { @@ -14785,15 +12032,11 @@ }, "node_modules/nyc/node_modules/convert-source-map": { "version": "1.9.0", - "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-1.9.0.tgz", - "integrity": "sha512-ASFBup0Mz1uyiIjANan1jzLQami9z1PoYSZCiiYW2FczPbenXc45FZdBZLzOT+r6+iciuEModtmCti+hjaAk0A==", "dev": true, "license": "MIT" }, "node_modules/nyc/node_modules/find-up": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz", - "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==", "dev": true, "license": "MIT", "dependencies": { @@ -14806,9 +12049,6 @@ }, "node_modules/nyc/node_modules/glob": { "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "license": "ISC", "dependencies": { @@ -14828,8 +12068,6 @@ }, "node_modules/nyc/node_modules/locate-path": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz", - "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==", "dev": true, "license": "MIT", "dependencies": { @@ -14841,8 +12079,6 @@ }, "node_modules/nyc/node_modules/make-dir": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "license": "MIT", "dependencies": { @@ -14857,8 +12093,6 @@ }, "node_modules/nyc/node_modules/minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "license": "ISC", "dependencies": { @@ -14870,8 +12104,6 @@ }, "node_modules/nyc/node_modules/p-limit": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz", - "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==", "dev": true, "license": "MIT", "dependencies": { @@ -14886,8 +12118,6 @@ }, "node_modules/nyc/node_modules/p-locate": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz", - "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==", "dev": true, "license": "MIT", "dependencies": { @@ -14899,8 +12129,6 @@ }, "node_modules/nyc/node_modules/p-map": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-3.0.0.tgz", - "integrity": "sha512-d3qXVTF/s+W+CdJ5A29wywV2n8CQQYahlgz2bFiA+4eVNJbHJodPZ+/gXwPGh0bOqA+j8S+6+ckmvLGPk1QpxQ==", "dev": true, "license": "MIT", "dependencies": { @@ -14912,8 +12140,6 @@ }, "node_modules/nyc/node_modules/path-exists": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, "license": "MIT", "engines": { @@ -14922,9 +12148,6 @@ }, "node_modules/nyc/node_modules/rimraf": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, "license": "ISC", "dependencies": { @@ -14939,8 +12162,6 @@ }, "node_modules/nyc/node_modules/semver": { "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "license": "ISC", "bin": { @@ -14949,15 +12170,11 @@ }, "node_modules/nyc/node_modules/signal-exit": { "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true, "license": "ISC" }, "node_modules/nyc/node_modules/strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "dev": true, "license": "MIT", "dependencies": { @@ -14969,8 +12186,6 @@ }, "node_modules/nyc/node_modules/wrap-ansi": { "version": "6.2.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-6.2.0.tgz", - "integrity": "sha512-r6lPcBGxZXlIcymEu7InxDMhdW0KDxpLgoFLcguasxCaJ/SOIZwINatK9KY/tf+ZrlywOKU0UDj3ATXUBfxJXA==", "dev": true, "license": "MIT", "dependencies": { @@ -14984,15 +12199,11 @@ }, "node_modules/nyc/node_modules/y18n": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-4.0.3.tgz", - "integrity": "sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==", "dev": true, "license": "ISC" }, "node_modules/nyc/node_modules/yargs": { "version": "15.4.1", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-15.4.1.tgz", - "integrity": "sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A==", "dev": true, "license": "MIT", "dependencies": { @@ -15014,8 +12225,6 @@ }, "node_modules/nyc/node_modules/yargs-parser": { "version": "18.1.3", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-18.1.3.tgz", - "integrity": "sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ==", "dev": true, "license": "ISC", "dependencies": { @@ -15028,8 +12237,6 @@ }, "node_modules/object-assign": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz", - "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==", "license": "MIT", "engines": { "node": ">=0.10.0" @@ -15037,15 +12244,11 @@ }, "node_modules/object-deep-merge": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/object-deep-merge/-/object-deep-merge-2.0.0.tgz", - "integrity": "sha512-3DC3UMpeffLTHiuXSy/UG4NOIYTLlY9u3V82+djSCLYClWobZiS4ivYzpIUWrRY/nfsJ8cWsKyG3QfyLePmhvg==", "dev": true, "license": "MIT" }, "node_modules/object-hash": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz", - "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==", "license": "MIT", "engines": { "node": ">= 6" @@ -15053,8 +12256,6 @@ }, "node_modules/object-inspect": { "version": "1.13.4", - "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz", - "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -15065,8 +12266,6 @@ }, "node_modules/object-keys": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz", - "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==", "dev": true, "license": "MIT", "engines": { @@ -15075,8 +12274,6 @@ }, "node_modules/object.assign": { "version": "4.1.7", - "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz", - "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==", "dev": true, "license": "MIT", "dependencies": { @@ -15096,14 +12293,10 @@ }, "node_modules/obuf": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz", - "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==", "license": "MIT" }, "node_modules/on-finished": { "version": "2.4.1", - "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz", - "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==", "license": "MIT", "dependencies": { "ee-first": "1.1.1" @@ -15114,8 +12307,6 @@ }, "node_modules/on-headers": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.1.0.tgz", - "integrity": "sha512-737ZY3yNnXy37FHkQxPzt4UZ2UWPWiCZWLvFZ4fu5cueciegX0zGPnrlY6bwRg4FdQOe9YU8MkmJwGhoMybl8A==", "license": "MIT", "engines": { "node": ">= 0.8" @@ -15123,8 +12314,6 @@ }, "node_modules/once": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", - "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==", "dev": true, "license": "ISC", "dependencies": { @@ -15133,8 +12322,6 @@ }, "node_modules/oniguruma-to-es": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/oniguruma-to-es/-/oniguruma-to-es-3.1.1.tgz", - "integrity": "sha512-bUH8SDvPkH3ho3dvwJwfonjlQ4R80vjyvrU8YpxuROddv55vAEJrTuCuCVUhhsHbtlD9tGGbaNApGQckXhS8iQ==", "license": "MIT", "dependencies": { "emoji-regex-xs": "^1.0.0", @@ -15144,14 +12331,10 @@ }, "node_modules/only": { "version": "0.0.2", - "resolved": "https://registry.npmjs.org/only/-/only-0.0.2.tgz", - "integrity": "sha512-Fvw+Jemq5fjjyWz6CpKx6w9s7xxqo3+JCyM0WXWeCSOboZ8ABkyvP8ID4CZuChA/wxSx+XSJmdOm8rGVyJ1hdQ==", "dev": true }, "node_modules/open": { "version": "8.4.2", - "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz", - "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==", "dev": true, "license": "MIT", "dependencies": { @@ -15168,8 +12351,6 @@ }, "node_modules/open-cli": { "version": "8.0.0", - "resolved": "https://registry.npmjs.org/open-cli/-/open-cli-8.0.0.tgz", - "integrity": "sha512-3muD3BbfLyzl+aMVSEfn2FfOqGdPYR0O4KNnxXsLEPE2q9OSjBfJAaB6XKbrUzLgymoSMejvb5jpXJfru/Ko2A==", "dev": true, "license": "MIT", "dependencies": { @@ -15191,8 +12372,6 @@ }, "node_modules/open-cli/node_modules/define-lazy-prop": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz", - "integrity": "sha512-N+MeXYoqr3pOgn8xfyRPREN7gHakLYjhsHhWGT3fWAiL4IkAt0iDw14QiiEm2bE30c5XX5q0FtAA3CK5f9/BUg==", "dev": true, "license": "MIT", "engines": { @@ -15204,8 +12383,6 @@ }, "node_modules/open-cli/node_modules/open": { "version": "10.2.0", - "resolved": "https://registry.npmjs.org/open/-/open-10.2.0.tgz", - "integrity": "sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA==", "dev": true, "license": "MIT", "dependencies": { @@ -15223,8 +12400,6 @@ }, "node_modules/optionator": { "version": "0.9.4", - "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz", - "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==", "dev": true, "license": "MIT", "dependencies": { @@ -15241,8 +12416,6 @@ }, "node_modules/own-keys": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz", - "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==", "dev": true, "license": "MIT", "dependencies": { @@ -15259,8 +12432,6 @@ }, "node_modules/p-limit": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-4.0.0.tgz", - "integrity": "sha512-5b0R4txpzjPWVw/cXXUResoD4hb6U/x9BH08L7nw+GN1sezDzPdxeRvpc9c433fZhBan/wusjbCsqwqm4EIBIQ==", "dev": true, "license": "MIT", "dependencies": { @@ -15275,8 +12446,6 @@ }, "node_modules/p-locate": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-6.0.0.tgz", - "integrity": "sha512-wPrq66Llhl7/4AGC6I+cqxT07LhXvWL08LNXz1fENOw0Ap4sRZZ/gZpTTJ5jpurzzzfS2W/Ge9BY3LgLjCShcw==", "dev": true, "license": "MIT", "dependencies": { @@ -15291,8 +12460,6 @@ }, "node_modules/p-map": { "version": "7.0.4", - "resolved": "https://registry.npmjs.org/p-map/-/p-map-7.0.4.tgz", - "integrity": "sha512-tkAQEw8ysMzmkhgw8k+1U/iPhWNhykKnSk4Rd5zLoPJCuJaGRPo6YposrZgaxHKzDHdDWWZvE/Sk7hsL2X/CpQ==", "license": "MIT", "engines": { "node": ">=18" @@ -15303,8 +12470,6 @@ }, "node_modules/p-try": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz", - "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==", "license": "MIT", "engines": { "node": ">=6" @@ -15312,8 +12477,6 @@ }, "node_modules/package-config": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/package-config/-/package-config-5.0.0.tgz", - "integrity": "sha512-GYTTew2slBcYdvRHqjhwaaydVMvn/qrGC323+nKclYioNSLTDUM/lGgtGTgyHVtYcozb+XkE8CNhwcraOmZ9Mg==", "dev": true, "license": "MIT", "dependencies": { @@ -15329,8 +12492,6 @@ }, "node_modules/package-hash": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/package-hash/-/package-hash-4.0.0.tgz", - "integrity": "sha512-whdkPIooSu/bASggZ96BWVvZTRMOFxnyUG5PnTSGKoJE2gd5mbVNmR2Nj20QFzxYYgAXpoqC+AiXzl+UMRh7zQ==", "dev": true, "license": "ISC", "dependencies": { @@ -15345,8 +12506,6 @@ }, "node_modules/package-json": { "version": "10.0.1", - "resolved": "https://registry.npmjs.org/package-json/-/package-json-10.0.1.tgz", - "integrity": "sha512-ua1L4OgXSBdsu1FPb7F3tYH0F48a6kxvod4pLUlGY9COeJAJQNX/sNH2IiEmsxw7lqYiAwrdHMjz1FctOsyDQg==", "license": "MIT", "dependencies": { "ky": "^1.2.0", @@ -15363,14 +12522,10 @@ }, "node_modules/package-json-from-dist": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz", - "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw==", "license": "BlueOak-1.0.0" }, "node_modules/pacote": { "version": "21.0.4", - "resolved": "https://registry.npmjs.org/pacote/-/pacote-21.0.4.tgz", - "integrity": "sha512-RplP/pDW0NNNDh3pnaoIWYPvNenS7UqMbXyvMqJczosiFWTeGGwJC2NQBLqKf4rGLFfwCOnntw1aEp9Jiqm1MA==", "license": "ISC", "dependencies": { "@npmcli/git": "^7.0.0", @@ -15400,8 +12555,6 @@ }, "node_modules/pacote/node_modules/proc-log": { "version": "6.1.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-6.1.0.tgz", - "integrity": "sha512-iG+GYldRf2BQ0UDUAd6JQ/RwzaQy6mXmsk/IzlYyal4A4SNFw54MeH4/tLkF4I5WoWG9SQwuqWzS99jaFQHBuQ==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -15409,8 +12562,6 @@ }, "node_modules/parent-module": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz", - "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==", "dev": true, "license": "MIT", "dependencies": { @@ -15422,8 +12573,6 @@ }, "node_modules/parent-module/node_modules/callsites": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz", - "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==", "dev": true, "license": "MIT", "engines": { @@ -15432,8 +12581,6 @@ }, "node_modules/parse-conflict-json": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/parse-conflict-json/-/parse-conflict-json-5.0.1.tgz", - "integrity": "sha512-ZHEmNKMq1wyJXNwLxyHnluPfRAFSIliBvbK/UiOceROt4Xh9Pz0fq49NytIaeaCUf5VR86hwQ/34FCcNU5/LKQ==", "license": "ISC", "dependencies": { "json-parse-even-better-errors": "^5.0.0", @@ -15446,8 +12593,6 @@ }, "node_modules/parse-imports-exports": { "version": "0.2.4", - "resolved": "https://registry.npmjs.org/parse-imports-exports/-/parse-imports-exports-0.2.4.tgz", - "integrity": "sha512-4s6vd6dx1AotCx/RCI2m7t7GCh5bDRUtGNvRfHSP2wbBQdMi67pPe7mtzmgwcaQ8VKK/6IB7Glfyu3qdZJPybQ==", "dev": true, "license": "MIT", "dependencies": { @@ -15456,8 +12601,6 @@ }, "node_modules/parse-json": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz", - "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==", "dev": true, "license": "MIT", "dependencies": { @@ -15475,15 +12618,11 @@ }, "node_modules/parse-json/node_modules/json-parse-even-better-errors": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz", - "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w==", "dev": true, "license": "MIT" }, "node_modules/parse-ms": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/parse-ms/-/parse-ms-4.0.0.tgz", - "integrity": "sha512-TXfryirbmq34y8QBwgqCVLi+8oA3oWx2eAnSn62ITyEhEYaWRlVZ2DvMM9eZbMs/RfxPu/PK/aBLyGj4IrqMHw==", "dev": true, "license": "MIT", "engines": { @@ -15495,8 +12634,6 @@ }, "node_modules/parse-passwd": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz", - "integrity": "sha512-1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q==", "dev": true, "license": "MIT", "engines": { @@ -15505,15 +12642,11 @@ }, "node_modules/parse-statements": { "version": "1.0.11", - "resolved": "https://registry.npmjs.org/parse-statements/-/parse-statements-1.0.11.tgz", - "integrity": "sha512-HlsyYdMBnbPQ9Jr/VgJ1YF4scnldvJpJxCVx6KgqPL4dxppsWrJHCIIxQXMJrqGnsRkNPATbeMJ8Yxu7JMsYcA==", "dev": true, "license": "MIT" }, "node_modules/parse5": { "version": "7.3.0", - "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.3.0.tgz", - "integrity": "sha512-IInvU7fabl34qmi9gY8XOVxhYyMyuH2xUNpb2q8/Y+7552KlejkRvqvD19nMoUW/uQGGbqNpA6Tufu5FL5BZgw==", "license": "MIT", "dependencies": { "entities": "^6.0.0" @@ -15524,8 +12657,6 @@ }, "node_modules/parse5-htmlparser2-tree-adapter": { "version": "7.1.0", - "resolved": "https://registry.npmjs.org/parse5-htmlparser2-tree-adapter/-/parse5-htmlparser2-tree-adapter-7.1.0.tgz", - "integrity": "sha512-ruw5xyKs6lrpo9x9rCZqZZnIUntICjQAd0Wsmp396Ul9lN/h+ifgVV1x1gZHi8euej6wTfpqX8j+BFQxF0NS/g==", "license": "MIT", "dependencies": { "domhandler": "^5.0.3", @@ -15537,8 +12668,6 @@ }, "node_modules/parse5-parser-stream": { "version": "7.1.2", - "resolved": "https://registry.npmjs.org/parse5-parser-stream/-/parse5-parser-stream-7.1.2.tgz", - "integrity": "sha512-JyeQc9iwFLn5TbvvqACIF/VXG6abODeB3Fwmv/TGdLk2LfbWkaySGY72at4+Ty7EkPZj854u4CrICqNk2qIbow==", "license": "MIT", "dependencies": { "parse5": "^7.0.0" @@ -15549,8 +12678,6 @@ }, "node_modules/parse5/node_modules/entities": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/entities/-/entities-6.0.1.tgz", - "integrity": "sha512-aN97NXWF6AWBTahfVOIrB/NShkzi5H7F9r1s9mD3cDj4Ko5f2qhhVoYMibXF7GlLveb/D2ioWay8lxI97Ven3g==", "license": "BSD-2-Clause", "engines": { "node": ">=0.12" @@ -15561,8 +12688,6 @@ }, "node_modules/parseurl": { "version": "1.3.3", - "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz", - "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==", "license": "MIT", "engines": { "node": ">= 0.8" @@ -15570,8 +12695,6 @@ }, "node_modules/path-exists": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-5.0.0.tgz", - "integrity": "sha512-RjhtfwJOxzcFmNOi6ltcbcu4Iu+FL3zEj83dk4kAS+fVpTxXLO1b38RvJgT/0QwvV/L3aY9TAnyv0EOqW4GoMQ==", "dev": true, "license": "MIT", "engines": { @@ -15580,8 +12703,6 @@ }, "node_modules/path-is-absolute": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz", - "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==", "dev": true, "license": "MIT", "engines": { @@ -15590,8 +12711,6 @@ }, "node_modules/path-key": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz", - "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==", "license": "MIT", "engines": { "node": ">=8" @@ -15599,14 +12718,10 @@ }, "node_modules/path-parse": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz", - "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==", "license": "MIT" }, "node_modules/path-scurry": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-2.0.1.tgz", - "integrity": "sha512-oWyT4gICAu+kaA7QWk/jvCHWarMKNs6pXOGWKDTr7cw4IGcUbW+PeTfbaQiLGheFRpjo6O9J0PmyMfQPjH71oA==", "license": "BlueOak-1.0.0", "dependencies": { "lru-cache": "^11.0.0", @@ -15621,14 +12736,10 @@ }, "node_modules/path-to-regexp": { "version": "0.1.12", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz", - "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ==", "license": "MIT" }, "node_modules/path-type": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/path-type/-/path-type-6.0.0.tgz", - "integrity": "sha512-Vj7sf++t5pBD637NSfkxpHSMfWaeig5+DKWLhcqIYx6mWQz5hdJTGDVMQiJcw1ZYkhs7AazKDGpRVji1LJCZUQ==", "license": "MIT", "engines": { "node": ">=18" @@ -15639,8 +12750,6 @@ }, "node_modules/peek-readable": { "version": "5.4.2", - "resolved": "https://registry.npmjs.org/peek-readable/-/peek-readable-5.4.2.tgz", - "integrity": "sha512-peBp3qZyuS6cNIJ2akRNG1uo1WJ1d0wTxg/fxMdZ0BqCVhx242bSFHM9eNqflfJVS9SsgkzgT/1UgnsurBOTMg==", "dev": true, "license": "MIT", "engines": { @@ -15653,20 +12762,14 @@ }, "node_modules/perfect-debounce": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/perfect-debounce/-/perfect-debounce-1.0.0.tgz", - "integrity": "sha512-xCy9V055GLEqoFaHoC1SoLIaLmWctgCUaBaWxDZ7/Zx4CTyX7cJQLJOok/orfjZAh9kEYpjJa4d0KcJmCbctZA==", "license": "MIT" }, "node_modules/picocolors": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz", - "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==", "license": "ISC" }, "node_modules/picomatch": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-4.0.3.tgz", - "integrity": "sha512-5gTmgEY/sqK6gFXLIsQNH19lWb4ebPDLA4SdLP7dsWkIXHWlG66oPuVvXSGFPppYZz8ZDZq0dYYrbHfBCVUb1Q==", "license": "MIT", "engines": { "node": ">=12" @@ -15677,8 +12780,6 @@ }, "node_modules/pify": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz", - "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==", "license": "MIT", "engines": { "node": ">=0.10.0" @@ -15686,8 +12787,6 @@ }, "node_modules/pirates": { "version": "4.0.7", - "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.7.tgz", - "integrity": "sha512-TfySrs/5nm8fQJDcBDuUng3VOUKsd7S+zqvbOTiGXHfxX4wK31ard+hoNuvkicM/2YFzlpDgABOevKSsB4G/FA==", "license": "MIT", "engines": { "node": ">= 6" @@ -15695,8 +12794,6 @@ }, "node_modules/pkg-dir": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-5.0.0.tgz", - "integrity": "sha512-NPE8TDbzl/3YQYY7CSS228s3g2ollTFnc+Qi3tqmqJp9Vg2ovUpixcJEo2HJScN2Ez+kEaal6y70c0ehqJBJeA==", "dev": true, "license": "MIT", "dependencies": { @@ -15708,8 +12805,6 @@ }, "node_modules/pkg-dir/node_modules/find-up": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz", - "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==", "dev": true, "license": "MIT", "dependencies": { @@ -15725,8 +12820,6 @@ }, "node_modules/pkg-dir/node_modules/locate-path": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz", - "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==", "dev": true, "license": "MIT", "dependencies": { @@ -15741,8 +12834,6 @@ }, "node_modules/pkg-dir/node_modules/p-limit": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz", - "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==", "dev": true, "license": "MIT", "dependencies": { @@ -15757,8 +12848,6 @@ }, "node_modules/pkg-dir/node_modules/p-locate": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz", - "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==", "dev": true, "license": "MIT", "dependencies": { @@ -15773,8 +12862,6 @@ }, "node_modules/pkg-dir/node_modules/path-exists": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz", - "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==", "dev": true, "license": "MIT", "engines": { @@ -15783,8 +12870,6 @@ }, "node_modules/pkg-dir/node_modules/yocto-queue": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-0.1.0.tgz", - "integrity": "sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==", "dev": true, "license": "MIT", "engines": { @@ -15796,8 +12881,6 @@ }, "node_modules/please-upgrade-node": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/please-upgrade-node/-/please-upgrade-node-3.2.0.tgz", - "integrity": "sha512-gQR3WpIgNIKwBMVLkpMUeR3e1/E1y42bqDQZfql+kDeXd8COYfM8PQA4X6y7a8u9Ua9FHmsrrmirW2vHs45hWg==", "dev": true, "license": "MIT", "dependencies": { @@ -15806,8 +12889,6 @@ }, "node_modules/plur": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/plur/-/plur-5.1.0.tgz", - "integrity": "sha512-VP/72JeXqak2KiOzjgKtQen5y3IZHn+9GOuLDafPv0eXa47xq0At93XahYBs26MsifCQ4enGKwbjBTKgb9QJXg==", "dev": true, "license": "MIT", "dependencies": { @@ -15822,8 +12903,6 @@ }, "node_modules/portscanner": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/portscanner/-/portscanner-2.2.0.tgz", - "integrity": "sha512-IFroCz/59Lqa2uBvzK3bKDbDDIEaAY8XJ1jFxcLWTqosrsc32//P4VuSB2vZXoHiHqOmx8B5L5hnKOxL/7FlPw==", "license": "MIT", "dependencies": { "async": "^2.6.0", @@ -15836,8 +12915,6 @@ }, "node_modules/possible-typed-array-names": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz", - "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==", "dev": true, "license": "MIT", "engines": { @@ -15846,8 +12923,6 @@ }, "node_modules/postcss": { "version": "8.5.6", - "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.5.6.tgz", - "integrity": "sha512-3Ybi1tAuwAP9s0r1UQ2J4n5Y0G05bJkpUIO0/bI9MhwmD70S5aTWbXGBwxHrelT+XM1k6dM0pk+SwNkpTRN7Pg==", "funding": [ { "type": "opencollective", @@ -15874,8 +12949,6 @@ }, "node_modules/postcss-calc": { "version": "10.1.1", - "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-10.1.1.tgz", - "integrity": "sha512-NYEsLHh8DgG/PRH2+G9BTuUdtf9ViS+vdoQ0YA5OQdGsfN4ztiwtDWNtBl9EKeqNMFnIu8IKZ0cLxEQ5r5KVMw==", "license": "MIT", "dependencies": { "postcss-selector-parser": "^7.0.0", @@ -15890,8 +12963,6 @@ }, "node_modules/postcss-colormin": { "version": "7.0.5", - "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-7.0.5.tgz", - "integrity": "sha512-ekIBP/nwzRWhEMmIxHHbXHcMdzd1HIUzBECaj5KEdLz9DVP2HzT065sEhvOx1dkLjYW7jyD0CngThx6bpFi2fA==", "license": "MIT", "dependencies": { "browserslist": "^4.27.0", @@ -15908,8 +12979,6 @@ }, "node_modules/postcss-convert-values": { "version": "7.0.8", - "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-7.0.8.tgz", - "integrity": "sha512-+XNKuPfkHTCEo499VzLMYn94TiL3r9YqRE3Ty+jP7UX4qjewUONey1t7CG21lrlTLN07GtGM8MqFVp86D4uKJg==", "license": "MIT", "dependencies": { "browserslist": "^4.27.0", @@ -15924,8 +12993,6 @@ }, "node_modules/postcss-discard-comments": { "version": "7.0.5", - "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-7.0.5.tgz", - "integrity": "sha512-IR2Eja8WfYgN5n32vEGSctVQ1+JARfu4UH8M7bgGh1bC+xI/obsPJXaBpQF7MAByvgwZinhpHpdrmXtvVVlKcQ==", "license": "MIT", "dependencies": { "postcss-selector-parser": "^7.1.0" @@ -15939,8 +13006,6 @@ }, "node_modules/postcss-discard-duplicates": { "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-7.0.2.tgz", - "integrity": "sha512-eTonaQvPZ/3i1ASDHOKkYwAybiM45zFIc7KXils4mQmHLqIswXD9XNOKEVxtTFnsmwYzF66u4LMgSr0abDlh5w==", "license": "MIT", "engines": { "node": "^18.12.0 || ^20.9.0 || >=22.0" @@ -15951,8 +13016,6 @@ }, "node_modules/postcss-discard-empty": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-7.0.1.tgz", - "integrity": "sha512-cFrJKZvcg/uxB6Ijr4l6qmn3pXQBna9zyrPC+sK0zjbkDUZew+6xDltSF7OeB7rAtzaaMVYSdbod+sZOCWnMOg==", "license": "MIT", "engines": { "node": "^18.12.0 || ^20.9.0 || >=22.0" @@ -15963,8 +13026,6 @@ }, "node_modules/postcss-discard-overridden": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-7.0.1.tgz", - "integrity": "sha512-7c3MMjjSZ/qYrx3uc1940GSOzN1Iqjtlqe8uoSg+qdVPYyRb0TILSqqmtlSFuE4mTDECwsm397Ya7iXGzfF7lg==", "license": "MIT", "engines": { "node": "^18.12.0 || ^20.9.0 || >=22.0" @@ -15975,8 +13036,6 @@ }, "node_modules/postcss-import": { "version": "15.1.0", - "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz", - "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==", "license": "MIT", "dependencies": { "postcss-value-parser": "^4.0.0", @@ -15992,8 +13051,6 @@ }, "node_modules/postcss-js": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.1.0.tgz", - "integrity": "sha512-oIAOTqgIo7q2EOwbhb8UalYePMvYoIeRY2YKntdpFQXNosSu3vLrniGgmH9OKs/qAkfoj5oB3le/7mINW1LCfw==", "funding": [ { "type": "opencollective", @@ -16017,8 +13074,6 @@ }, "node_modules/postcss-load-config": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-6.0.1.tgz", - "integrity": "sha512-oPtTM4oerL+UXmx+93ytZVN82RrlY/wPUV8IeDxFrzIjXOLF1pN+EmKPLbubvKHT2HC20xXsCAH2Z+CKV6Oz/g==", "funding": [ { "type": "opencollective", @@ -16059,8 +13114,6 @@ }, "node_modules/postcss-merge-longhand": { "version": "7.0.5", - "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-7.0.5.tgz", - "integrity": "sha512-Kpu5v4Ys6QI59FxmxtNB/iHUVDn9Y9sYw66D6+SZoIk4QTz1prC4aYkhIESu+ieG1iylod1f8MILMs1Em3mmIw==", "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0", @@ -16075,8 +13128,6 @@ }, "node_modules/postcss-merge-rules": { "version": "7.0.7", - "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-7.0.7.tgz", - "integrity": "sha512-njWJrd/Ms6XViwowaaCc+/vqhPG3SmXn725AGrnl+BgTuRPEacjiLEaGq16J6XirMJbtKkTwnt67SS+e2WGoew==", "license": "MIT", "dependencies": { "browserslist": "^4.27.0", @@ -16093,8 +13144,6 @@ }, "node_modules/postcss-minify-font-values": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-7.0.1.tgz", - "integrity": "sha512-2m1uiuJeTplll+tq4ENOQSzB8LRnSUChBv7oSyFLsJRtUgAAJGP6LLz0/8lkinTgxrmJSPOEhgY1bMXOQ4ZXhQ==", "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -16108,8 +13157,6 @@ }, "node_modules/postcss-minify-gradients": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-7.0.1.tgz", - "integrity": "sha512-X9JjaysZJwlqNkJbUDgOclyG3jZEpAMOfof6PUZjPnPrePnPG62pS17CjdM32uT1Uq1jFvNSff9l7kNbmMSL2A==", "license": "MIT", "dependencies": { "colord": "^2.9.3", @@ -16125,8 +13172,6 @@ }, "node_modules/postcss-minify-params": { "version": "7.0.5", - "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-7.0.5.tgz", - "integrity": "sha512-FGK9ky02h6Ighn3UihsyeAH5XmLEE2MSGH5Tc4tXMFtEDx7B+zTG6hD/+/cT+fbF7PbYojsmmWjyTwFwW1JKQQ==", "license": "MIT", "dependencies": { "browserslist": "^4.27.0", @@ -16142,8 +13187,6 @@ }, "node_modules/postcss-minify-selectors": { "version": "7.0.5", - "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-7.0.5.tgz", - "integrity": "sha512-x2/IvofHcdIrAm9Q+p06ZD1h6FPcQ32WtCRVodJLDR+WMn8EVHI1kvLxZuGKz/9EY5nAmI6lIQIrpo4tBy5+ug==", "license": "MIT", "dependencies": { "cssesc": "^3.0.0", @@ -16158,8 +13201,6 @@ }, "node_modules/postcss-nested": { "version": "6.2.0", - "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz", - "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==", "funding": [ { "type": "opencollective", @@ -16183,8 +13224,6 @@ }, "node_modules/postcss-nested/node_modules/postcss-selector-parser": { "version": "6.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", - "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", "license": "MIT", "dependencies": { "cssesc": "^3.0.0", @@ -16196,8 +13235,6 @@ }, "node_modules/postcss-normalize-charset": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-7.0.1.tgz", - "integrity": "sha512-sn413ofhSQHlZFae//m9FTOfkmiZ+YQXsbosqOWRiVQncU2BA3daX3n0VF3cG6rGLSFVc5Di/yns0dFfh8NFgQ==", "license": "MIT", "engines": { "node": "^18.12.0 || ^20.9.0 || >=22.0" @@ -16208,8 +13245,6 @@ }, "node_modules/postcss-normalize-display-values": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-7.0.1.tgz", - "integrity": "sha512-E5nnB26XjSYz/mGITm6JgiDpAbVuAkzXwLzRZtts19jHDUBFxZ0BkXAehy0uimrOjYJbocby4FVswA/5noOxrQ==", "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -16223,8 +13258,6 @@ }, "node_modules/postcss-normalize-positions": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-7.0.1.tgz", - "integrity": "sha512-pB/SzrIP2l50ZIYu+yQZyMNmnAcwyYb9R1fVWPRxm4zcUFCY2ign7rcntGFuMXDdd9L2pPNUgoODDk91PzRZuQ==", "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -16238,8 +13271,6 @@ }, "node_modules/postcss-normalize-repeat-style": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-7.0.1.tgz", - "integrity": "sha512-NsSQJ8zj8TIDiF0ig44Byo3Jk9e4gNt9x2VIlJudnQQ5DhWAHJPF4Tr1ITwyHio2BUi/I6Iv0HRO7beHYOloYQ==", "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -16253,8 +13284,6 @@ }, "node_modules/postcss-normalize-string": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-7.0.1.tgz", - "integrity": "sha512-QByrI7hAhsoze992kpbMlJSbZ8FuCEc1OT9EFbZ6HldXNpsdpZr+YXC5di3UEv0+jeZlHbZcoCADgb7a+lPmmQ==", "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -16268,8 +13297,6 @@ }, "node_modules/postcss-normalize-timing-functions": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-7.0.1.tgz", - "integrity": "sha512-bHifyuuSNdKKsnNJ0s8fmfLMlvsQwYVxIoUBnowIVl2ZAdrkYQNGVB4RxjfpvkMjipqvbz0u7feBZybkl/6NJg==", "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -16283,8 +13310,6 @@ }, "node_modules/postcss-normalize-unicode": { "version": "7.0.5", - "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-7.0.5.tgz", - "integrity": "sha512-X6BBwiRxVaFHrb2WyBMddIeB5HBjJcAaUHyhLrM2FsxSq5TFqcHSsK7Zu1otag+o0ZphQGJewGH1tAyrD0zX1Q==", "license": "MIT", "dependencies": { "browserslist": "^4.27.0", @@ -16299,8 +13324,6 @@ }, "node_modules/postcss-normalize-url": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-7.0.1.tgz", - "integrity": "sha512-sUcD2cWtyK1AOL/82Fwy1aIVm/wwj5SdZkgZ3QiUzSzQQofrbq15jWJ3BA7Z+yVRwamCjJgZJN0I9IS7c6tgeQ==", "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -16314,8 +13337,6 @@ }, "node_modules/postcss-normalize-whitespace": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-7.0.1.tgz", - "integrity": "sha512-vsbgFHMFQrJBJKrUFJNZ2pgBeBkC2IvvoHjz1to0/0Xk7sII24T0qFOiJzG6Fu3zJoq/0yI4rKWi7WhApW+EFA==", "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -16329,8 +13350,6 @@ }, "node_modules/postcss-ordered-values": { "version": "7.0.2", - "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-7.0.2.tgz", - "integrity": "sha512-AMJjt1ECBffF7CEON/Y0rekRLS6KsePU6PRP08UqYW4UGFRnTXNrByUzYK1h8AC7UWTZdQ9O3Oq9kFIhm0SFEw==", "license": "MIT", "dependencies": { "cssnano-utils": "^5.0.1", @@ -16345,8 +13364,6 @@ }, "node_modules/postcss-reduce-initial": { "version": "7.0.5", - "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-7.0.5.tgz", - "integrity": "sha512-RHagHLidG8hTZcnr4FpyMB2jtgd/OcyAazjMhoy5qmWJOx1uxKh4ntk0Pb46ajKM0rkf32lRH4C8c9qQiPR6IA==", "license": "MIT", "dependencies": { "browserslist": "^4.27.0", @@ -16361,8 +13378,6 @@ }, "node_modules/postcss-reduce-transforms": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-7.0.1.tgz", - "integrity": "sha512-MhyEbfrm+Mlp/36hvZ9mT9DaO7dbncU0CvWI8V93LRkY6IYlu38OPg3FObnuKTUxJ4qA8HpurdQOo5CyqqO76g==", "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0" @@ -16376,8 +13391,6 @@ }, "node_modules/postcss-selector-parser": { "version": "7.1.0", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz", - "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==", "license": "MIT", "dependencies": { "cssesc": "^3.0.0", @@ -16389,8 +13402,6 @@ }, "node_modules/postcss-svgo": { "version": "7.1.0", - "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-7.1.0.tgz", - "integrity": "sha512-KnAlfmhtoLz6IuU3Sij2ycusNs4jPW+QoFE5kuuUOK8awR6tMxZQrs5Ey3BUz7nFCzT3eqyFgqkyrHiaU2xx3w==", "license": "MIT", "dependencies": { "postcss-value-parser": "^4.2.0", @@ -16405,8 +13416,6 @@ }, "node_modules/postcss-unique-selectors": { "version": "7.0.4", - "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-7.0.4.tgz", - "integrity": "sha512-pmlZjsmEAG7cHd7uK3ZiNSW6otSZ13RHuZ/4cDN/bVglS5EpF2r2oxY99SuOHa8m7AWoBCelTS3JPpzsIs8skQ==", "license": "MIT", "dependencies": { "postcss-selector-parser": "^7.1.0" @@ -16420,14 +13429,10 @@ }, "node_modules/postcss-value-parser": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz", - "integrity": "sha512-1NNCs6uurfkVbeXG4S8JFT9t19m45ICnif8zWLd5oPSZ50QnwMfK+H3jv408d4jw/7Bttv5axS5IiHoLaVNHeQ==", "license": "MIT" }, "node_modules/preact": { - "version": "10.28.2", - "resolved": "https://registry.npmjs.org/preact/-/preact-10.28.2.tgz", - "integrity": "sha512-lbteaWGzGHdlIuiJ0l2Jq454m6kcpI1zNje6d8MlGAFlYvP2GO4ibnat7P74Esfz4sPTdM6UxtTwh/d3pwM9JA==", + "version": "10.27.2", "license": "MIT", "funding": { "type": "opencollective", @@ -16436,8 +13441,6 @@ }, "node_modules/prelude-ls": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.2.1.tgz", - "integrity": "sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==", "dev": true, "license": "MIT", "engines": { @@ -16446,17 +13449,10 @@ }, "node_modules/pretty-data": { "version": "0.40.0", - "resolved": "https://registry.npmjs.org/pretty-data/-/pretty-data-0.40.0.tgz", - "integrity": "sha512-YFLnEdDEDnkt/GEhet5CYZHCvALw6+Elyb/tp8kQG03ZSIuzeaDWpZYndCXwgqu4NAjh1PI534dhDS1mHarRnQ==", - "license": "MIT", - "engines": { - "node": "*" - } + "license": "MIT" }, "node_modules/pretty-hrtime": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/pretty-hrtime/-/pretty-hrtime-1.0.3.tgz", - "integrity": "sha512-66hKPCr+72mlfiSjlEB1+45IjXSqvVAIy6mocupoww4tBFE9R9IhwwUGoI4G++Tc9Aq+2rxOt0RFU6gPcrte0A==", "license": "MIT", "engines": { "node": ">= 0.8" @@ -16464,8 +13460,6 @@ }, "node_modules/pretty-ms": { "version": "9.3.0", - "resolved": "https://registry.npmjs.org/pretty-ms/-/pretty-ms-9.3.0.tgz", - "integrity": "sha512-gjVS5hOP+M3wMm5nmNOucbIrqudzs9v/57bWRHQWLYklXqoXKrVfYW2W9+glfGsqtPgpiz5WwyEEB+ksXIx3gQ==", "dev": true, "license": "MIT", "dependencies": { @@ -16480,8 +13474,6 @@ }, "node_modules/proc-log": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/proc-log/-/proc-log-5.0.0.tgz", - "integrity": "sha512-Azwzvl90HaF0aCz1JrDdXQykFakSSNPaPoiZ9fm5qJIMHioDZEi7OAdRwSm6rSoPtY3Qutnm3L7ogmg3dc+wbQ==", "license": "ISC", "engines": { "node": "^18.17.0 || >=20.5.0" @@ -16489,8 +13481,6 @@ }, "node_modules/process": { "version": "0.11.10", - "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz", - "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==", "dev": true, "license": "MIT", "engines": { @@ -16499,14 +13489,10 @@ }, "node_modules/process-nextick-args": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", - "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==", "license": "MIT" }, "node_modules/process-on-spawn": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/process-on-spawn/-/process-on-spawn-1.1.0.tgz", - "integrity": "sha512-JOnOPQ/8TZgjs1JIH/m9ni7FfimjNa/PRx7y/Wb5qdItsnhO0jE4AT7fC0HjC28DUQWDr50dwSYZLdRMlqDq3Q==", "dev": true, "license": "MIT", "dependencies": { @@ -16518,8 +13504,6 @@ }, "node_modules/proggy": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/proggy/-/proggy-3.0.0.tgz", - "integrity": "sha512-QE8RApCM3IaRRxVzxrjbgNMpQEX6Wu0p0KBeoSiSEw5/bsGwZHsshF4LCxH2jp/r6BU+bqA3LrMDEYNfJnpD8Q==", "license": "ISC", "engines": { "node": "^18.17.0 || >=20.5.0" @@ -16527,8 +13511,6 @@ }, "node_modules/promise-all-reject-late": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-all-reject-late/-/promise-all-reject-late-1.0.1.tgz", - "integrity": "sha512-vuf0Lf0lOxyQREH7GDIOUMLS7kz+gs8i6B+Yi8dC68a2sychGrHTJYghMBD6k7eUcH0H5P73EckCA48xijWqXw==", "license": "ISC", "funding": { "url": "https://github.com/sponsors/isaacs" @@ -16536,8 +13518,6 @@ }, "node_modules/promise-call-limit": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/promise-call-limit/-/promise-call-limit-3.0.2.tgz", - "integrity": "sha512-mRPQO2T1QQVw11E7+UdCJu7S61eJVWknzml9sC1heAdj1jxl0fWMBypIt9ZOcLFf8FkG995ZD7RnVk7HH72fZw==", "license": "ISC", "funding": { "url": "https://github.com/sponsors/isaacs" @@ -16545,15 +13525,11 @@ }, "node_modules/promise-inflight": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz", - "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==", "dev": true, "license": "ISC" }, "node_modules/promise-retry": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/promise-retry/-/promise-retry-2.0.1.tgz", - "integrity": "sha512-y+WKFlBR8BGXnsNlIHFGPZmyDf3DFMoLhaflAnyZgV6rG6xu+JwesTo2Q9R6XwYmtmwAFCkAk3e35jEdoeh/3g==", "license": "MIT", "dependencies": { "err-code": "^2.0.2", @@ -16565,8 +13541,6 @@ }, "node_modules/property-information": { "version": "7.1.0", - "resolved": "https://registry.npmjs.org/property-information/-/property-information-7.1.0.tgz", - "integrity": "sha512-TwEZ+X+yCJmYfL7TPUOcvBZ4QfoT5YenQiJuX//0th53DE6w0xxLEtfK3iyryQFddXuvkIk51EEgrJQ0WJkOmQ==", "license": "MIT", "funding": { "type": "github", @@ -16575,14 +13549,10 @@ }, "node_modules/proto-list": { "version": "1.2.4", - "resolved": "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz", - "integrity": "sha512-vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA==", "license": "ISC" }, "node_modules/proxy-addr": { "version": "2.0.7", - "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz", - "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==", "license": "MIT", "dependencies": { "forwarded": "0.2.0", @@ -16594,8 +13564,6 @@ }, "node_modules/punycode": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode/-/punycode-2.3.1.tgz", - "integrity": "sha512-vYt7UD1U9Wg6138shLtLOvdAu+8DsC/ilFtEVHcH+wydcSpNE20AfSOduf6MkRFahL5FY7X1oU7nKVZFtfq8Fg==", "license": "MIT", "engines": { "node": ">=6" @@ -16603,8 +13571,6 @@ }, "node_modules/punycode.js": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/punycode.js/-/punycode.js-2.3.1.tgz", - "integrity": "sha512-uxFIHU0YlHYhDQtV4R9J6a52SLx28BCjT+4ieh7IGbgwVJWO+km431c4yRlREUAsAmt/uMjQUyQHNEPf0M39CA==", "license": "MIT", "engines": { "node": ">=6" @@ -16612,8 +13578,6 @@ }, "node_modules/pupa": { "version": "3.3.0", - "resolved": "https://registry.npmjs.org/pupa/-/pupa-3.3.0.tgz", - "integrity": "sha512-LjgDO2zPtoXP2wJpDjZrGdojii1uqO0cnwKoIoUzkfS98HDmbeiGmYiXo3lXeFlq2xvne1QFQhwYXSUCLKtEuA==", "license": "MIT", "dependencies": { "escape-goat": "^4.0.0" @@ -16627,20 +13591,16 @@ }, "node_modules/qrcode-terminal": { "version": "0.12.0", - "resolved": "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz", - "integrity": "sha512-EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ==", "dev": true, "bin": { "qrcode-terminal": "bin/qrcode-terminal.js" } }, "node_modules/qs": { - "version": "6.14.1", - "resolved": "https://registry.npmjs.org/qs/-/qs-6.14.1.tgz", - "integrity": "sha512-4EK3+xJl8Ts67nLYNwqw/dsFVnCf+qR7RgXSK9jEEm9unao3njwMDdmsdvoKBKHzxd7tCYz5e5M+SnMjdtXGQQ==", + "version": "6.13.0", "license": "BSD-3-Clause", "dependencies": { - "side-channel": "^1.1.0" + "side-channel": "^1.0.6" }, "engines": { "node": ">=0.6" @@ -16651,8 +13611,6 @@ }, "node_modules/queue-microtask": { "version": "1.2.3", - "resolved": "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.3.tgz", - "integrity": "sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==", "funding": [ { "type": "github", @@ -16671,8 +13629,6 @@ }, "node_modules/quibble": { "version": "0.9.2", - "resolved": "https://registry.npmjs.org/quibble/-/quibble-0.9.2.tgz", - "integrity": "sha512-BrL7hrZcbyyt5ZDfePkGFDc3m82uUtxCPOnpRUrkOdtBnmV9ldQKxXORkKL8eIzToRNaCpIPyKyfdfq/tBlFAA==", "dev": true, "license": "MIT", "dependencies": { @@ -16685,8 +13641,6 @@ }, "node_modules/random-int": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/random-int/-/random-int-3.1.0.tgz", - "integrity": "sha512-h8CRz8cpvzj0hC/iH/1Gapgcl2TQ6xtnCpyOI5WvWfXf/yrDx2DOU+tD9rX23j36IF11xg1KqB9W11Z18JPMdw==", "license": "MIT", "engines": { "node": ">=12" @@ -16697,61 +13651,26 @@ }, "node_modules/range-parser": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/range-parser/-/range-parser-1.2.1.tgz", - "integrity": "sha512-Hrgsx+orqoygnmhFbKaHE6c296J+HTAQXoxEF6gNupROmmGJRoyzfG3ccAveqCBrwr/2yxQ5BVd/GTl5agOwSg==", "license": "MIT", "engines": { "node": ">= 0.6" } }, "node_modules/raw-body": { - "version": "2.5.3", - "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.3.tgz", - "integrity": "sha512-s4VSOf6yN0rvbRZGxs8Om5CWj6seneMwK3oDb4lWDH0UPhWcxwOWw5+qk24bxq87szX1ydrwylIOp2uG1ojUpA==", - "license": "MIT", - "dependencies": { - "bytes": "~3.1.2", - "http-errors": "~2.0.1", - "iconv-lite": "~0.4.24", - "unpipe": "~1.0.0" - }, - "engines": { - "node": ">= 0.8" - } - }, - "node_modules/raw-body/node_modules/http-errors": { - "version": "2.0.1", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.1.tgz", - "integrity": "sha512-4FbRdAX+bSdmo4AUFuS0WNiPz8NgFt+r8ThgNWmlrjQjt1Q7ZR9+zTlce2859x4KSXrwIsaeTqDoKQmtP8pLmQ==", + "version": "2.5.2", "license": "MIT", "dependencies": { - "depd": "~2.0.0", - "inherits": "~2.0.4", - "setprototypeof": "~1.2.0", - "statuses": "~2.0.2", - "toidentifier": "~1.0.1" - }, - "engines": { - "node": ">= 0.8" + "bytes": "3.1.2", + "http-errors": "2.0.0", + "iconv-lite": "0.4.24", + "unpipe": "1.0.0" }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/express" - } - }, - "node_modules/raw-body/node_modules/statuses": { - "version": "2.0.2", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.2.tgz", - "integrity": "sha512-DvEy55V3DB7uknRo+4iOGT5fP1slR8wQohVdknigZPMpMstaKJQWhwiYBACJE3Ul2pTnATihhBYnRhZQHGBiRw==", - "license": "MIT", "engines": { "node": ">= 0.8" } }, "node_modules/rc": { "version": "1.2.8", - "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz", - "integrity": "sha512-y3bGgqKj3QBdxLbLkomlohkvsA8gdAiUQlSBJnBhfn+BPxg4bc62d8TcBW15wavDfgexCgccckhcZvywyQYPOw==", "license": "(BSD-2-Clause OR MIT OR Apache-2.0)", "dependencies": { "deep-extend": "^0.6.0", @@ -16765,14 +13684,10 @@ }, "node_modules/rc/node_modules/ini": { "version": "1.3.8", - "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz", - "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew==", "license": "ISC" }, "node_modules/rc/node_modules/strip-json-comments": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz", - "integrity": "sha512-4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ==", "license": "MIT", "engines": { "node": ">=0.10.0" @@ -16780,8 +13695,6 @@ }, "node_modules/read-cache": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/read-cache/-/read-cache-1.0.0.tgz", - "integrity": "sha512-Owdv/Ft7IjOgm/i0xvNDZ1LrRANRfew4b2prF3OWMQLxLfu3bS8FVhCsrSCMK4lR56Y9ya+AThoTpDCTxCmpRA==", "license": "MIT", "dependencies": { "pify": "^2.3.0" @@ -16789,8 +13702,6 @@ }, "node_modules/read-cmd-shim": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/read-cmd-shim/-/read-cmd-shim-6.0.0.tgz", - "integrity": "sha512-1zM5HuOfagXCBWMN83fuFI/x+T/UhZ7k+KIzhrHXcQoeX5+7gmaDYjELQHmmzIodumBHeByBJT4QYS7ufAgs7A==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -16798,8 +13709,6 @@ }, "node_modules/read-package-json-fast": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/read-package-json-fast/-/read-package-json-fast-3.0.2.tgz", - "integrity": "sha512-0J+Msgym3vrLOUB3hzQCuZHII0xkNGCtz/HJH9xZshwv9DbDwkw1KaE3gx/e2J5rpEY5rtOy6cyhKOPrkP7FZw==", "dev": true, "license": "ISC", "dependencies": { @@ -16812,8 +13721,6 @@ }, "node_modules/read-package-json-fast/node_modules/json-parse-even-better-errors": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-3.0.2.tgz", - "integrity": "sha512-fi0NG4bPjCHunUJffmLd0gxssIgkNmArMvis4iNah6Owg1MCJjWhEcDLmsK6iGkJq3tHwbDkTlce70/tmXN4cQ==", "dev": true, "license": "MIT", "engines": { @@ -16822,8 +13729,6 @@ }, "node_modules/read-package-json-fast/node_modules/npm-normalize-package-bin": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/npm-normalize-package-bin/-/npm-normalize-package-bin-3.0.1.tgz", - "integrity": "sha512-dMxCf+zZ+3zeQZXKxmyuCKlIDPGuv8EF940xbkC4kQVDTtqoh6rJFO+JTKSA6/Rwi0getWmtuy4Itup0AMcaDQ==", "dev": true, "license": "ISC", "engines": { @@ -16832,8 +13737,6 @@ }, "node_modules/read-package-up": { "version": "11.0.0", - "resolved": "https://registry.npmjs.org/read-package-up/-/read-package-up-11.0.0.tgz", - "integrity": "sha512-MbgfoNPANMdb4oRBNg5eqLbB2t2r+o5Ua1pNt8BqGp4I0FJZhuVSOj3PaBPni4azWuSzEdNn2evevzVmEk1ohQ==", "license": "MIT", "dependencies": { "find-up-simple": "^1.0.0", @@ -16849,8 +13752,6 @@ }, "node_modules/read-package-up/node_modules/type-fest": { "version": "4.41.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz", - "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==", "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=16" @@ -16861,8 +13762,6 @@ }, "node_modules/read-pkg": { "version": "9.0.1", - "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-9.0.1.tgz", - "integrity": "sha512-9viLL4/n1BJUCT1NXVTdS1jtm80yDEgR5T4yCelII49Mbj0v1rZdKqj7zCiYdbB0CuCgdrvHcNogAKTFPBocFA==", "license": "MIT", "dependencies": { "@types/normalize-package-data": "^2.4.3", @@ -16880,8 +13779,6 @@ }, "node_modules/read-pkg/node_modules/parse-json": { "version": "8.3.0", - "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-8.3.0.tgz", - "integrity": "sha512-ybiGyvspI+fAoRQbIPRddCcSTV9/LsJbf0e/S85VLowVGzRmokfneg2kwVW/KU5rOXrPSbF1qAKPMgNTqqROQQ==", "license": "MIT", "dependencies": { "@babel/code-frame": "^7.26.2", @@ -16897,8 +13794,6 @@ }, "node_modules/read-pkg/node_modules/type-fest": { "version": "4.41.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-4.41.0.tgz", - "integrity": "sha512-TeTSQ6H5YHvpqVwBRcnLDCBnDOHWYu7IvGbHT6N8AOymcr9PJGjc1GTtiWZTYg0NCgYwvnYWEkVChQAr9bjfwA==", "license": "(MIT OR CC0-1.0)", "engines": { "node": ">=16" @@ -16909,8 +13804,6 @@ }, "node_modules/readable-stream": { "version": "4.7.0", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-4.7.0.tgz", - "integrity": "sha512-oIGGmcpTLwPga8Bn6/Z75SVaH1z5dUut2ibSyAMVhmUggWpmDn2dapB0n7f8nwaSiRtepAsfJyfXIO5DCVAODg==", "dev": true, "license": "MIT", "dependencies": { @@ -16926,8 +13819,6 @@ }, "node_modules/readable-web-to-node-stream": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/readable-web-to-node-stream/-/readable-web-to-node-stream-3.0.4.tgz", - "integrity": "sha512-9nX56alTf5bwXQ3ZDipHJhusu9NTQJ/CVPtb/XHAJCXihZeitfJvIRS4GqQ/mfIoOE3IelHMrpayVrosdHBuLw==", "dev": true, "license": "MIT", "dependencies": { @@ -16943,8 +13834,6 @@ }, "node_modules/readdirp": { "version": "3.6.0", - "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz", - "integrity": "sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==", "license": "MIT", "dependencies": { "picomatch": "^2.2.1" @@ -16955,8 +13844,6 @@ }, "node_modules/readdirp/node_modules/picomatch": { "version": "2.3.1", - "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz", - "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==", "license": "MIT", "engines": { "node": ">=8.6" @@ -16967,8 +13854,6 @@ }, "node_modules/reduce-flatten": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/reduce-flatten/-/reduce-flatten-2.0.0.tgz", - "integrity": "sha512-EJ4UNY/U1t2P/2k6oqotuX2Cc3T6nxJwsM0N0asT7dhrtH1ltUxDn4NalSYmPE2rCkVpcf/X6R0wDwcFpzhd4w==", "dev": true, "license": "MIT", "engines": { @@ -16977,8 +13862,6 @@ }, "node_modules/reflect.getprototypeof": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz", - "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==", "dev": true, "license": "MIT", "dependencies": { @@ -17000,8 +13883,6 @@ }, "node_modules/regex": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/regex/-/regex-6.0.1.tgz", - "integrity": "sha512-uorlqlzAKjKQZ5P+kTJr3eeJGSVroLKoHmquUj4zHWuR+hEyNqlXsSKlYYF5F4NI6nl7tWCs0apKJ0lmfsXAPA==", "license": "MIT", "dependencies": { "regex-utilities": "^2.3.0" @@ -17009,8 +13890,6 @@ }, "node_modules/regex-recursion": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/regex-recursion/-/regex-recursion-6.0.2.tgz", - "integrity": "sha512-0YCaSCq2VRIebiaUviZNs0cBz1kg5kVS2UKUfNIx8YVs1cN3AV7NTctO5FOKBA+UT2BPJIWZauYHPqJODG50cg==", "license": "MIT", "dependencies": { "regex-utilities": "^2.3.0" @@ -17018,14 +13897,10 @@ }, "node_modules/regex-utilities": { "version": "2.3.0", - "resolved": "https://registry.npmjs.org/regex-utilities/-/regex-utilities-2.3.0.tgz", - "integrity": "sha512-8VhliFJAWRaUiVvREIiW2NXXTmHs4vMNnSzuJVhscgmGav3g9VDxLrQndI3dZZVVdp0ZO/5v0xmX516/7M9cng==", "license": "MIT" }, "node_modules/regexp.prototype.flags": { "version": "1.5.4", - "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz", - "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==", "dev": true, "license": "MIT", "dependencies": { @@ -17045,8 +13920,6 @@ }, "node_modules/registry-auth-token": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-5.1.0.tgz", - "integrity": "sha512-GdekYuwLXLxMuFTwAPg5UKGLW/UXzQrZvH/Zj791BQif5T05T0RsaLfHc9q3ZOKi7n+BoprPD9mJ0O0k4xzUlw==", "license": "MIT", "dependencies": { "@pnpm/npm-conf": "^2.1.0" @@ -17057,8 +13930,6 @@ }, "node_modules/registry-url": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-6.0.1.tgz", - "integrity": "sha512-+crtS5QjFRqFCoQmvGduwYWEBng99ZvmFvF+cUJkGYF1L1BfU8C6Zp9T7f5vPAwyLkUExpvK+ANVZmGU49qi4Q==", "license": "MIT", "dependencies": { "rc": "1.2.8" @@ -17072,8 +13943,6 @@ }, "node_modules/release-zalgo": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/release-zalgo/-/release-zalgo-1.0.0.tgz", - "integrity": "sha512-gUAyHVHPPC5wdqX/LG4LWtRYtgjxyX78oanFNTMMyFEfOqdC54s3eE82imuWKbOeqYht2CrNf64Qb8vgmmtZGA==", "dev": true, "license": "ISC", "dependencies": { @@ -17085,8 +13954,6 @@ }, "node_modules/replacestream": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/replacestream/-/replacestream-4.0.3.tgz", - "integrity": "sha512-AC0FiLS352pBBiZhd4VXB1Ab/lh0lEgpP+GGvZqbQh8a5cmXVoTe5EX/YeTFArnp4SRGTHh1qCHu9lGs1qG8sA==", "license": "BSD-3-Clause", "dependencies": { "escape-string-regexp": "^1.0.3", @@ -17096,8 +13963,6 @@ }, "node_modules/replacestream/node_modules/escape-string-regexp": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz", - "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==", "license": "MIT", "engines": { "node": ">=0.8.0" @@ -17105,8 +13970,6 @@ }, "node_modules/replacestream/node_modules/readable-stream": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "license": "MIT", "dependencies": { "core-util-is": "~1.0.0", @@ -17120,14 +13983,10 @@ }, "node_modules/replacestream/node_modules/safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "license": "MIT" }, "node_modules/replacestream/node_modules/string_decoder": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "license": "MIT", "dependencies": { "safe-buffer": "~5.1.0" @@ -17135,8 +13994,6 @@ }, "node_modules/require-directory": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz", - "integrity": "sha512-fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q==", "license": "MIT", "engines": { "node": ">=0.10.0" @@ -17144,8 +14001,6 @@ }, "node_modules/require-from-string": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/require-from-string/-/require-from-string-2.0.2.tgz", - "integrity": "sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw==", "dev": true, "license": "MIT", "engines": { @@ -17154,22 +14009,16 @@ }, "node_modules/require-main-filename": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/require-main-filename/-/require-main-filename-2.0.0.tgz", - "integrity": "sha512-NKN5kMDylKuldxYLSUfrbo5Tuzh4hd+2E8NPPX02mZtn1VuREQToYe/ZdlJy+J3uCpfaiGF05e7B8W0iXbQHmg==", "dev": true, "license": "ISC" }, "node_modules/require-package-name": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/require-package-name/-/require-package-name-2.0.1.tgz", - "integrity": "sha512-uuoJ1hU/k6M0779t3VMVIYpb2VMJk05cehCaABFhXaibcbvfgR8wKiozLjVFSzJPmQMRqIcO0HMyTFqfV09V6Q==", "dev": true, "license": "MIT" }, "node_modules/requizzle": { "version": "0.2.4", - "resolved": "https://registry.npmjs.org/requizzle/-/requizzle-0.2.4.tgz", - "integrity": "sha512-JRrFk1D4OQ4SqovXOgdav+K8EAhSB/LJZqCz8tbX0KObcdeM15Ss59ozWMBWmmINMagCwmqn4ZNryUGpBsl6Jw==", "license": "MIT", "dependencies": { "lodash": "^4.17.21" @@ -17177,8 +14026,6 @@ }, "node_modules/reserved-identifiers": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/reserved-identifiers/-/reserved-identifiers-1.2.0.tgz", - "integrity": "sha512-yE7KUfFvaBFzGPs5H3Ops1RevfUEsDc5Iz65rOwWg4lE8HJSYtle77uul3+573457oHvBKuHYDl/xqUkKpEEdw==", "dev": true, "license": "MIT", "engines": { @@ -17190,8 +14037,6 @@ }, "node_modules/resolve": { "version": "1.22.11", - "resolved": "https://registry.npmjs.org/resolve/-/resolve-1.22.11.tgz", - "integrity": "sha512-RfqAvLnMl313r7c9oclB1HhUEAezcpLjz95wFH4LVuhk9JF/r22qmVP9AMmOU4vMX7Q8pN8jwNg/CSpdFnMjTQ==", "license": "MIT", "dependencies": { "is-core-module": "^2.16.1", @@ -17210,8 +14055,6 @@ }, "node_modules/resolve-cwd": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-3.0.0.tgz", - "integrity": "sha512-OrZaX2Mb+rJCpH/6CpSqt9xFVpN++x01XnN2ie9g6P5/3xelLAkXWVADpdz1IHD/KFfEXyE6V0U01OQ3UO2rEg==", "license": "MIT", "dependencies": { "resolve-from": "^5.0.0" @@ -17222,8 +14065,6 @@ }, "node_modules/resolve-dir": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz", - "integrity": "sha512-R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg==", "dev": true, "license": "MIT", "dependencies": { @@ -17236,8 +14077,6 @@ }, "node_modules/resolve-from": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-5.0.0.tgz", - "integrity": "sha512-qYg9KP24dD5qka9J47d0aVky0N+b4fTU89LN9iDnjB5waksiC49rvMB0PrUJQGoTmH50XPiqOvAjDfaijGxYZw==", "license": "MIT", "engines": { "node": ">=8" @@ -17245,8 +14084,6 @@ }, "node_modules/resolve-path": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/resolve-path/-/resolve-path-1.4.0.tgz", - "integrity": "sha512-i1xevIst/Qa+nA9olDxLWnLk8YZbi8R/7JPbCMcgyWaFR6bKWaexgJgEB5oc2PKMjYdrHynyz0NY+if+H98t1w==", "dev": true, "license": "MIT", "dependencies": { @@ -17259,8 +14096,6 @@ }, "node_modules/resolve-path/node_modules/depd": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", "dev": true, "license": "MIT", "engines": { @@ -17269,8 +14104,6 @@ }, "node_modules/resolve-path/node_modules/http-errors": { "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", "dev": true, "license": "MIT", "dependencies": { @@ -17285,22 +14118,16 @@ }, "node_modules/resolve-path/node_modules/inherits": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", "dev": true, "license": "ISC" }, "node_modules/resolve-path/node_modules/setprototypeof": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", "dev": true, "license": "ISC" }, "node_modules/resolve-path/node_modules/statuses": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", "dev": true, "license": "MIT", "engines": { @@ -17309,8 +14136,6 @@ }, "node_modules/retry": { "version": "0.12.0", - "resolved": "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz", - "integrity": "sha512-9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow==", "license": "MIT", "engines": { "node": ">= 4" @@ -17318,8 +14143,6 @@ }, "node_modules/reusify": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.1.0.tgz", - "integrity": "sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==", "license": "MIT", "engines": { "iojs": ">=1.0.0", @@ -17328,14 +14151,10 @@ }, "node_modules/rfdc": { "version": "1.4.1", - "resolved": "https://registry.npmjs.org/rfdc/-/rfdc-1.4.1.tgz", - "integrity": "sha512-q1b3N5QkRUWUl7iyylaaj3kOpIT0N2i9MqIEQXP73GVsN9cw3fdx8X63cEmWhJGi2PPCF23Ijp7ktmd39rawIA==", "license": "MIT" }, "node_modules/rimraf": { "version": "5.0.10", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-5.0.10.tgz", - "integrity": "sha512-l0OE8wL34P4nJH/H2ffoaniAokM2qSmrtXHmlpvYr5AVVX8msAyW0l8NVJFDxlSK4u3Uh/f41cQheDVdnYijwQ==", "license": "ISC", "dependencies": { "glob": "^10.3.7" @@ -17349,8 +14168,6 @@ }, "node_modules/rimraf/node_modules/brace-expansion": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", - "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" @@ -17358,8 +14175,6 @@ }, "node_modules/rimraf/node_modules/glob": { "version": "10.5.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-10.5.0.tgz", - "integrity": "sha512-DfXN8DfhJ7NH3Oe7cFmu3NCu1wKbkReJ8TorzSAFbSKrlNaQSKfIzqYqVY8zlbs2NLBbWpRiU52GX2PbaBVNkg==", "license": "ISC", "dependencies": { "foreground-child": "^3.1.0", @@ -17378,14 +14193,10 @@ }, "node_modules/rimraf/node_modules/lru-cache": { "version": "10.4.3", - "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", - "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==", "license": "ISC" }, "node_modules/rimraf/node_modules/minimatch": { "version": "9.0.5", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz", - "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==", "license": "ISC", "dependencies": { "brace-expansion": "^2.0.1" @@ -17399,8 +14210,6 @@ }, "node_modules/rimraf/node_modules/path-scurry": { "version": "1.11.1", - "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", - "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", "license": "BlueOak-1.0.0", "dependencies": { "lru-cache": "^10.2.0", @@ -17415,8 +14224,6 @@ }, "node_modules/rollup": { "version": "4.53.3", - "resolved": "https://registry.npmjs.org/rollup/-/rollup-4.53.3.tgz", - "integrity": "sha512-w8GmOxZfBmKknvdXU1sdM9NHcoQejwF/4mNgj2JuEEdRaHwwF12K7e9eXn1nLZ07ad+du76mkVsyeb2rKGllsA==", "license": "MIT", "dependencies": { "@types/estree": "1.0.8" @@ -17456,8 +14263,6 @@ }, "node_modules/router": { "version": "2.2.0", - "resolved": "https://registry.npmjs.org/router/-/router-2.2.0.tgz", - "integrity": "sha512-nLTrUKm2UyiL7rlhapu/Zl45FwNgkZGaCpZbIHajDYgwlJCOzLSk+cIPAnsEqV955GjILJnKbdQC1nVPz+gAYQ==", "license": "MIT", "dependencies": { "debug": "^4.4.0", @@ -17472,8 +14277,6 @@ }, "node_modules/router/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -17489,14 +14292,10 @@ }, "node_modules/router/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, "node_modules/router/node_modules/path-to-regexp": { "version": "8.3.0", - "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-8.3.0.tgz", - "integrity": "sha512-7jdwVIRtsP8MYpdXSwOS0YdD0Du+qOoF/AEPIt88PcCFrZCzx41oxku1jD88hZBwbNUIEfpqvuhjFaMAqMTWnA==", "license": "MIT", "funding": { "type": "opencollective", @@ -17505,8 +14304,6 @@ }, "node_modules/run-applescript": { "version": "7.1.0", - "resolved": "https://registry.npmjs.org/run-applescript/-/run-applescript-7.1.0.tgz", - "integrity": "sha512-DPe5pVFaAsinSaV6QjQ6gdiedWDcRCbUuiQfQa2wmWV7+xC9bGulGI8+TdRmoFkAPaBXk8CrAbnlY2ISniJ47Q==", "license": "MIT", "engines": { "node": ">=18" @@ -17517,8 +14314,6 @@ }, "node_modules/run-parallel": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/run-parallel/-/run-parallel-1.2.0.tgz", - "integrity": "sha512-5l4VyZR86LZ/lDxZTR6jqL8AFE2S0IFLMP26AbjsLVADxHdhB/c0GUsH+y39UfCi3dzz8OlQuPmnaJOMoDHQBA==", "funding": [ { "type": "github", @@ -17540,8 +14335,6 @@ }, "node_modules/safe-array-concat": { "version": "1.1.3", - "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz", - "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==", "dev": true, "license": "MIT", "dependencies": { @@ -17560,15 +14353,11 @@ }, "node_modules/safe-array-concat/node_modules/isarray": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", "dev": true, "license": "MIT" }, "node_modules/safe-buffer": { "version": "5.2.1", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.2.1.tgz", - "integrity": "sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==", "funding": [ { "type": "github", @@ -17587,8 +14376,6 @@ }, "node_modules/safe-push-apply": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz", - "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==", "dev": true, "license": "MIT", "dependencies": { @@ -17604,15 +14391,11 @@ }, "node_modules/safe-push-apply/node_modules/isarray": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", "dev": true, "license": "MIT" }, "node_modules/safe-regex-test": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz", - "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==", "dev": true, "license": "MIT", "dependencies": { @@ -17629,33 +14412,23 @@ }, "node_modules/safer-buffer": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/safer-buffer/-/safer-buffer-2.1.2.tgz", - "integrity": "sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==", "license": "MIT" }, "node_modules/sax": { "version": "1.4.3", - "resolved": "https://registry.npmjs.org/sax/-/sax-1.4.3.tgz", - "integrity": "sha512-yqYn1JhPczigF94DMS+shiDMjDowYO6y9+wB/4WgO0Y19jWYk0lQ4tuG5KI7kj4FTp1wxPj5IFfcrz/s1c3jjQ==", "license": "BlueOak-1.0.0" }, "node_modules/search-insights": { "version": "2.17.3", - "resolved": "https://registry.npmjs.org/search-insights/-/search-insights-2.17.3.tgz", - "integrity": "sha512-RQPdCYTa8A68uM2jwxoY842xDhvx3E5LFL1LxvxCNMev4o5mLuokczhzjAgGwUZBAmOKZknArSxLKmXtIi2AxQ==", "license": "MIT", "peer": true }, "node_modules/select-hose": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz", - "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg==", "license": "MIT" }, "node_modules/semver": { "version": "7.7.3", - "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.3.tgz", - "integrity": "sha512-SdsKMrI9TdgjdweUSR9MweHA4EJ8YxHn8DFaDisvhVlUOe4BF1tLD7GAj0lIqWVl+dPb/rExr0Btby5loQm20Q==", "license": "ISC", "bin": { "semver": "bin/semver.js" @@ -17666,15 +14439,11 @@ }, "node_modules/semver-compare": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/semver-compare/-/semver-compare-1.0.0.tgz", - "integrity": "sha512-YM3/ITh2MJ5MtzaM429anh+x2jiLVjqILF4m4oyQB18W7Ggea7BfqdH/wGMK7dDiMghv/6WG7znWMwUDzJiXow==", "dev": true, "license": "MIT" }, "node_modules/send": { "version": "0.19.0", - "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz", - "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==", "license": "MIT", "dependencies": { "debug": "2.6.9", @@ -17697,8 +14466,6 @@ }, "node_modules/send/node_modules/encodeurl": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz", - "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==", "license": "MIT", "engines": { "node": ">= 0.8" @@ -17706,14 +14473,10 @@ }, "node_modules/send/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, "node_modules/serialize-error": { "version": "7.0.1", - "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-7.0.1.tgz", - "integrity": "sha512-8I8TjW5KMOKsZQTvoxjuSIa7foAwPWGOts+6o7sgjz41/qMD9VQHEDxi6PBvK2l0MXUmqZyNpUK+T2tQaaElvw==", "dev": true, "license": "MIT", "dependencies": { @@ -17728,8 +14491,6 @@ }, "node_modules/serialize-error/node_modules/type-fest": { "version": "0.13.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.13.1.tgz", - "integrity": "sha512-34R7HTnG0XIJcBSn5XhDd7nNFPRcXYRZrBB2O2jdKqYODldSzBAqzsWoZYYvduky73toYS/ESqxPvkDf/F0XMg==", "dev": true, "license": "(MIT OR CC0-1.0)", "engines": { @@ -17741,8 +14502,6 @@ }, "node_modules/serve-index-75lb": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/serve-index-75lb/-/serve-index-75lb-2.0.1.tgz", - "integrity": "sha512-/d9r8bqJlFQcwy0a0nb1KnWAA+Mno+V+VaoKocdkbW5aXKRQd/+4bfnRhQRQr6uEoYwTRJ4xgztOyCJvWcpBpQ==", "dev": true, "license": "MIT", "dependencies": { @@ -17760,8 +14519,6 @@ }, "node_modules/serve-index-75lb/node_modules/depd": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz", - "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==", "dev": true, "license": "MIT", "engines": { @@ -17770,8 +14527,6 @@ }, "node_modules/serve-index-75lb/node_modules/http-errors": { "version": "1.6.3", - "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz", - "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==", "dev": true, "license": "MIT", "dependencies": { @@ -17786,22 +14541,16 @@ }, "node_modules/serve-index-75lb/node_modules/inherits": { "version": "2.0.3", - "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz", - "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw==", "dev": true, "license": "ISC" }, "node_modules/serve-index-75lb/node_modules/setprototypeof": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz", - "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ==", "dev": true, "license": "ISC" }, "node_modules/serve-index-75lb/node_modules/statuses": { "version": "1.5.0", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz", - "integrity": "sha512-OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA==", "dev": true, "license": "MIT", "engines": { @@ -17810,8 +14559,6 @@ }, "node_modules/serve-static": { "version": "1.16.2", - "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz", - "integrity": "sha512-VqpjJZKadQB/PEbEwvFdO43Ax5dFBZ2UECszz8bQ7pi7wt//PWe1P6MN7eCnjsatYtBT6EuiClbjSWP2WrIoTw==", "license": "MIT", "dependencies": { "encodeurl": "~2.0.0", @@ -17825,15 +14572,11 @@ }, "node_modules/set-blocking": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz", - "integrity": "sha512-KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw==", "dev": true, "license": "ISC" }, "node_modules/set-function-length": { "version": "1.2.2", - "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz", - "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==", "dev": true, "license": "MIT", "dependencies": { @@ -17850,8 +14593,6 @@ }, "node_modules/set-function-name": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz", - "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==", "dev": true, "license": "MIT", "dependencies": { @@ -17866,8 +14607,6 @@ }, "node_modules/set-proto": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz", - "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==", "dev": true, "license": "MIT", "dependencies": { @@ -17881,14 +14620,10 @@ }, "node_modules/setprototypeof": { "version": "1.2.0", - "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz", - "integrity": "sha512-E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw==", "license": "ISC" }, "node_modules/shebang-command": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-2.0.0.tgz", - "integrity": "sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA==", "license": "MIT", "dependencies": { "shebang-regex": "^3.0.0" @@ -17899,8 +14634,6 @@ }, "node_modules/shebang-regex": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-3.0.0.tgz", - "integrity": "sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==", "license": "MIT", "engines": { "node": ">=8" @@ -17908,8 +14641,6 @@ }, "node_modules/shiki": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/shiki/-/shiki-2.5.0.tgz", - "integrity": "sha512-mI//trrsaiCIPsja5CNfsyNOqgAZUb6VpJA+340toL42UpzQlXpwRV9nch69X6gaUxrr9kaOOa6e3y3uAkGFxQ==", "license": "MIT", "dependencies": { "@shikijs/core": "2.5.0", @@ -17924,8 +14655,6 @@ }, "node_modules/side-channel": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz", - "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==", "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -17943,8 +14672,6 @@ }, "node_modules/side-channel-list": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz", - "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==", "license": "MIT", "dependencies": { "es-errors": "^1.3.0", @@ -17959,8 +14686,6 @@ }, "node_modules/side-channel-map": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz", - "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==", "license": "MIT", "dependencies": { "call-bound": "^1.0.2", @@ -17977,8 +14702,6 @@ }, "node_modules/side-channel-weakmap": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz", - "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==", "license": "MIT", "dependencies": { "call-bound": "^1.0.2", @@ -17996,8 +14719,6 @@ }, "node_modules/signal-exit": { "version": "4.1.0", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-4.1.0.tgz", - "integrity": "sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw==", "license": "ISC", "engines": { "node": ">=14" @@ -18008,8 +14729,6 @@ }, "node_modules/sigstore": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/sigstore/-/sigstore-4.0.0.tgz", - "integrity": "sha512-Gw/FgHtrLM9WP8P5lLcSGh9OQcrTruWCELAiS48ik1QbL0cH+dfjomiRTUE9zzz+D1N6rOLkwXUvVmXZAsNE0Q==", "license": "Apache-2.0", "dependencies": { "@sigstore/bundle": "^4.0.0", @@ -18024,16 +14743,14 @@ } }, "node_modules/sinon": { - "version": "21.0.1", - "resolved": "https://registry.npmjs.org/sinon/-/sinon-21.0.1.tgz", - "integrity": "sha512-Z0NVCW45W8Mg5oC/27/+fCqIHFnW8kpkFOq0j9XJIev4Ld0mKmERaZv5DMLAb9fGCevjKwaEeIQz5+MBXfZcDw==", + "version": "21.0.0", "dev": true, "license": "BSD-3-Clause", "dependencies": { "@sinonjs/commons": "^3.0.1", - "@sinonjs/fake-timers": "^15.1.0", - "@sinonjs/samsam": "^8.0.3", - "diff": "^8.0.2", + "@sinonjs/fake-timers": "^13.0.5", + "@sinonjs/samsam": "^8.0.1", + "diff": "^7.0.0", "supports-color": "^7.2.0" }, "funding": { @@ -18043,8 +14760,6 @@ }, "node_modules/slash": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz", - "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==", "license": "MIT", "engines": { "node": ">=14.16" @@ -18055,8 +14770,6 @@ }, "node_modules/slice-ansi": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/slice-ansi/-/slice-ansi-5.0.0.tgz", - "integrity": "sha512-FC+lgizVPfie0kkhqUScwRu1O/lF6NOgJmlCgK+/LYxDCTk8sGelYaHDhFcDN+Sn3Cv+3VSa4Byeo+IMCzpMgQ==", "dev": true, "license": "MIT", "dependencies": { @@ -18072,8 +14785,6 @@ }, "node_modules/smart-buffer": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.2.0.tgz", - "integrity": "sha512-94hK0Hh8rPqQl2xXc3HsaBoOXKV20MToPkcXvwbISWLEs+64sBq5kFgn2kJDHb1Pry9yrP0dxrCI9RRci7RXKg==", "license": "MIT", "engines": { "node": ">= 6.0.0", @@ -18082,8 +14793,6 @@ }, "node_modules/socks": { "version": "2.8.7", - "resolved": "https://registry.npmjs.org/socks/-/socks-2.8.7.tgz", - "integrity": "sha512-HLpt+uLy/pxB+bum/9DzAgiKS8CX1EvbWxI4zlmgGCExImLdiad2iCwXT5Z4c9c3Eq8rP2318mPW2c+QbtjK8A==", "license": "MIT", "dependencies": { "ip-address": "^10.0.1", @@ -18096,8 +14805,6 @@ }, "node_modules/socks-proxy-agent": { "version": "8.0.5", - "resolved": "https://registry.npmjs.org/socks-proxy-agent/-/socks-proxy-agent-8.0.5.tgz", - "integrity": "sha512-HehCEsotFqbPW9sJ8WVYB6UbmIMv7kUUORIF2Nncq4VQvBfNBLibW9YZR5dlYCSUhwcD628pRllm7n+E+YTzJw==", "license": "MIT", "dependencies": { "agent-base": "^7.1.2", @@ -18110,8 +14817,6 @@ }, "node_modules/socks-proxy-agent/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -18127,14 +14832,10 @@ }, "node_modules/socks-proxy-agent/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, "node_modules/source-map": { "version": "0.6.1", - "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz", - "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==", "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -18142,8 +14843,6 @@ }, "node_modules/source-map-js": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/source-map-js/-/source-map-js-1.2.1.tgz", - "integrity": "sha512-UXWMKhLOwVKb728IUtQPXxfYU+usdybtUrK/8uGE8CQMvrhOpwvzDBwj0QhSL7MQc7vIsISBG8VQ8+IDQxpfQA==", "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -18151,8 +14850,6 @@ }, "node_modules/source-map-support": { "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", "license": "MIT", "dependencies": { "buffer-from": "^1.0.0", @@ -18161,8 +14858,6 @@ }, "node_modules/space-separated-tokens": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/space-separated-tokens/-/space-separated-tokens-2.0.2.tgz", - "integrity": "sha512-PEGlAwrG8yXGXRjW32fGbg66JAlOAwbObuqVoJpv/mRgoWDQfgH1wDPvtzWyUSNAXBGSk8h755YDbbcEy3SH2Q==", "license": "MIT", "funding": { "type": "github", @@ -18171,8 +14866,6 @@ }, "node_modules/spawn-wrap": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/spawn-wrap/-/spawn-wrap-2.0.0.tgz", - "integrity": "sha512-EeajNjfN9zMnULLwhZZQU3GWBoFNkbngTUPfaawT4RkMiviTxcX0qfhVbGey39mfctfDHkWtuecgQ8NJcyQWHg==", "dev": true, "license": "ISC", "dependencies": { @@ -18189,8 +14882,6 @@ }, "node_modules/spawn-wrap/node_modules/foreground-child": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-2.0.0.tgz", - "integrity": "sha512-dCIq9FpEcyQyXKCkyzmlPTFNgrCzPudOe+mhvJU5zAtlBnGVy2yKxtfsxK2tQBThwq225jcvBjpw1Gr40uzZCA==", "dev": true, "license": "ISC", "dependencies": { @@ -18203,9 +14894,6 @@ }, "node_modules/spawn-wrap/node_modules/glob": { "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "license": "ISC", "dependencies": { @@ -18225,15 +14913,11 @@ }, "node_modules/spawn-wrap/node_modules/isexe": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz", - "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==", "dev": true, "license": "ISC" }, "node_modules/spawn-wrap/node_modules/make-dir": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz", - "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==", "dev": true, "license": "MIT", "dependencies": { @@ -18248,8 +14932,6 @@ }, "node_modules/spawn-wrap/node_modules/minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "license": "ISC", "dependencies": { @@ -18261,9 +14943,6 @@ }, "node_modules/spawn-wrap/node_modules/rimraf": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz", - "integrity": "sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA==", - "deprecated": "Rimraf versions prior to v4 are no longer supported", "dev": true, "license": "ISC", "dependencies": { @@ -18278,8 +14957,6 @@ }, "node_modules/spawn-wrap/node_modules/semver": { "version": "6.3.1", - "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz", - "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==", "dev": true, "license": "ISC", "bin": { @@ -18288,15 +14965,11 @@ }, "node_modules/spawn-wrap/node_modules/signal-exit": { "version": "3.0.7", - "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz", - "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ==", "dev": true, "license": "ISC" }, "node_modules/spawn-wrap/node_modules/which": { "version": "2.0.2", - "resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz", - "integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==", "dev": true, "license": "ISC", "dependencies": { @@ -18311,8 +14984,6 @@ }, "node_modules/spdx-compare": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/spdx-compare/-/spdx-compare-1.0.0.tgz", - "integrity": "sha512-C1mDZOX0hnu0ep9dfmuoi03+eOdDoz2yvK79RxbcrVEG1NO1Ph35yW102DHWKN4pk80nwCgeMmSY5L25VE4D9A==", "dev": true, "license": "MIT", "dependencies": { @@ -18323,8 +14994,6 @@ }, "node_modules/spdx-compare/node_modules/spdx-expression-parse": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, "license": "MIT", "dependencies": { @@ -18334,8 +15003,6 @@ }, "node_modules/spdx-correct": { "version": "3.2.0", - "resolved": "https://registry.npmjs.org/spdx-correct/-/spdx-correct-3.2.0.tgz", - "integrity": "sha512-kN9dJbvnySHULIluDHy32WHRUu3Og7B9sbY7tsFLctQkIqnMh3hErYgdMjTYuqmcXX+lK5T1lnUt3G7zNswmZA==", "license": "Apache-2.0", "dependencies": { "spdx-expression-parse": "^3.0.0", @@ -18344,8 +15011,6 @@ }, "node_modules/spdx-correct/node_modules/spdx-expression-parse": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "license": "MIT", "dependencies": { "spdx-exceptions": "^2.1.0", @@ -18354,14 +15019,10 @@ }, "node_modules/spdx-exceptions": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/spdx-exceptions/-/spdx-exceptions-2.5.0.tgz", - "integrity": "sha512-PiU42r+xO4UbUS1buo3LPJkjlO7430Xn5SVAhdpzzsPHsjbYVflnnFdATgabnLude+Cqu25p6N+g2lw/PFsa4w==", "license": "CC-BY-3.0" }, "node_modules/spdx-expression-parse": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-4.0.0.tgz", - "integrity": "sha512-Clya5JIij/7C6bRR22+tnGXbc4VKlibKSVj2iHvVeX5iMW7s1SIQlqu699JkODJJIhh/pUu8L0/VLh8xflD+LQ==", "dev": true, "license": "MIT", "dependencies": { @@ -18371,8 +15032,6 @@ }, "node_modules/spdx-expression-validate": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/spdx-expression-validate/-/spdx-expression-validate-2.0.0.tgz", - "integrity": "sha512-b3wydZLM+Tc6CFvaRDBOF9d76oGIHNCLYFeHbftFXUWjnfZWganmDmvtM5sm1cRwJc/VDBMLyGGrsLFd1vOxbg==", "dev": true, "license": "(MIT AND CC-BY-3.0)", "dependencies": { @@ -18381,8 +15040,6 @@ }, "node_modules/spdx-expression-validate/node_modules/spdx-expression-parse": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "dev": true, "license": "MIT", "dependencies": { @@ -18392,28 +15049,20 @@ }, "node_modules/spdx-license-ids": { "version": "3.0.22", - "resolved": "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-3.0.22.tgz", - "integrity": "sha512-4PRT4nh1EImPbt2jASOKHX7PB7I+e4IWNLvkKFDxNhJlfjbYlleYQh285Z/3mPTHSAK/AvdMmw5BNNuYH8ShgQ==", "license": "CC0-1.0" }, "node_modules/spdx-osi": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdx-osi/-/spdx-osi-3.0.0.tgz", - "integrity": "sha512-7DZMaD/rNHWGf82qWOazBsLXQsaLsoJb9RRjhEUQr5o86kw3A1ErGzSdvaXl+KalZyKkkU5T2a5NjCCutAKQSw==", "dev": true, "license": "CC0-1.0" }, "node_modules/spdx-ranges": { "version": "2.1.1", - "resolved": "https://registry.npmjs.org/spdx-ranges/-/spdx-ranges-2.1.1.tgz", - "integrity": "sha512-mcdpQFV7UDAgLpXEE/jOMqvK4LBoO0uTQg0uvXUewmEFhpiZx5yJSZITHB8w1ZahKdhfZqP5GPEOKLyEq5p8XA==", "dev": true, "license": "(MIT AND CC-BY-3.0)" }, "node_modules/spdx-whitelisted": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/spdx-whitelisted/-/spdx-whitelisted-1.0.0.tgz", - "integrity": "sha512-X4FOpUCvZuo42MdB1zAZ/wdX4N0lLcWDozf2KYFVDgtLv8Lx+f31LOYLP2/FcwTzsPi64bS/VwKqklI4RBletg==", "dev": true, "license": "MIT", "dependencies": { @@ -18423,8 +15072,6 @@ }, "node_modules/spdy": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz", - "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==", "license": "MIT", "dependencies": { "debug": "^4.1.0", @@ -18439,8 +15086,6 @@ }, "node_modules/spdy-transport": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz", - "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==", "license": "MIT", "dependencies": { "debug": "^4.1.0", @@ -18453,8 +15098,6 @@ }, "node_modules/spdy-transport/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -18470,14 +15113,10 @@ }, "node_modules/spdy-transport/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, "node_modules/spdy-transport/node_modules/readable-stream": { "version": "3.6.2", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", - "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==", "license": "MIT", "dependencies": { "inherits": "^2.0.3", @@ -18490,8 +15129,6 @@ }, "node_modules/spdy/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -18507,14 +15144,10 @@ }, "node_modules/spdy/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, "node_modules/speakingurl": { "version": "14.0.1", - "resolved": "https://registry.npmjs.org/speakingurl/-/speakingurl-14.0.1.tgz", - "integrity": "sha512-1POYv7uv2gXoyGFpBCmpDVSNV74IfsWlDW216UPjbWufNf+bSU6GdbDsxdcxtfwb4xlI3yxzOTKClUosxARYrQ==", "license": "BSD-3-Clause", "engines": { "node": ">=0.10.0" @@ -18522,8 +15155,6 @@ }, "node_modules/split2": { "version": "4.2.0", - "resolved": "https://registry.npmjs.org/split2/-/split2-4.2.0.tgz", - "integrity": "sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==", "dev": true, "license": "ISC", "engines": { @@ -18532,15 +15163,11 @@ }, "node_modules/sprintf-js": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz", - "integrity": "sha512-D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g==", "dev": true, "license": "BSD-3-Clause" }, "node_modules/ssri": { "version": "13.0.0", - "resolved": "https://registry.npmjs.org/ssri/-/ssri-13.0.0.tgz", - "integrity": "sha512-yizwGBpbCn4YomB2lzhZqrHLJoqFGXihNbib3ozhqF/cIp5ue+xSmOQrjNasEE62hFxsCcg/V/z23t4n8jMEng==", "license": "ISC", "dependencies": { "minipass": "^7.0.3" @@ -18551,8 +15178,6 @@ }, "node_modules/stack-utils": { "version": "2.0.6", - "resolved": "https://registry.npmjs.org/stack-utils/-/stack-utils-2.0.6.tgz", - "integrity": "sha512-XlkWvfIm6RmsWtNJx+uqtKLS8eqFbxUg0ZzLXqY0caEy9l7hruX8IpiDnjsLavoBgqCCR71TqWO8MaXYheJ3RQ==", "dev": true, "license": "MIT", "dependencies": { @@ -18564,8 +15189,6 @@ }, "node_modules/stack-utils/node_modules/escape-string-regexp": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-2.0.0.tgz", - "integrity": "sha512-UpzcLCXolUWcNu5HtVMHYdXJjArjsF9C0aNnquZYY4uW/Vu0miy5YoWvbV345HauVvcAUnpRuhMMcqTcGOY2+w==", "dev": true, "license": "MIT", "engines": { @@ -18574,8 +15197,6 @@ }, "node_modules/statuses": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz", - "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==", "license": "MIT", "engines": { "node": ">= 0.8" @@ -18583,8 +15204,6 @@ }, "node_modules/stop-iteration-iterator": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/stop-iteration-iterator/-/stop-iteration-iterator-1.1.0.tgz", - "integrity": "sha512-eLoXW/DHyl62zxY4SCaIgnRhuMr6ri4juEYARS8E6sCEqzKpOiE521Ucofdx+KnDZl5xmvGYaaKCk5FEOxJCoQ==", "dev": true, "license": "MIT", "dependencies": { @@ -18597,8 +15216,6 @@ }, "node_modules/stream-log-stats": { "version": "3.0.2", - "resolved": "https://registry.npmjs.org/stream-log-stats/-/stream-log-stats-3.0.2.tgz", - "integrity": "sha512-393j7aeF9iRdHvyANqEQU82UQmpw2CTxgsT83caefh+lOxavVLbVrw8Mr4zjXeZLh2+xeHZMKfVx4T0rJ/EchA==", "dev": true, "license": "MIT", "dependencies": { @@ -18619,8 +15236,6 @@ }, "node_modules/stream-log-stats/node_modules/ansi-escape-sequences": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/ansi-escape-sequences/-/ansi-escape-sequences-5.1.2.tgz", - "integrity": "sha512-JcpoVp1W1bl1Qn4cVuiXEhD6+dyXKSOgCn2zlzE8inYgCJCBy1aPnUhlz6I4DFum8D4ovb9Qi/iAjUcGvG2lqw==", "dev": true, "license": "MIT", "dependencies": { @@ -18632,8 +15247,6 @@ }, "node_modules/stream-log-stats/node_modules/array-back": { "version": "4.0.2", - "resolved": "https://registry.npmjs.org/array-back/-/array-back-4.0.2.tgz", - "integrity": "sha512-NbdMezxqf94cnNfWLL7V/im0Ub+Anbb0IoZhvzie8+4HJ4nMQuzHuy49FkGYCJK2yAloZ3meiB6AVMClbrI1vg==", "dev": true, "license": "MIT", "engines": { @@ -18642,8 +15255,6 @@ }, "node_modules/stream-log-stats/node_modules/byte-size": { "version": "6.2.0", - "resolved": "https://registry.npmjs.org/byte-size/-/byte-size-6.2.0.tgz", - "integrity": "sha512-6EspYUCAPMc7E2rltBgKwhG+Cmk0pDm9zDtF1Awe2dczNUL3YpZ8mTs/dueOTS1hqGWBOatqef4jYMGjln7WmA==", "dev": true, "license": "MIT", "engines": { @@ -18652,8 +15263,6 @@ }, "node_modules/stream-log-stats/node_modules/table-layout": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-1.0.2.tgz", - "integrity": "sha512-qd/R7n5rQTRFi+Zf2sk5XVVd9UQl6ZkduPFC3S7WEGJAmetDTjY3qPN50eSKzwuzEyQKy5TN2TiZdkIjos2L6A==", "dev": true, "license": "MIT", "dependencies": { @@ -18668,8 +15277,6 @@ }, "node_modules/stream-log-stats/node_modules/typical": { "version": "5.2.0", - "resolved": "https://registry.npmjs.org/typical/-/typical-5.2.0.tgz", - "integrity": "sha512-dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg==", "dev": true, "license": "MIT", "engines": { @@ -18678,8 +15285,6 @@ }, "node_modules/stream-log-stats/node_modules/wordwrapjs": { "version": "4.0.1", - "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-4.0.1.tgz", - "integrity": "sha512-kKlNACbvHrkpIw6oPeYDSmdCTu2hdMHoyXLTcUKala++lx5Y+wjJ/e474Jqv5abnVmwxw08DiTuHmw69lJGksA==", "dev": true, "license": "MIT", "dependencies": { @@ -18692,15 +15297,11 @@ }, "node_modules/stream-slice": { "version": "0.1.2", - "resolved": "https://registry.npmjs.org/stream-slice/-/stream-slice-0.1.2.tgz", - "integrity": "sha512-QzQxpoacatkreL6jsxnVb7X5R/pGw9OUv2qWTYWnmLpg4NdN31snPy/f3TdQE1ZUXaThRvj1Zw4/OGg0ZkaLMA==", "dev": true, "license": "MIT" }, "node_modules/stream-via": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/stream-via/-/stream-via-1.0.4.tgz", - "integrity": "sha512-DBp0lSvX5G9KGRDTkR/R+a29H+Wk2xItOF+MpZLLNDWbEV9tGPnqLPxHEYjmiz8xGtJHRIqmI+hCjmNzqoA4nQ==", "dev": true, "license": "MIT", "engines": { @@ -18709,8 +15310,6 @@ }, "node_modules/streaming-json-stringify": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/streaming-json-stringify/-/streaming-json-stringify-3.1.0.tgz", - "integrity": "sha512-axtfs3BDxAsrZ9swD163FBrXZ8dhJJp6kUI6C97TvUZG9RHKfbg9nFbXqEheFNOb3IYMEt2ag9F62sWLFUZ4ug==", "dev": true, "license": "MIT", "dependencies": { @@ -18720,8 +15319,6 @@ }, "node_modules/streaming-json-stringify/node_modules/readable-stream": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz", - "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==", "dev": true, "license": "MIT", "dependencies": { @@ -18736,15 +15333,11 @@ }, "node_modules/streaming-json-stringify/node_modules/safe-buffer": { "version": "5.1.2", - "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz", - "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==", "dev": true, "license": "MIT" }, "node_modules/streaming-json-stringify/node_modules/string_decoder": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz", - "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==", "dev": true, "license": "MIT", "dependencies": { @@ -18753,8 +15346,6 @@ }, "node_modules/string_decoder": { "version": "1.3.0", - "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz", - "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==", "license": "MIT", "dependencies": { "safe-buffer": "~5.2.0" @@ -18762,8 +15353,6 @@ }, "node_modules/string-width": { "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", @@ -18777,8 +15366,6 @@ "node_modules/string-width-cjs": { "name": "string-width", "version": "4.2.3", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-4.2.3.tgz", - "integrity": "sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==", "license": "MIT", "dependencies": { "emoji-regex": "^8.0.0", @@ -18791,8 +15378,6 @@ }, "node_modules/string-width-cjs/node_modules/ansi-regex": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "license": "MIT", "engines": { "node": ">=8" @@ -18800,8 +15385,6 @@ }, "node_modules/string-width-cjs/node_modules/is-fullwidth-code-point": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "license": "MIT", "engines": { "node": ">=8" @@ -18809,8 +15392,6 @@ }, "node_modules/string-width-cjs/node_modules/strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -18821,8 +15402,6 @@ }, "node_modules/string-width/node_modules/ansi-regex": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "license": "MIT", "engines": { "node": ">=8" @@ -18830,8 +15409,6 @@ }, "node_modules/string-width/node_modules/is-fullwidth-code-point": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz", - "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==", "license": "MIT", "engines": { "node": ">=8" @@ -18839,8 +15416,6 @@ }, "node_modules/string-width/node_modules/strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -18851,8 +15426,6 @@ }, "node_modules/string.prototype.trim": { "version": "1.2.10", - "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz", - "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==", "dev": true, "license": "MIT", "dependencies": { @@ -18873,8 +15446,6 @@ }, "node_modules/string.prototype.trimend": { "version": "1.0.9", - "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz", - "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==", "dev": true, "license": "MIT", "dependencies": { @@ -18892,8 +15463,6 @@ }, "node_modules/string.prototype.trimstart": { "version": "1.0.8", - "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz", - "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==", "dev": true, "license": "MIT", "dependencies": { @@ -18910,8 +15479,6 @@ }, "node_modules/stringify-entities": { "version": "4.0.4", - "resolved": "https://registry.npmjs.org/stringify-entities/-/stringify-entities-4.0.4.tgz", - "integrity": "sha512-IwfBptatlO+QCJUo19AqvrPNqlVMpW9YEL2LIVY+Rpv2qsjCGxaDLNRgeGsQWJhfItebuJhsGSLjaBbNSQ+ieg==", "license": "MIT", "dependencies": { "character-entities-html4": "^2.0.0", @@ -18924,8 +15491,6 @@ }, "node_modules/stringify-object-es5": { "version": "2.5.0", - "resolved": "https://registry.npmjs.org/stringify-object-es5/-/stringify-object-es5-2.5.0.tgz", - "integrity": "sha512-vE7Xdx9ylG4JI16zy7/ObKUB+MtxuMcWlj/WHHr3+yAlQoN6sst2stU9E+2Qs3OrlJw/Pf3loWxL1GauEHf6MA==", "dev": true, "license": "BSD-2-Clause", "dependencies": { @@ -18938,8 +15503,6 @@ }, "node_modules/stringify-object-es5/node_modules/is-plain-obj": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz", - "integrity": "sha512-yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg==", "dev": true, "license": "MIT", "engines": { @@ -18948,8 +15511,6 @@ }, "node_modules/strip-ansi": { "version": "7.1.2", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-7.1.2.tgz", - "integrity": "sha512-gmBGslpoQJtgnMAvOVqGZpEz9dyoKTCzy2nfz/n8aIFhN/jCE/rCmcxabB6jOOHV+0WNnylOxaxBQPSvcWklhA==", "license": "MIT", "dependencies": { "ansi-regex": "^6.0.1" @@ -18964,8 +15525,6 @@ "node_modules/strip-ansi-cjs": { "name": "strip-ansi", "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -18976,8 +15535,6 @@ }, "node_modules/strip-ansi-cjs/node_modules/ansi-regex": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "license": "MIT", "engines": { "node": ">=8" @@ -18985,8 +15542,6 @@ }, "node_modules/strip-bom": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-4.0.0.tgz", - "integrity": "sha512-3xurFv5tEgii33Zi8Jtp55wEIILR9eh34FAW00PZf+JnSsTmV/ioewSgQl97JHvgjoRGwPShsWm+IdrxB35d0w==", "dev": true, "license": "MIT", "engines": { @@ -18995,8 +15550,6 @@ }, "node_modules/strip-final-newline": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/strip-final-newline/-/strip-final-newline-4.0.0.tgz", - "integrity": "sha512-aulFJcD6YK8V1G7iRB5tigAP4TsHBZZrOV8pjV++zdUwmeV8uzbY7yn6h9MswN62adStNZFuCIx4haBnRuMDaw==", "dev": true, "license": "MIT", "engines": { @@ -19008,8 +15561,6 @@ }, "node_modules/strip-json-comments": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz", - "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==", "license": "MIT", "engines": { "node": ">=8" @@ -19020,8 +15571,6 @@ }, "node_modules/strtok3": { "version": "7.1.1", - "resolved": "https://registry.npmjs.org/strtok3/-/strtok3-7.1.1.tgz", - "integrity": "sha512-mKX8HA/cdBqMKUr0MMZAFssCkIGoZeSCMXgnt79yKxNFguMLVFgRe6wB+fsL0NmoHDbeyZXczy7vEPSoo3rkzg==", "dev": true, "license": "MIT", "dependencies": { @@ -19038,8 +15587,6 @@ }, "node_modules/stubborn-fs": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/stubborn-fs/-/stubborn-fs-2.0.0.tgz", - "integrity": "sha512-Y0AvSwDw8y+nlSNFXMm2g6L51rBGdAQT20J3YSOqxC53Lo3bjWRtr2BKcfYoAf352WYpsZSTURrA0tqhfgudPA==", "license": "MIT", "dependencies": { "stubborn-utils": "^1.0.1" @@ -19047,14 +15594,10 @@ }, "node_modules/stubborn-utils": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/stubborn-utils/-/stubborn-utils-1.0.2.tgz", - "integrity": "sha512-zOh9jPYI+xrNOyisSelgym4tolKTJCQd5GBhK0+0xJvcYDcwlOoxF/rnFKQ2KRZknXSG9jWAp66fwP6AxN9STg==", "license": "MIT" }, "node_modules/stylehacks": { "version": "7.0.7", - "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-7.0.7.tgz", - "integrity": "sha512-bJkD0JkEtbRrMFtwgpJyBbFIwfDDONQ1Ov3sDLZQP8HuJ73kBOyx66H4bOcAbVWmnfLdvQ0AJwXxOMkpujcO6g==", "license": "MIT", "dependencies": { "browserslist": "^4.27.0", @@ -19069,8 +15612,6 @@ }, "node_modules/sucrase": { "version": "3.35.1", - "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.1.tgz", - "integrity": "sha512-DhuTmvZWux4H1UOnWMB3sk0sbaCVOoQZjv8u1rDoTV0HTdGem9hkAZtl4JZy8P2z4Bg0nT+YMeOFyVr4zcG5Tw==", "license": "MIT", "dependencies": { "@jridgewell/gen-mapping": "^0.3.2", @@ -19091,8 +15632,6 @@ }, "node_modules/sucrase/node_modules/commander": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz", - "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==", "license": "MIT", "engines": { "node": ">= 6" @@ -19100,8 +15639,6 @@ }, "node_modules/superagent": { "version": "10.2.3", - "resolved": "https://registry.npmjs.org/superagent/-/superagent-10.2.3.tgz", - "integrity": "sha512-y/hkYGeXAj7wUMjxRbB21g/l6aAEituGXM9Rwl4o20+SX3e8YOSV6BxFXl+dL3Uk0mjSL3kCbNkwURm8/gEDig==", "dev": true, "license": "MIT", "dependencies": { @@ -19121,8 +15658,6 @@ }, "node_modules/superagent/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "dev": true, "license": "MIT", "dependencies": { @@ -19139,8 +15674,6 @@ }, "node_modules/superagent/node_modules/mime": { "version": "2.6.0", - "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz", - "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==", "dev": true, "license": "MIT", "bin": { @@ -19152,15 +15685,11 @@ }, "node_modules/superagent/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "dev": true, "license": "MIT" }, "node_modules/superjson": { "version": "2.2.5", - "resolved": "https://registry.npmjs.org/superjson/-/superjson-2.2.5.tgz", - "integrity": "sha512-zWPTX96LVsA/eVYnqOM2+ofcdPqdS1dAF1LN4TS2/MWuUpfitd9ctTa87wt4xrYnZnkLtS69xpBdSxVBP5Rm6w==", "license": "MIT", "dependencies": { "copy-anything": "^4" @@ -19171,8 +15700,6 @@ }, "node_modules/supertap": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/supertap/-/supertap-3.0.1.tgz", - "integrity": "sha512-u1ZpIBCawJnO+0QePsEiOknOfCRq0yERxiAchT0i4li0WHNUJbf0evXXSXOcCAR4M8iMDoajXYmstm/qO81Isw==", "dev": true, "license": "MIT", "dependencies": { @@ -19187,8 +15714,6 @@ }, "node_modules/supertap/node_modules/argparse": { "version": "1.0.10", - "resolved": "https://registry.npmjs.org/argparse/-/argparse-1.0.10.tgz", - "integrity": "sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==", "dev": true, "license": "MIT", "dependencies": { @@ -19197,8 +15722,6 @@ }, "node_modules/supertap/node_modules/js-yaml": { "version": "3.14.2", - "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.2.tgz", - "integrity": "sha512-PMSmkqxr106Xa156c2M265Z+FTrPl+oxd/rgOQy2tijQeK5TxQ43psO1ZCwhVOSdnn+RzkzlRz/eY4BgJBYVpg==", "dev": true, "license": "MIT", "dependencies": { @@ -19211,8 +15734,6 @@ }, "node_modules/supertest": { "version": "7.1.4", - "resolved": "https://registry.npmjs.org/supertest/-/supertest-7.1.4.tgz", - "integrity": "sha512-tjLPs7dVyqgItVFirHYqe2T+MfWc2VOBQ8QFKKbWTA3PU7liZR8zoSpAi/C1k1ilm9RsXIKYf197oap9wXGVYg==", "dev": true, "license": "MIT", "dependencies": { @@ -19225,8 +15746,6 @@ }, "node_modules/supports-color": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", - "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", "dev": true, "license": "MIT", "dependencies": { @@ -19238,8 +15757,6 @@ }, "node_modules/supports-preserve-symlinks-flag": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz", - "integrity": "sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w==", "license": "MIT", "engines": { "node": ">= 0.4" @@ -19250,8 +15767,6 @@ }, "node_modules/svgo": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/svgo/-/svgo-4.0.0.tgz", - "integrity": "sha512-VvrHQ+9uniE+Mvx3+C9IEe/lWasXCU0nXMY2kZeLrHNICuRiC8uMPyM14UEaMOFA5mhyQqEkB02VoQ16n3DLaw==", "license": "MIT", "dependencies": { "commander": "^11.1.0", @@ -19275,8 +15790,6 @@ }, "node_modules/svgo/node_modules/commander": { "version": "11.1.0", - "resolved": "https://registry.npmjs.org/commander/-/commander-11.1.0.tgz", - "integrity": "sha512-yPVavfyCcRhmorC7rWlkHn15b4wDVgVmBA7kV4QVBsF7kv/9TKJAbAXVTxvTnwP8HHKjRCJDClKbciiYS7p0DQ==", "license": "MIT", "engines": { "node": ">=16" @@ -19284,14 +15797,10 @@ }, "node_modules/tabbable": { "version": "6.3.0", - "resolved": "https://registry.npmjs.org/tabbable/-/tabbable-6.3.0.tgz", - "integrity": "sha512-EIHvdY5bPLuWForiR/AN2Bxngzpuwn1is4asboytXtpTgsArc+WmSJKVLlhdh71u7jFcryDqB2A8lQvj78MkyQ==", "license": "MIT" }, "node_modules/table-layout": { "version": "4.1.1", - "resolved": "https://registry.npmjs.org/table-layout/-/table-layout-4.1.1.tgz", - "integrity": "sha512-iK5/YhZxq5GO5z8wb0bY1317uDF3Zjpha0QFFLA8/trAoiLbQD0HUbMesEaxyzUgDxi2QlcbM8IvqOlEjgoXBA==", "dev": true, "license": "MIT", "dependencies": { @@ -19304,8 +15813,6 @@ }, "node_modules/tailwindcss": { "version": "3.4.18", - "resolved": "https://registry.npmjs.org/tailwindcss/-/tailwindcss-3.4.18.tgz", - "integrity": "sha512-6A2rnmW5xZMdw11LYjhcI5846rt9pbLSabY5XPxo+XWdxwZaFEn47Go4NzFiHu9sNNmr/kXivP1vStfvMaK1GQ==", "license": "MIT", "dependencies": { "@alloc/quick-lru": "^5.2.0", @@ -19341,8 +15848,6 @@ }, "node_modules/tailwindcss/node_modules/jiti": { "version": "1.21.7", - "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz", - "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==", "license": "MIT", "bin": { "jiti": "bin/jiti.js" @@ -19350,8 +15855,6 @@ }, "node_modules/tailwindcss/node_modules/postcss-selector-parser": { "version": "6.1.2", - "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-6.1.2.tgz", - "integrity": "sha512-Q8qQfPiZ+THO/3ZrOrO0cJJKfpYCagtMUkXbnEfmgUjwXg6z/WBeOyS9APBBPCTSiDV+s4SwQGu8yFsiMRIudg==", "license": "MIT", "dependencies": { "cssesc": "^3.0.0", @@ -19363,8 +15866,6 @@ }, "node_modules/tar": { "version": "7.5.2", - "resolved": "https://registry.npmjs.org/tar/-/tar-7.5.2.tgz", - "integrity": "sha512-7NyxrTE4Anh8km8iEy7o0QYPs+0JKBTj5ZaqHg6B39erLg0qYXN3BijtShwbsNSvQ+LN75+KV+C4QR/f6Gwnpg==", "license": "BlueOak-1.0.0", "dependencies": { "@isaacs/fs-minipass": "^4.0.0", @@ -19379,8 +15880,6 @@ }, "node_modules/temp-dir": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-3.0.0.tgz", - "integrity": "sha512-nHc6S/bwIilKHNRgK/3jlhDoIHcp45YgyiwcAk46Tr0LfEqGBVpmiAyuiuxeVE44m3mXnEeVhaipLOEWmH+Njw==", "dev": true, "license": "MIT", "engines": { @@ -19389,8 +15888,6 @@ }, "node_modules/tempy": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/tempy/-/tempy-3.1.0.tgz", - "integrity": "sha512-7jDLIdD2Zp0bDe5r3D2qtkd1QOCacylBuL7oa4udvN6v2pqr4+LcCr67C8DR1zkpaZ8XosF5m1yQSabKAW6f2g==", "dev": true, "license": "MIT", "dependencies": { @@ -19408,8 +15905,6 @@ }, "node_modules/tempy/node_modules/is-stream": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-3.0.0.tgz", - "integrity": "sha512-LnQR4bZ9IADDRSkvpqMGvt/tEJWclzklNgSw48V5EAaAeDd6qGvN8ei6k5p0tvxSR171VmGyHuTiAOfxAbr8kA==", "dev": true, "license": "MIT", "engines": { @@ -19421,8 +15916,6 @@ }, "node_modules/tempy/node_modules/type-fest": { "version": "2.19.0", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-2.19.0.tgz", - "integrity": "sha512-RAH822pAdBgcNMAfWnCBU3CFZcfZ/i1eZjwFU/dsLKumyuuP3niueg2UAukXYF0E2AAoc82ZSSf9J0WQBinzHA==", "dev": true, "license": "(MIT OR CC0-1.0)", "engines": { @@ -19434,8 +15927,6 @@ }, "node_modules/terser": { "version": "5.44.1", - "resolved": "https://registry.npmjs.org/terser/-/terser-5.44.1.tgz", - "integrity": "sha512-t/R3R/n0MSwnnazuPpPNVO60LX0SKL45pyl9YlvxIdkH0Of7D5qM2EVe+yASRIlY5pZ73nclYJfNANGWPwFDZw==", "license": "BSD-2-Clause", "dependencies": { "@jridgewell/source-map": "^0.3.3", @@ -19452,14 +15943,10 @@ }, "node_modules/terser/node_modules/commander": { "version": "2.20.3", - "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.3.tgz", - "integrity": "sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==", "license": "MIT" }, "node_modules/test-exclude": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/test-exclude/-/test-exclude-6.0.0.tgz", - "integrity": "sha512-cAGWPIyOHU6zlmg88jwm7VRyXnMN7iV68OGAbYDk/Mh/xC/pzVPlQtY6ngoIH/5/tciuhGfvESU8GrHrcxD56w==", "dev": true, "license": "ISC", "dependencies": { @@ -19473,9 +15960,6 @@ }, "node_modules/test-exclude/node_modules/glob": { "version": "7.2.3", - "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz", - "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==", - "deprecated": "Glob versions prior to v9 are no longer supported", "dev": true, "license": "ISC", "dependencies": { @@ -19495,8 +15979,6 @@ }, "node_modules/test-exclude/node_modules/minimatch": { "version": "3.1.2", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz", - "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==", "dev": true, "license": "ISC", "dependencies": { @@ -19508,8 +15990,6 @@ }, "node_modules/testdouble": { "version": "3.20.2", - "resolved": "https://registry.npmjs.org/testdouble/-/testdouble-3.20.2.tgz", - "integrity": "sha512-790e9vJKdfddWNOaxW1/V9FcMk48cPEl3eJSj2i8Hh1fX89qArEJ6cp3DBnaECpGXc3xKJVWbc1jeNlWYWgiMg==", "dev": true, "license": "MIT", "dependencies": { @@ -19524,8 +16004,6 @@ }, "node_modules/text-extensions": { "version": "2.4.0", - "resolved": "https://registry.npmjs.org/text-extensions/-/text-extensions-2.4.0.tgz", - "integrity": "sha512-te/NtwBwfiNRLf9Ijqx3T0nlqZiQ2XrrtBvu+cLL8ZRrGkO0NHTug8MYFKyoSrv/sHTaSKfilUkizV6XhxMJ3g==", "dev": true, "license": "MIT", "engines": { @@ -19537,8 +16015,6 @@ }, "node_modules/thenify": { "version": "3.3.1", - "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz", - "integrity": "sha512-RVZSIV5IG10Hk3enotrhvz0T9em6cyHBLkH/YAZuKqd8hRkKhSfCGIcP2KUY0EPxndzANBmNllzWPwak+bheSw==", "license": "MIT", "dependencies": { "any-promise": "^1.0.0" @@ -19546,8 +16022,6 @@ }, "node_modules/thenify-all": { "version": "1.6.0", - "resolved": "https://registry.npmjs.org/thenify-all/-/thenify-all-1.6.0.tgz", - "integrity": "sha512-RNxQH/qI8/t3thXJDwcstUO4zeqo64+Uy/+sNVRBx4Xn2OX+OZ9oP+iJnNFqplFra2ZUVeKCSa2oVWi3T4uVmA==", "license": "MIT", "dependencies": { "thenify": ">= 3.1.0 < 4" @@ -19558,22 +16032,16 @@ }, "node_modules/theredoc": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/theredoc/-/theredoc-1.0.0.tgz", - "integrity": "sha512-KU3SA3TjRRM932jpNfD3u4Ec3bSvedyo5ITPI7zgWYnKep7BwQQaxlhI9qbO+lKJoRnoAbEVfMcAHRuKVYikDA==", "dev": true, "license": "MIT" }, "node_modules/through": { "version": "2.3.8", - "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz", - "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg==", "dev": true, "license": "MIT" }, "node_modules/time-zone": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/time-zone/-/time-zone-1.0.0.tgz", - "integrity": "sha512-TIsDdtKo6+XrPtiTm1ssmMngN1sAhyKnTO2kunQWqNPWIVvCm15Wmw4SWInwTVgJ5u/Tr04+8Ei9TNcw4x4ONA==", "dev": true, "license": "MIT", "engines": { @@ -19582,8 +16050,6 @@ }, "node_modules/tinyexec": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/tinyexec/-/tinyexec-1.0.2.tgz", - "integrity": "sha512-W/KYk+NFhkmsYpuHq5JykngiOCnxeVL8v8dFnqxSD8qEEdRfXk1SDM6JzNqcERbcGYj9tMrDQBYV9cjgnunFIg==", "dev": true, "license": "MIT", "engines": { @@ -19592,8 +16058,6 @@ }, "node_modules/tinyglobby": { "version": "0.2.15", - "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.15.tgz", - "integrity": "sha512-j2Zq4NyQYG5XMST4cbs02Ak8iJUdxRM0XI5QyxXuZOzKOINmWurp3smXu3y5wDcJrptwpSjgXHzIQxR0omXljQ==", "license": "MIT", "dependencies": { "fdir": "^6.5.0", @@ -19608,8 +16072,6 @@ }, "node_modules/to-regex-range": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-5.0.1.tgz", - "integrity": "sha512-65P7iz6X5yEr1cwcgvQxbbIw7Uk3gOy5dIdtZ4rDveLqhrdJP+Li/Hx6tyK0NEb+2GCyneCMJiGqrADCSNk8sQ==", "license": "MIT", "dependencies": { "is-number": "^7.0.0" @@ -19620,8 +16082,6 @@ }, "node_modules/to-valid-identifier": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/to-valid-identifier/-/to-valid-identifier-1.0.0.tgz", - "integrity": "sha512-41wJyvKep3yT2tyPqX/4blcfybknGB4D+oETKLs7Q76UiPqRpUJK3hr1nxelyYO0PHKVzJwlu0aCeEAsGI6rpw==", "dev": true, "license": "MIT", "dependencies": { @@ -19637,8 +16097,6 @@ }, "node_modules/toidentifier": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/toidentifier/-/toidentifier-1.0.1.tgz", - "integrity": "sha512-o5sSPKEkg/DIQNmH43V0/uerLrpzVedkUh8tGNvaeXpfpuwjKenlSox/2O/BTlZUtEe+JG7s5YhEz608PlAHRA==", "license": "MIT", "engines": { "node": ">=0.6" @@ -19646,8 +16104,6 @@ }, "node_modules/token-types": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/token-types/-/token-types-5.0.1.tgz", - "integrity": "sha512-Y2fmSnZjQdDb9W4w4r1tswlMHylzWIeOKpx0aZH9BgGtACHhrk3OkT52AzwcuqTRBZtvvnTjDBh8eynMulu8Vg==", "dev": true, "license": "MIT", "dependencies": { @@ -19664,15 +16120,11 @@ }, "node_modules/tr46": { "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==", "dev": true, "license": "MIT" }, "node_modules/traverse": { "version": "0.6.11", - "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.11.tgz", - "integrity": "sha512-vxXDZg8/+p3gblxB6BhhG5yWVn1kGRlaL8O78UDXc3wRnPizB5g83dcvWV1jpDMIPnjZjOFuxlMmE82XJ4407w==", "dev": true, "license": "MIT", "dependencies": { @@ -19689,8 +16141,6 @@ }, "node_modules/treeverse": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/treeverse/-/treeverse-3.0.0.tgz", - "integrity": "sha512-gcANaAnd2QDZFmHFEOF4k7uc1J/6a6z3DJMd/QwEyxLoKGiptJRwid582r7QIsFlFMIZ3SnxfS52S4hm2DHkuQ==", "license": "ISC", "engines": { "node": "^14.17.0 || ^16.13.0 || >=18.0.0" @@ -19698,8 +16148,6 @@ }, "node_modules/trim-lines": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/trim-lines/-/trim-lines-3.0.1.tgz", - "integrity": "sha512-kRj8B+YHZCc9kQYdWfJB2/oUl9rA99qbowYYBtr4ui4mZyAQ2JpvVBd/6U2YloATfqBhBTSMhTpgBHtU0Mf3Rg==", "license": "MIT", "funding": { "type": "github", @@ -19708,14 +16156,14 @@ }, "node_modules/ts-interface-checker": { "version": "0.1.13", - "resolved": "https://registry.npmjs.org/ts-interface-checker/-/ts-interface-checker-0.1.13.tgz", - "integrity": "sha512-Y/arvbn+rrz3JCKl9C4kVNfTfSm2/mEp5FSz5EsZSANGPSlQrpRI5M4PKF+mJnE52jOO90PnPSc3Ur3bTQw0gA==", "license": "Apache-2.0" }, + "node_modules/tslib": { + "version": "2.8.1", + "license": "0BSD" + }, "node_modules/tsscmp": { "version": "1.0.6", - "resolved": "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.6.tgz", - "integrity": "sha512-LxhtAkPDTkVCMQjt2h6eBVY28KCjikZqZfMcC15YBeNjkgUpdCfBu5HoiOTDu86v6smE8yOjyEktJ8hlbANHQA==", "dev": true, "license": "MIT", "engines": { @@ -19724,8 +16172,6 @@ }, "node_modules/tuf-js": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/tuf-js/-/tuf-js-4.0.0.tgz", - "integrity": "sha512-Lq7ieeGvXDXwpoSmOSgLWVdsGGV9J4a77oDTAPe/Ltrqnnm/ETaRlBAQTH5JatEh8KXuE6sddf9qAv1Q2282Hg==", "license": "MIT", "dependencies": { "@tufjs/models": "4.0.0", @@ -19738,8 +16184,6 @@ }, "node_modules/tuf-js/node_modules/debug": { "version": "4.4.3", - "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.3.tgz", - "integrity": "sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==", "license": "MIT", "dependencies": { "ms": "^2.1.3" @@ -19753,16 +16197,46 @@ } } }, + "node_modules/tuf-js/node_modules/make-fetch-happen": { + "version": "15.0.3", + "license": "ISC", + "dependencies": { + "@npmcli/agent": "^4.0.0", + "cacache": "^20.0.1", + "http-cache-semantics": "^4.1.1", + "minipass": "^7.0.2", + "minipass-fetch": "^5.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^1.0.0", + "proc-log": "^6.0.0", + "promise-retry": "^2.0.1", + "ssri": "^13.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, "node_modules/tuf-js/node_modules/ms": { "version": "2.1.3", - "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz", - "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA==", "license": "MIT" }, + "node_modules/tuf-js/node_modules/negotiator": { + "version": "1.0.0", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, + "node_modules/tuf-js/node_modules/proc-log": { + "version": "6.0.0", + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, "node_modules/type-check": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz", - "integrity": "sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==", "dev": true, "license": "MIT", "dependencies": { @@ -19774,8 +16248,6 @@ }, "node_modules/type-detect": { "version": "4.0.8", - "resolved": "https://registry.npmjs.org/type-detect/-/type-detect-4.0.8.tgz", - "integrity": "sha512-0fr/mIH1dlO+x7TlcMy+bIDqKPsw/70tVyeHW787goQjhmqaZe10uwLujubK9q9Lg6Fiho1KUKDYz0Z7k7g5/g==", "dev": true, "license": "MIT", "engines": { @@ -19784,8 +16256,6 @@ }, "node_modules/type-fest": { "version": "0.8.1", - "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.8.1.tgz", - "integrity": "sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA==", "dev": true, "license": "(MIT OR CC0-1.0)", "engines": { @@ -19794,8 +16264,6 @@ }, "node_modules/type-is": { "version": "1.6.18", - "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz", - "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==", "license": "MIT", "dependencies": { "media-typer": "0.3.0", @@ -19807,8 +16275,6 @@ }, "node_modules/typed-array-buffer": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz", - "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==", "dev": true, "license": "MIT", "dependencies": { @@ -19822,8 +16288,6 @@ }, "node_modules/typed-array-byte-length": { "version": "1.0.3", - "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz", - "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==", "dev": true, "license": "MIT", "dependencies": { @@ -19842,8 +16306,6 @@ }, "node_modules/typed-array-byte-offset": { "version": "1.0.4", - "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz", - "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==", "dev": true, "license": "MIT", "dependencies": { @@ -19864,8 +16326,6 @@ }, "node_modules/typed-array-length": { "version": "1.0.7", - "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz", - "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==", "dev": true, "license": "MIT", "dependencies": { @@ -19885,8 +16345,6 @@ }, "node_modules/typedarray-to-buffer": { "version": "3.1.5", - "resolved": "https://registry.npmjs.org/typedarray-to-buffer/-/typedarray-to-buffer-3.1.5.tgz", - "integrity": "sha512-zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q==", "dev": true, "license": "MIT", "dependencies": { @@ -19895,8 +16353,6 @@ }, "node_modules/typedarray.prototype.slice": { "version": "1.0.5", - "resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.5.tgz", - "integrity": "sha512-q7QNVDGTdl702bVFiI5eY4l/HkgCM6at9KhcFbgUAzezHFbOVy4+0O/lCjsABEQwbZPravVfBIiBVGo89yzHFg==", "dev": true, "license": "MIT", "dependencies": { @@ -19918,8 +16374,6 @@ }, "node_modules/typescript": { "version": "5.9.3", - "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.9.3.tgz", - "integrity": "sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==", "devOptional": true, "license": "Apache-2.0", "peer": true, @@ -19933,8 +16387,6 @@ }, "node_modules/typical": { "version": "7.3.0", - "resolved": "https://registry.npmjs.org/typical/-/typical-7.3.0.tgz", - "integrity": "sha512-ya4mg/30vm+DOWfBg4YK3j2WD6TWtRkCbasOJr40CseYENzCUby/7rIvXA99JGsQHeNxLbnXdyLLxKSv3tauFw==", "dev": true, "license": "MIT", "engines": { @@ -19943,14 +16395,10 @@ }, "node_modules/uc.micro": { "version": "2.1.0", - "resolved": "https://registry.npmjs.org/uc.micro/-/uc.micro-2.1.0.tgz", - "integrity": "sha512-ARDJmphmdvUk6Glw7y9DQ2bFkKBHwQHLi2lsaH6PPmz/Ka9sFOBsBluozhDltWmnv9u/cF6Rt87znRTPV+yp/A==", "license": "MIT" }, "node_modules/uglify-js": { "version": "3.19.3", - "resolved": "https://registry.npmjs.org/uglify-js/-/uglify-js-3.19.3.tgz", - "integrity": "sha512-v3Xu+yuwBXisp6QYTcH4UbH+xYJXqnq2m/LtQVWKWzYc1iehYnLixoQDN9FH6/j9/oybfd6W9Ghwkl8+UMKTKQ==", "dev": true, "license": "BSD-2-Clause", "optional": true, @@ -19963,8 +16411,6 @@ }, "node_modules/unbox-primitive": { "version": "1.1.0", - "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz", - "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==", "dev": true, "license": "MIT", "dependencies": { @@ -19982,14 +16428,10 @@ }, "node_modules/underscore": { "version": "1.13.7", - "resolved": "https://registry.npmjs.org/underscore/-/underscore-1.13.7.tgz", - "integrity": "sha512-GMXzWtsc57XAtguZgaQViUOzs0KTkk8ojr3/xAxXLITqf/3EMwxC0inyETfDFjH/Krbhuep0HNbbjI9i/q3F3g==", "license": "MIT" }, "node_modules/undici": { - "version": "6.23.0", - "resolved": "https://registry.npmjs.org/undici/-/undici-6.23.0.tgz", - "integrity": "sha512-VfQPToRA5FZs/qJxLIinmU59u0r7LXqoJkCzinq3ckNJp3vKEh7jTWN589YQ5+aoAC/TGRLyJLCPKcLQbM8r9g==", + "version": "6.22.0", "license": "MIT", "engines": { "node": ">=18.17" @@ -19997,14 +16439,10 @@ }, "node_modules/undici-types": { "version": "6.21.0", - "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", - "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", "license": "MIT" }, "node_modules/unicorn-magic": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/unicorn-magic/-/unicorn-magic-0.1.0.tgz", - "integrity": "sha512-lRfVq8fE8gz6QMBuDM6a+LO3IAzTi05H6gCVaUpir2E1Rwpo4ZUog45KpNXKC/Mn3Yb9UDuHumeFTo9iV/D9FQ==", "license": "MIT", "engines": { "node": ">=18" @@ -20015,8 +16453,6 @@ }, "node_modules/unique-filename": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-5.0.0.tgz", - "integrity": "sha512-2RaJTAvAb4owyjllTfXzFClJ7WsGxlykkPvCr9pA//LD9goVq+m4PPAeBgNodGZ7nSrntT/auWpJ6Y5IFXcfjg==", "license": "ISC", "dependencies": { "unique-slug": "^6.0.0" @@ -20027,8 +16463,6 @@ }, "node_modules/unique-slug": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-6.0.0.tgz", - "integrity": "sha512-4Lup7Ezn8W3d52/xBhZBVdx323ckxa7DEvd9kPQHppTkLoJXw6ltrBCyj5pnrxj0qKDxYMJ56CoxNuFCscdTiw==", "license": "ISC", "dependencies": { "imurmurhash": "^0.1.4" @@ -20039,8 +16473,6 @@ }, "node_modules/unique-string": { "version": "3.0.0", - "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-3.0.0.tgz", - "integrity": "sha512-VGXBUVwxKMBUznyffQweQABPRRW1vHZAbadFZud4pLFAqRGvv/96vafgjWFqzourzr8YonlQiPgH0YCJfawoGQ==", "dev": true, "license": "MIT", "dependencies": { @@ -20055,8 +16487,6 @@ }, "node_modules/unist-util-is": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/unist-util-is/-/unist-util-is-6.0.1.tgz", - "integrity": "sha512-LsiILbtBETkDz8I9p1dQ0uyRUWuaQzd/cuEeS1hoRSyW5E5XGmTzlwY1OrNzzakGowI9Dr/I8HVaw4hTtnxy8g==", "license": "MIT", "dependencies": { "@types/unist": "^3.0.0" @@ -20068,8 +16498,6 @@ }, "node_modules/unist-util-position": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/unist-util-position/-/unist-util-position-5.0.0.tgz", - "integrity": "sha512-fucsC7HjXvkB5R3kTCO7kUjRdrS0BJt3M/FPxmHMBOm8JQi2BsHAHFsy27E0EolP8rp0NzXsJ+jNPyDWvOJZPA==", "license": "MIT", "dependencies": { "@types/unist": "^3.0.0" @@ -20081,8 +16509,6 @@ }, "node_modules/unist-util-stringify-position": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/unist-util-stringify-position/-/unist-util-stringify-position-4.0.0.tgz", - "integrity": "sha512-0ASV06AAoKCDkS2+xw5RXJywruurpbC4JZSm7nr7MOt1ojAzvyyaO+UxZf18j8FCF6kmzCZKcAgN/yu2gm2XgQ==", "license": "MIT", "dependencies": { "@types/unist": "^3.0.0" @@ -20094,8 +16520,6 @@ }, "node_modules/unist-util-visit": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/unist-util-visit/-/unist-util-visit-5.0.0.tgz", - "integrity": "sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==", "license": "MIT", "dependencies": { "@types/unist": "^3.0.0", @@ -20109,8 +16533,6 @@ }, "node_modules/unist-util-visit-parents": { "version": "6.0.2", - "resolved": "https://registry.npmjs.org/unist-util-visit-parents/-/unist-util-visit-parents-6.0.2.tgz", - "integrity": "sha512-goh1s1TBrqSqukSc8wrjwWhL0hiJxgA8m4kFxGlQ+8FYQ3C/m11FcTs4YYem7V664AhHVvgoQLk890Ssdsr2IQ==", "license": "MIT", "dependencies": { "@types/unist": "^3.0.0", @@ -20123,8 +16545,6 @@ }, "node_modules/unpipe": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz", - "integrity": "sha512-pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ==", "license": "MIT", "engines": { "node": ">= 0.8" @@ -20132,8 +16552,6 @@ }, "node_modules/update-browserslist-db": { "version": "1.1.4", - "resolved": "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.1.4.tgz", - "integrity": "sha512-q0SPT4xyU84saUX+tomz1WLkxUbuaJnR1xWt17M7fJtEJigJeWUNGUqrauFXsHnqev9y9JTRGwk13tFBuKby4A==", "funding": [ { "type": "opencollective", @@ -20162,8 +16580,6 @@ }, "node_modules/update-notifier": { "version": "7.3.1", - "resolved": "https://registry.npmjs.org/update-notifier/-/update-notifier-7.3.1.tgz", - "integrity": "sha512-+dwUY4L35XFYEzE+OAL3sarJdUioVovq+8f7lcIJ7wnmnYQV5UD1Y/lcwaMSyaQ6Bj3JMj1XSTjZbNLHn/19yA==", "license": "BSD-2-Clause", "dependencies": { "boxen": "^8.0.1", @@ -20186,8 +16602,6 @@ }, "node_modules/uri-js": { "version": "4.4.1", - "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz", - "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==", "license": "BSD-2-Clause", "dependencies": { "punycode": "^2.1.0" @@ -20195,14 +16609,10 @@ }, "node_modules/util-deprecate": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", - "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==", "license": "MIT" }, "node_modules/utils-merge": { "version": "1.0.1", - "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz", - "integrity": "sha512-pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA==", "license": "MIT", "engines": { "node": ">= 0.4.0" @@ -20210,8 +16620,6 @@ }, "node_modules/uuid": { "version": "8.3.2", - "resolved": "https://registry.npmjs.org/uuid/-/uuid-8.3.2.tgz", - "integrity": "sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==", "dev": true, "license": "MIT", "bin": { @@ -20220,8 +16628,6 @@ }, "node_modules/validate-npm-package-license": { "version": "3.0.4", - "resolved": "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz", - "integrity": "sha512-DpKm2Ui/xN7/HQKCtpZxoRWBhZ9Z0kqtygG8XCgNQ8ZlDnxuQmWhj566j8fN4Cu3/JmbhsDo7fcAJq4s9h27Ew==", "license": "Apache-2.0", "dependencies": { "spdx-correct": "^3.0.0", @@ -20230,8 +16636,6 @@ }, "node_modules/validate-npm-package-license/node_modules/spdx-expression-parse": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz", - "integrity": "sha512-cbqHunsQWnJNE6KhVSMsMeH5H/L9EpymbzqTQ3uLwNCLZ1Q481oWaofqH7nO6V07xlXwY6PhQdQ2IedWx/ZK4Q==", "license": "MIT", "dependencies": { "spdx-exceptions": "^2.1.0", @@ -20240,8 +16644,6 @@ }, "node_modules/validate-npm-package-name": { "version": "7.0.0", - "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-7.0.0.tgz", - "integrity": "sha512-bwVk/OK+Qu108aJcMAEiU4yavHUI7aN20TgZNBj9MR2iU1zPUl1Z1Otr7771ExfYTPTvfN8ZJ1pbr5Iklgt4xg==", "license": "ISC", "engines": { "node": "^20.17.0 || >=22.9.0" @@ -20249,8 +16651,6 @@ }, "node_modules/vary": { "version": "1.1.2", - "resolved": "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz", - "integrity": "sha512-BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg==", "license": "MIT", "engines": { "node": ">= 0.8" @@ -20258,8 +16658,6 @@ }, "node_modules/vfile": { "version": "6.0.3", - "resolved": "https://registry.npmjs.org/vfile/-/vfile-6.0.3.tgz", - "integrity": "sha512-KzIbH/9tXat2u30jf+smMwFCsno4wHVdNmzFyL+T/L3UGqqk6JKfVqOFOZEpZSHADH1k40ab6NUIXZq422ov3Q==", "license": "MIT", "dependencies": { "@types/unist": "^3.0.0", @@ -20272,8 +16670,6 @@ }, "node_modules/vfile-message": { "version": "4.0.3", - "resolved": "https://registry.npmjs.org/vfile-message/-/vfile-message-4.0.3.tgz", - "integrity": "sha512-QTHzsGd1EhbZs4AsQ20JX1rC3cOlt/IWJruk893DfLRr57lcnOeMaWG4K0JrRta4mIJZKth2Au3mM3u03/JWKw==", "license": "MIT", "dependencies": { "@types/unist": "^3.0.0", @@ -20286,8 +16682,6 @@ }, "node_modules/vite": { "version": "5.4.21", - "resolved": "https://registry.npmjs.org/vite/-/vite-5.4.21.tgz", - "integrity": "sha512-o5a9xKjbtuhY6Bi5S3+HvbRERmouabWbyUcpXXUA1u+GNUKoROi9byOJ8M0nHbHYHkYICiMlqxkg1KkYmm25Sw==", "license": "MIT", "dependencies": { "esbuild": "^0.21.3", @@ -20345,8 +16739,6 @@ }, "node_modules/vitepress": { "version": "1.6.4", - "resolved": "https://registry.npmjs.org/vitepress/-/vitepress-1.6.4.tgz", - "integrity": "sha512-+2ym1/+0VVrbhNyRoFFesVvBvHAVMZMK0rw60E3X/5349M1GuVdKeazuksqopEdvkKwKGs21Q729jX81/bkBJg==", "license": "MIT", "dependencies": { "@docsearch/css": "3.8.2", @@ -20386,8 +16778,6 @@ }, "node_modules/vue": { "version": "3.5.25", - "resolved": "https://registry.npmjs.org/vue/-/vue-3.5.25.tgz", - "integrity": "sha512-YLVdgv2K13WJ6n+kD5owehKtEXwdwXuj2TTyJMsO7pSeKw2bfRNZGjhB7YzrpbMYj5b5QsUebHpOqR3R3ziy/g==", "license": "MIT", "dependencies": { "@vue/compiler-dom": "3.5.25", @@ -20407,8 +16797,6 @@ }, "node_modules/walk-back": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/walk-back/-/walk-back-5.1.1.tgz", - "integrity": "sha512-e/FRLDVdZQWFrAzU6Hdvpm7D7m2ina833gIKLptQykRK49mmCYHLHq7UqjPDbxbKLZkTkW1rFqbengdE3sLfdw==", "dev": true, "license": "MIT", "engines": { @@ -20417,15 +16805,11 @@ }, "node_modules/walk-up-path": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-3.0.1.tgz", - "integrity": "sha512-9YlCL/ynK3CTlrSRrDxZvUauLzAswPCrsaCgilqFevUYpeEW0/3ScEjaa3kbW/T0ghhkEr7mv+fpjqn1Y1YuTA==", "dev": true, "license": "ISC" }, "node_modules/wbuf": { "version": "1.7.3", - "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz", - "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==", "license": "MIT", "dependencies": { "minimalistic-assert": "^1.0.0" @@ -20433,15 +16817,11 @@ }, "node_modules/webidl-conversions": { "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==", "dev": true, "license": "BSD-2-Clause" }, "node_modules/well-known-symbols": { "version": "2.0.0", - "resolved": "https://registry.npmjs.org/well-known-symbols/-/well-known-symbols-2.0.0.tgz", - "integrity": "sha512-ZMjC3ho+KXo0BfJb7JgtQ5IBuvnShdlACNkKkdsqBmYw3bPAaJfPeYUo6tLUaT5tG/Gkh7xkpBhKRQ9e7pyg9Q==", "dev": true, "license": "ISC", "engines": { @@ -20450,8 +16830,6 @@ }, "node_modules/whatwg-encoding": { "version": "3.1.1", - "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-3.1.1.tgz", - "integrity": "sha512-6qN4hJdMwfYBtE3YBTTHhoeuUrDBPZmbQaxWAqSALV/MeEnR5z1xd8UKud2RAkFoPkmB+hli1TZSnyi84xz1vQ==", "license": "MIT", "dependencies": { "iconv-lite": "0.6.3" @@ -20462,8 +16840,6 @@ }, "node_modules/whatwg-encoding/node_modules/iconv-lite": { "version": "0.6.3", - "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", - "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==", "license": "MIT", "dependencies": { "safer-buffer": ">= 2.1.2 < 3.0.0" @@ -20474,8 +16850,6 @@ }, "node_modules/whatwg-mimetype": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/whatwg-mimetype/-/whatwg-mimetype-4.0.0.tgz", - "integrity": "sha512-QaKxh0eNIi2mE9p2vEdzfagOKHCcj1pJ56EEHGQOVxp8r9/iszLUUV7v89x9O1p/T+NlTM5W7jW6+cz4Fq1YVg==", "license": "MIT", "engines": { "node": ">=18" @@ -20483,8 +16857,6 @@ }, "node_modules/whatwg-url": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", "dev": true, "license": "MIT", "dependencies": { @@ -20494,14 +16866,10 @@ }, "node_modules/when-exit": { "version": "2.1.5", - "resolved": "https://registry.npmjs.org/when-exit/-/when-exit-2.1.5.tgz", - "integrity": "sha512-VGkKJ564kzt6Ms1dbgPP/yuIoQCrsFAnRbptpC5wOEsDaNsbCB2bnfnaA8i/vRs5tjUSEOtIuvl9/MyVsvQZCg==", "license": "MIT" }, "node_modules/which": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/which/-/which-6.0.0.tgz", - "integrity": "sha512-f+gEpIKMR9faW/JgAgPK1D7mekkFoqbmiwvNzuhsHetni20QSgzg9Vhn0g2JSJkkfehQnqdUAx7/e15qS1lPxg==", "license": "ISC", "dependencies": { "isexe": "^3.1.1" @@ -20515,8 +16883,6 @@ }, "node_modules/which-boxed-primitive": { "version": "1.1.1", - "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz", - "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==", "dev": true, "license": "MIT", "dependencies": { @@ -20535,8 +16901,6 @@ }, "node_modules/which-builtin-type": { "version": "1.2.1", - "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz", - "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==", "dev": true, "license": "MIT", "dependencies": { @@ -20563,15 +16927,11 @@ }, "node_modules/which-builtin-type/node_modules/isarray": { "version": "2.0.5", - "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz", - "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==", "dev": true, "license": "MIT" }, "node_modules/which-collection": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz", - "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==", "dev": true, "license": "MIT", "dependencies": { @@ -20589,15 +16949,11 @@ }, "node_modules/which-module": { "version": "2.0.1", - "resolved": "https://registry.npmjs.org/which-module/-/which-module-2.0.1.tgz", - "integrity": "sha512-iBdZ57RDvnOR9AGBhML2vFZf7h8vmBjhoaZqODJBFWHVtKkDmKuHai3cx5PgVMrX5YDNp27AofYbAwctSS+vhQ==", "dev": true, "license": "ISC" }, "node_modules/which-typed-array": { "version": "1.1.19", - "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.19.tgz", - "integrity": "sha512-rEvr90Bck4WZt9HHFC4DJMsjvu7x+r6bImz0/BrbWb7A2djJ8hnZMrWnHo9F8ssv0OMErasDhftrfROTyqSDrw==", "dev": true, "license": "MIT", "dependencies": { @@ -20618,8 +16974,6 @@ }, "node_modules/widest-line": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/widest-line/-/widest-line-5.0.0.tgz", - "integrity": "sha512-c9bZp7b5YtRj2wOe6dlj32MK+Bx/M/d+9VB2SHM1OtsUHR0aV0tdP6DWh/iMt0kWi1t5g1Iudu6hQRNd1A4PVA==", "license": "MIT", "dependencies": { "string-width": "^7.0.0" @@ -20633,14 +16987,10 @@ }, "node_modules/widest-line/node_modules/emoji-regex": { "version": "10.6.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", "license": "MIT" }, "node_modules/widest-line/node_modules/string-width": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", "license": "MIT", "dependencies": { "emoji-regex": "^10.3.0", @@ -20656,8 +17006,6 @@ }, "node_modules/word-wrap": { "version": "1.2.5", - "resolved": "https://registry.npmjs.org/word-wrap/-/word-wrap-1.2.5.tgz", - "integrity": "sha512-BN22B5eaMMI9UMtjrGd5g5eCYPpCPDUy0FJXbYsaT5zYxjFOckS53SQDE3pWkVoWpHXVb3BrYcEN4Twa55B5cA==", "dev": true, "license": "MIT", "engines": { @@ -20666,15 +17014,11 @@ }, "node_modules/wordwrap": { "version": "1.0.0", - "resolved": "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz", - "integrity": "sha512-gvVzJFlPycKc5dZN4yPkP8w7Dc37BtP1yczEneOb4uq34pXZcvrtRTmWV8W+Ume+XCxKgbjM+nevkyFPMybd4Q==", "dev": true, "license": "MIT" }, "node_modules/wordwrapjs": { "version": "5.1.1", - "resolved": "https://registry.npmjs.org/wordwrapjs/-/wordwrapjs-5.1.1.tgz", - "integrity": "sha512-0yweIbkINJodk27gX9LBGMzyQdBDan3s/dEAiwBOj+Mf0PPyWL6/rikalkv8EeD0E8jm4o5RXEOrFTP3NXbhJg==", "dev": true, "license": "MIT", "engines": { @@ -20683,14 +17027,10 @@ }, "node_modules/workerpool": { "version": "10.0.1", - "resolved": "https://registry.npmjs.org/workerpool/-/workerpool-10.0.1.tgz", - "integrity": "sha512-NAnKwZJxWlj/U1cp6ZkEtPE+GQY1S6KtOS3AlCiPfPFLxV3m64giSp7g2LsNJxzYCocDT7TSl+7T0sgrDp3KoQ==", "license": "Apache-2.0" }, "node_modules/wrap-ansi": { "version": "9.0.2", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-9.0.2.tgz", - "integrity": "sha512-42AtmgqjV+X1VpdOfyTGOYRi0/zsoLqtXQckTmqTeybT+BDIbM/Guxo7x3pE2vtpr1ok6xRqM9OpBe+Jyoqyww==", "license": "MIT", "dependencies": { "ansi-styles": "^6.2.1", @@ -20707,8 +17047,6 @@ "node_modules/wrap-ansi-cjs": { "name": "wrap-ansi", "version": "7.0.0", - "resolved": "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-7.0.0.tgz", - "integrity": "sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==", "license": "MIT", "dependencies": { "ansi-styles": "^4.0.0", @@ -20724,8 +17062,6 @@ }, "node_modules/wrap-ansi-cjs/node_modules/ansi-regex": { "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", "license": "MIT", "engines": { "node": ">=8" @@ -20733,8 +17069,6 @@ }, "node_modules/wrap-ansi-cjs/node_modules/ansi-styles": { "version": "4.3.0", - "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", - "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -20748,8 +17082,6 @@ }, "node_modules/wrap-ansi-cjs/node_modules/strip-ansi": { "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", "license": "MIT", "dependencies": { "ansi-regex": "^5.0.1" @@ -20760,14 +17092,10 @@ }, "node_modules/wrap-ansi/node_modules/emoji-regex": { "version": "10.6.0", - "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-10.6.0.tgz", - "integrity": "sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==", "license": "MIT" }, "node_modules/wrap-ansi/node_modules/string-width": { "version": "7.2.0", - "resolved": "https://registry.npmjs.org/string-width/-/string-width-7.2.0.tgz", - "integrity": "sha512-tsaTIkKW9b4N+AEj+SVA+WhJzV7/zMhcSu78mLKWSk7cXMOSHsBKFWUs0fWwq8QyK3MgJBQRX6Gbi4kYbdvGkQ==", "license": "MIT", "dependencies": { "emoji-regex": "^10.3.0", @@ -20783,15 +17111,11 @@ }, "node_modules/wrappy": { "version": "1.0.2", - "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==", "dev": true, "license": "ISC" }, "node_modules/write-file-atomic": { "version": "6.0.0", - "resolved": "https://registry.npmjs.org/write-file-atomic/-/write-file-atomic-6.0.0.tgz", - "integrity": "sha512-GmqrO8WJ1NuzJ2DrziEI2o57jKAVIQNf8a18W3nCYU3H7PNWqCCVTeH6/NQE93CIllIgQS98rrmVkYgTX9fFJQ==", "dev": true, "license": "ISC", "dependencies": { @@ -20804,8 +17128,6 @@ }, "node_modules/wsl-utils": { "version": "0.1.0", - "resolved": "https://registry.npmjs.org/wsl-utils/-/wsl-utils-0.1.0.tgz", - "integrity": "sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw==", "license": "MIT", "dependencies": { "is-wsl": "^3.1.0" @@ -20819,8 +17141,6 @@ }, "node_modules/wsl-utils/node_modules/is-wsl": { "version": "3.1.0", - "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-3.1.0.tgz", - "integrity": "sha512-UcVfVfaK4Sc4m7X3dUSoHoozQGBEFeDC+zVo06t98xe8CzHSZZBekNXH+tu0NalHolcJ/QAGqS46Hef7QXBIMw==", "license": "MIT", "dependencies": { "is-inside-container": "^1.0.0" @@ -20834,8 +17154,6 @@ }, "node_modules/xdg-basedir": { "version": "5.1.0", - "resolved": "https://registry.npmjs.org/xdg-basedir/-/xdg-basedir-5.1.0.tgz", - "integrity": "sha512-GCPAHLvrIH13+c0SuacwvRYj2SxJXQ4kaVTT5xgL3kPrz56XxkF21IGhjSE1+W0aw7gpBWRGXLCPnPby6lSpmQ==", "license": "MIT", "engines": { "node": ">=12" @@ -20846,8 +17164,6 @@ }, "node_modules/xml2js": { "version": "0.6.2", - "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.2.tgz", - "integrity": "sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA==", "license": "MIT", "dependencies": { "sax": ">=0.6.0", @@ -20859,8 +17175,6 @@ }, "node_modules/xmlbuilder": { "version": "11.0.1", - "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz", - "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==", "license": "MIT", "engines": { "node": ">=4.0" @@ -20868,14 +17182,10 @@ }, "node_modules/xmlcreate": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/xmlcreate/-/xmlcreate-2.0.4.tgz", - "integrity": "sha512-nquOebG4sngPmGPICTS5EnxqhKbCmz5Ox5hsszI2T6U5qdrJizBc+0ilYSEjTSzU0yZcmvppztXe/5Al5fUwdg==", "license": "Apache-2.0" }, "node_modules/y18n": { "version": "5.0.8", - "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz", - "integrity": "sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==", "license": "ISC", "engines": { "node": ">=10" @@ -20883,8 +17193,6 @@ }, "node_modules/yallist": { "version": "5.0.0", - "resolved": "https://registry.npmjs.org/yallist/-/yallist-5.0.0.tgz", - "integrity": "sha512-YgvUTfwqyc7UXVMrB+SImsVYSmTS8X/tSrtdNZMImM+n7+QTriRXyXim0mBrTXNeqzVF0KWGgHPeiyViFFrNDw==", "license": "BlueOak-1.0.0", "engines": { "node": ">=18" @@ -20892,8 +17200,6 @@ }, "node_modules/yaml": { "version": "1.10.2", - "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz", - "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==", "devOptional": true, "license": "ISC", "engines": { @@ -20902,14 +17208,10 @@ }, "node_modules/yaml-ast-parser": { "version": "0.0.43", - "resolved": "https://registry.npmjs.org/yaml-ast-parser/-/yaml-ast-parser-0.0.43.tgz", - "integrity": "sha512-2PTINUwsRqSd+s8XxKaJWQlUuEMHJQyEuh2edBbW8KNJz0SJPwUSD2zRWqezFEdN7IzAgeuYHFUCF7o8zRdZ0A==", "license": "Apache-2.0" }, "node_modules/yargs": { "version": "17.7.2", - "resolved": "https://registry.npmjs.org/yargs/-/yargs-17.7.2.tgz", - "integrity": "sha512-7dSzzRQ++CKnNI/krKnYRV7JKKPUXMEh61soaHKg9mrWEhzFWhFnxPxGl+69cD1Ou63C13NUPCnmIcrvqCuM6w==", "license": "MIT", "dependencies": { "cliui": "^8.0.1", @@ -20926,8 +17228,6 @@ }, "node_modules/yargs-parser": { "version": "21.1.1", - "resolved": "https://registry.npmjs.org/yargs-parser/-/yargs-parser-21.1.1.tgz", - "integrity": "sha512-tVpsJW7DdjecAiFpbIB1e3qxIQsE6NoPc5/eTdrbbIC4h0LVsWhnoa3g+m2HclBIujHzsxZ4VJVA+GUuc2/LBw==", "license": "ISC", "engines": { "node": ">=12" @@ -20935,14 +17235,10 @@ }, "node_modules/yesno": { "version": "0.4.0", - "resolved": "https://registry.npmjs.org/yesno/-/yesno-0.4.0.tgz", - "integrity": "sha512-tdBxmHvbXPBKYIg81bMCB7bVeDmHkRzk5rVJyYYXurwKkHq/MCd8rz4HSJUP7hW0H2NlXiq8IFiWvYKEHhlotA==", "license": "BSD" }, "node_modules/ylru": { "version": "1.4.0", - "resolved": "https://registry.npmjs.org/ylru/-/ylru-1.4.0.tgz", - "integrity": "sha512-2OQsPNEmBCvXuFlIni/a+Rn+R2pHW9INm0BxXJ4hVDA8TirqMj+J/Rp9ItLatT/5pZqWwefVrTQcHpixsxnVlA==", "dev": true, "license": "MIT", "engines": { @@ -20951,8 +17247,6 @@ }, "node_modules/yocto-queue": { "version": "1.2.2", - "resolved": "https://registry.npmjs.org/yocto-queue/-/yocto-queue-1.2.2.tgz", - "integrity": "sha512-4LCcse/U2MHZ63HAJVE+v71o7yOdIe4cZ70Wpf8D/IyjDKYQLV5GD46B+hSTjJsvV5PztjvHoU580EftxjDZFQ==", "dev": true, "license": "MIT", "engines": { @@ -20964,8 +17258,6 @@ }, "node_modules/yoctocolors": { "version": "2.1.2", - "resolved": "https://registry.npmjs.org/yoctocolors/-/yoctocolors-2.1.2.tgz", - "integrity": "sha512-CzhO+pFNo8ajLM2d2IW/R93ipy99LWjtwblvC1RsoSUMZgyLbYFr221TnSNT7GjGdYui6P459mw9JH/g/zW2ug==", "dev": true, "license": "MIT", "engines": { @@ -20977,8 +17269,6 @@ }, "node_modules/zwitch": { "version": "2.0.4", - "resolved": "https://registry.npmjs.org/zwitch/-/zwitch-2.0.4.tgz", - "integrity": "sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==", "license": "MIT", "funding": { "type": "github", @@ -21027,8 +17317,6 @@ }, "packages/builder/node_modules/rimraf": { "version": "6.1.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz", - "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -21115,8 +17403,6 @@ }, "packages/cli/node_modules/rimraf": { "version": "6.1.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz", - "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -21139,6 +17425,7 @@ "license": "Apache-2.0", "dependencies": { "@ui5/logger": "^5.0.0-alpha.2", + "async-mutex": "^0.5.0", "clone": "^2.1.2", "escape-string-regexp": "^5.0.0", "globby": "^15.0.0", @@ -21146,7 +17433,8 @@ "micromatch": "^4.0.8", "minimatch": "^10.0.3", "pretty-hrtime": "^1.0.3", - "random-int": "^3.1.0" + "random-int": "^3.1.0", + "ssri": "^13.0.0" }, "devDependencies": { "@istanbuljs/esm-loader-hook": "^0.3.0", @@ -21191,8 +17479,6 @@ }, "packages/fs/node_modules/rimraf": { "version": "6.1.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz", - "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -21262,8 +17548,6 @@ }, "packages/logger/node_modules/rimraf": { "version": "6.1.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz", - "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -21357,8 +17641,6 @@ }, "packages/project/node_modules/@npmcli/map-workspaces": { "version": "5.0.3", - "resolved": "https://registry.npmjs.org/@npmcli/map-workspaces/-/map-workspaces-5.0.3.tgz", - "integrity": "sha512-o2grssXo1e774E5OtEwwrgoszYRh0lqkJH+Pb9r78UcqdGJRDRfhpM8DvZPjzNLLNYeD/rNbjOKM3Ss5UABROw==", "license": "ISC", "dependencies": { "@npmcli/name-from-folder": "^4.0.0", @@ -21370,10 +17652,42 @@ "node": "^20.17.0 || >=22.9.0" } }, + "packages/project/node_modules/make-fetch-happen": { + "version": "15.0.3", + "license": "ISC", + "dependencies": { + "@npmcli/agent": "^4.0.0", + "cacache": "^20.0.1", + "http-cache-semantics": "^4.1.1", + "minipass": "^7.0.2", + "minipass-fetch": "^5.0.0", + "minipass-flush": "^1.0.5", + "minipass-pipeline": "^1.2.4", + "negotiator": "^1.0.0", + "proc-log": "^6.0.0", + "promise-retry": "^2.0.1", + "ssri": "^13.0.0" + }, + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "packages/project/node_modules/make-fetch-happen/node_modules/proc-log": { + "version": "6.1.0", + "license": "ISC", + "engines": { + "node": "^20.17.0 || >=22.9.0" + } + }, + "packages/project/node_modules/negotiator": { + "version": "1.0.0", + "license": "MIT", + "engines": { + "node": ">= 0.6" + } + }, "packages/project/node_modules/rimraf": { "version": "6.1.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz", - "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { @@ -21392,8 +17706,6 @@ }, "packages/project/node_modules/walk-up-path": { "version": "4.0.0", - "resolved": "https://registry.npmjs.org/walk-up-path/-/walk-up-path-4.0.0.tgz", - "integrity": "sha512-3hu+tD8YzSLGuFYtPRb48vdhKMi0KQV5sn+uWr8+7dMEq/2G/dtLrdDinkLjqq5TIbIBjYJ4Ax/n3YiaW7QM8A==", "license": "ISC", "engines": { "node": "20 || >=22" @@ -21444,8 +17756,6 @@ }, "packages/server/node_modules/rimraf": { "version": "6.1.2", - "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-6.1.2.tgz", - "integrity": "sha512-cFCkPslJv7BAXJsYlK1dZsbP8/ZNLkCAQ0bi1hf5EKX2QHegmDFEFA6QhuYJlk7UDdc+02JjO80YSOrWPpw06g==", "dev": true, "license": "BlueOak-1.0.0", "dependencies": { diff --git a/packages/fs/lib/Resource.js b/packages/fs/lib/Resource.js index 1cefc2ce490..19c937ba4b4 100644 --- a/packages/fs/lib/Resource.js +++ b/packages/fs/lib/Resource.js @@ -1,10 +1,28 @@ -import stream from "node:stream"; -import crypto from "node:crypto"; +import {Readable} from "node:stream"; +import {buffer as streamToBuffer} from "node:stream/consumers"; +import ssri from "ssri"; import clone from "clone"; import posixPath from "node:path/posix"; +import {setTimeout} from "node:timers/promises"; +import {withTimeout, Mutex} from "async-mutex"; +import {getLogger} from "@ui5/logger"; + +const log = getLogger("fs:Resource"); +let deprecatedGetStreamCalled = false; +let deprecatedGetStatInfoCalled = false; const ALLOWED_SOURCE_METADATA_KEYS = ["adapter", "fsPath", "contentModified"]; +const CONTENT_TYPES = { + BUFFER: "buffer", + STREAM: "stream", + FACTORY: "factory", + DRAINED_STREAM: "drainedStream", + IN_TRANSFORMATION: "inTransformation", +}; + +const SSRI_OPTIONS = {algorithms: ["sha256"]}; + /** * Resource. UI5 CLI specific representation of a file's content and metadata * @@ -13,26 +31,37 @@ const ALLOWED_SOURCE_METADATA_KEYS = ["adapter", "fsPath", "contentModified"]; * @alias @ui5/fs/Resource */ class Resource { - #project; - #buffer; - #buffering; - #collections; - #contentDrained; - #createStream; #name; #path; + #project; #sourceMetadata; + + /* Resource Content */ + #content; + #createBufferFactory; + #createStreamFactory; + #contentType; + + /* Content Metadata */ + #byteSize; + #lastModified; #statInfo; - #stream; - #streamDrained; - #isModified; + #isDirectory; + + /* States */ + #isModified = false; + // Mutex to prevent access/modification while content is being transformed. 100 ms timeout + #contentMutex = withTimeout(new Mutex(), 100, new Error("Timeout waiting for resource content access")); + + // Tracing + #collections = []; /** - * Function for dynamic creation of content streams + * Factory function to dynamic (and potentially repeated) creation of readable streams of the resource's content * * @public * @callback @ui5/fs/Resource~createStream - * @returns {stream.Readable} A readable stream of a resources content + * @returns {stream.Readable} A readable stream of the resource's content */ /** @@ -48,6 +77,9 @@ class Resource { * (cannot be used in conjunction with parameters buffer, stream or createStream) * @param {Stream} [parameters.stream] Readable stream of the content of this resource * (cannot be used in conjunction with parameters buffer, string or createStream) + * @param {@ui5/fs/Resource~createBuffer} [parameters.createBuffer] Function callback that returns a promise + * resolving with a Buffer of the content of this resource (cannot be used in conjunction with + * parameters buffer, string or stream). Must be used in conjunction with parameters createStream. * @param {@ui5/fs/Resource~createStream} [parameters.createStream] Function callback that returns a readable * stream of the content of this resource (cannot be used in conjunction with parameters buffer, * string or stream). @@ -56,20 +88,32 @@ class Resource { * @param {object} [parameters.sourceMetadata] Source metadata for UI5 CLI internal use. * Some information may be set by an adapter to store information for later retrieval. Also keeps track of whether * a resource content has been modified since it has been read from a source + * @param {boolean} [parameters.isDirectory] Flag whether the resource represents a directory + * @param {number} [parameters.byteSize] Size of the resource content in bytes + * @param {number} [parameters.lastModified] Last modified timestamp (in milliseconds since UNIX epoch) */ - constructor({path, statInfo, buffer, string, createStream, stream, project, sourceMetadata}) { + constructor({ + path, statInfo, buffer, createBuffer, string, createStream, stream, project, sourceMetadata, + isDirectory, byteSize, lastModified, + }) { if (!path) { throw new Error("Unable to create Resource: Missing parameter 'path'"); } + if (createBuffer && !createStream) { + // If createBuffer is provided, createStream must be provided as well + throw new Error("Unable to create Resource: Parameter 'createStream' must be provided when " + + "parameter 'createBuffer' is used"); + } if (buffer && createStream || buffer && string || string && createStream || buffer && stream || string && stream || createStream && stream) { - throw new Error("Unable to create Resource: Please set only one content parameter. " + + throw new Error("Unable to create Resource: Multiple content parameters provided. " + + "Please provide only one of the following parameters: " + "'buffer', 'string', 'stream' or 'createStream'"); } if (sourceMetadata) { if (typeof sourceMetadata !== "object") { - throw new Error(`Parameter 'sourceMetadata' must be of type "object"`); + throw new Error(`Unable to create Resource: Parameter 'sourceMetadata' must be of type "object"`); } /* eslint-disable-next-line guard-for-in */ @@ -95,33 +139,82 @@ class Resource { // Since the sourceMetadata object is inherited to clones, it is the only correct indicator this.#sourceMetadata.contentModified ??= false; - this.#isModified = false; - this.#project = project; if (createStream) { - this.#createStream = createStream; - } else if (stream) { - this.#stream = stream; + // We store both factories individually + // This allows to create either a stream or a buffer on demand + // Note that it's possible and acceptable if only one factory is provided + if (createBuffer) { + if (typeof createBuffer !== "function") { + throw new Error("Unable to create Resource: Parameter 'createBuffer' must be a function"); + } + this.#createBufferFactory = createBuffer; + } + // createStream is always provided if a factory is used + if (typeof createStream !== "function") { + throw new Error("Unable to create Resource: Parameter 'createStream' must be a function"); + } + this.#createStreamFactory = createStream; + this.#contentType = CONTENT_TYPES.FACTORY; + } if (stream) { + if (typeof stream !== "object" || typeof stream.pipe !== "function") { + throw new Error("Unable to create Resource: Parameter 'stream' must be a readable stream"); + } + this.#content = stream; + this.#contentType = CONTENT_TYPES.STREAM; } else if (buffer) { - // Use private setter, not to accidentally set any modified flags - this.#setBuffer(buffer); - } else if (typeof string === "string" || string instanceof String) { - // Use private setter, not to accidentally set any modified flags - this.#setBuffer(Buffer.from(string, "utf8")); + if (!Buffer.isBuffer(buffer)) { + throw new Error("Unable to create Resource: Parameter 'buffer' must be of type Buffer"); + } + this.#content = buffer; + this.#contentType = CONTENT_TYPES.BUFFER; + } else if (string !== undefined) { + if (typeof string !== "string" && !(string instanceof String)) { + throw new Error("Unable to create Resource: Parameter 'string' must be of type string"); + } + this.#content = Buffer.from(string, "utf8"); // Assuming utf8 encoding + this.#contentType = CONTENT_TYPES.BUFFER; + } + + if (isDirectory !== undefined) { + this.#isDirectory = !!isDirectory; + } + if (byteSize !== undefined) { + if (typeof byteSize !== "number" || byteSize < 0) { + throw new Error("Unable to create Resource: Parameter 'byteSize' must be a positive number"); + } + this.#byteSize = byteSize; + } + if (lastModified !== undefined) { + if (typeof lastModified !== "number" || lastModified < 0) { + throw new Error("Unable to create Resource: Parameter 'lastModified' must be a positive number"); + } + this.#lastModified = lastModified; } if (statInfo) { + this.#isDirectory ??= statInfo.isDirectory(); + if (!this.#isDirectory && statInfo.isFile && !statInfo.isFile()) { + throw new Error("Unable to create Resource: statInfo must represent either a file or a directory"); + } + this.#byteSize ??= statInfo.size; + this.#lastModified ??= statInfo.mtimeMs; + + // Create legacy statInfo object this.#statInfo = parseStat(statInfo); } else { - if (createStream || stream) { - throw new Error("Unable to create Resource: Please provide statInfo for stream content"); - } - this.#statInfo = createStat(this.#buffer.byteLength); + // if (this.#byteSize === undefined && this.#contentType) { + // if (this.#contentType !== CONTENT_TYPES.BUFFER) { + // throw new Error("Unable to create Resource: byteSize or statInfo must be provided when resource " + + // "content is stream- or factory-based"); + // } + // this.#byteSize ??= this.#content.byteLength; + // } + + // Create legacy statInfo object + this.#statInfo = createStat(this.#byteSize, this.#isDirectory, this.#lastModified); } - - // Tracing: - this.#collections = []; } /** @@ -131,20 +224,56 @@ class Resource { * @returns {Promise} Promise resolving with a buffer of the resource content. */ async getBuffer() { - if (this.#contentDrained) { - throw new Error(`Content of Resource ${this.#path} has been drained. ` + - "This might be caused by requesting resource content after a content stream has been " + - "requested and no new content (e.g. a new stream) has been set."); - } - if (this.#buffer) { - return this.#buffer; - } else if (this.#createStream || this.#stream) { - return this.#getBufferFromStream(); - } else { + // First wait for new content if the current content is flagged as drained + if (this.#contentType === CONTENT_TYPES.DRAINED_STREAM) { + await this.#waitForNewContent(); + } + + // Then make sure no other operation is currently modifying the content (such as a concurrent getBuffer call + // that might be transforming the content right now) + if (this.#contentMutex.isLocked()) { + await this.#contentMutex.waitForUnlock(); + } + + switch (this.#contentType) { + case CONTENT_TYPES.FACTORY: + if (this.#createBufferFactory) { + // Prefer buffer factory if available + return await this.#getBufferFromFactory(this.#createBufferFactory); + } + // Fallback to stream factory + return this.#getBufferFromStream(this.#createStreamFactory()); + case CONTENT_TYPES.STREAM: + return this.#getBufferFromStream(this.#content); + case CONTENT_TYPES.BUFFER: + return this.#content; + case CONTENT_TYPES.DRAINED_STREAM: + // waitForNewContent call above should prevent this from ever happening + throw new Error(`Unexpected error: Content of Resource ${this.#path} is flagged as drained.`); + case CONTENT_TYPES.IN_TRANSFORMATION: + // contentMutex.waitForUnlock call above should prevent this from ever happening + throw new Error(`Unexpected error: Content of Resource ${this.#path} is currently being transformed`); + default: throw new Error(`Resource ${this.#path} has no content`); } } + async #getBufferFromFactory(factoryFn) { + const release = await this.#contentMutex.acquire(); + try { + this.#contentType = CONTENT_TYPES.IN_TRANSFORMATION; + const buffer = await factoryFn(); + if (!Buffer.isBuffer(buffer)) { + throw new Error(`Buffer factory of Resource ${this.#path} did not return a Buffer instance`); + } + this.#content = buffer; + this.#contentType = CONTENT_TYPES.BUFFER; + return buffer; + } finally { + release(); + } + } + /** * Sets a Buffer as content. * @@ -152,21 +281,12 @@ class Resource { * @param {Buffer} buffer Buffer instance */ setBuffer(buffer) { - this.#sourceMetadata.contentModified = true; - this.#isModified = true; - this.#updateStatInfo(buffer); - this.#setBuffer(buffer); - } - - #setBuffer(buffer) { - this.#createStream = null; - // if (this.#stream) { // TODO this may cause strange issues - // this.#stream.destroy(); - // } - this.#stream = null; - this.#buffer = buffer; - this.#contentDrained = false; - this.#streamDrained = false; + if (this.#contentMutex.isLocked()) { + throw new Error(`Unable to set buffer: Content of Resource ${this.#path} is currently being transformed`); + } + this.#content = buffer; + this.#contentType = CONTENT_TYPES.BUFFER; + this.#contendModified(); } /** @@ -175,13 +295,9 @@ class Resource { * @public * @returns {Promise} Promise resolving with the resource content. */ - getString() { - if (this.#contentDrained) { - return Promise.reject(new Error(`Content of Resource ${this.#path} has been drained. ` + - "This might be caused by requesting resource content after a content stream has been " + - "requested and no new content (e.g. a new stream) has been set.")); - } - return this.getBuffer().then((buffer) => buffer.toString()); + async getString() { + const buff = await this.getBuffer(); + return buff.toString("utf8"); } /** @@ -199,29 +315,127 @@ class Resource { * * Repetitive calls of this function are only possible if new content has been set in the meantime (through * [setStream]{@link @ui5/fs/Resource#setStream}, [setBuffer]{@link @ui5/fs/Resource#setBuffer} - * or [setString]{@link @ui5/fs/Resource#setString}). This - * is to prevent consumers from accessing drained streams. + * or [setString]{@link @ui5/fs/Resource#setString}). + * This is to prevent subsequent consumers from accessing drained streams. + * + * This method is deprecated. Please use the asynchronous version + * [getStreamAsync]{@link @ui5/fs/Resource#getStreamAsync} instead. + * + * For atomic operations, consider using [modifyStream]{@link @ui5/fs/Resource#modifyStream}. * * @public + * @deprecated Use asynchronous Resource.getStreamAsync() instead * @returns {stream.Readable} Readable stream for the resource content. */ getStream() { - if (this.#contentDrained) { - throw new Error(`Content of Resource ${this.#path} has been drained. ` + - "This might be caused by requesting resource content after a content stream has been " + - "requested and no new content (e.g. a new stream) has been set."); - } - let contentStream; - if (this.#buffer) { - const bufferStream = new stream.PassThrough(); - bufferStream.end(this.#buffer); - contentStream = bufferStream; - } else if (this.#createStream || this.#stream) { - contentStream = this.#getStream(); - } - if (!contentStream) { + if (!deprecatedGetStreamCalled) { + log.verbose(`[DEPRECATION] Synchronous Resource.getStream() is deprecated and will be removed ` + + `in future versions. Please use asynchronous Resource.getStreamAsync() instead.`); + deprecatedGetStreamCalled = true; + } + + // First check for drained content + if (this.#contentType === CONTENT_TYPES.DRAINED_STREAM) { + throw new Error(`Content of Resource ${this.#path} is currently flagged as drained. ` + + `Consider using Resource.getStreamAsync() to wait for new content.`); + } + + // Make sure no other operation is currently modifying the content + if (this.#contentMutex.isLocked()) { + throw new Error(`Content of Resource ${this.#path} is currently being transformed. ` + + `Consider using Resource.getStreamAsync() to wait for the transformation to finish.`); + } + + return this.#getStream(); + } + + /** + * Gets a readable stream for the resource content. + * + * Repetitive calls of this function are only possible if new content has been set in the meantime (through + * [setStream]{@link @ui5/fs/Resource#setStream}, [setBuffer]{@link @ui5/fs/Resource#setBuffer} + * or [setString]{@link @ui5/fs/Resource#setString}). + * This is to prevent subsequent consumers from accessing drained streams. + * + * For atomic operations, consider using [modifyStream]{@link @ui5/fs/Resource#modifyStream}. + * + * @public + * @returns {Promise} Promise resolving with a readable stream for the resource content. + */ + async getStreamAsync() { + // First wait for new content if the current content is flagged as drained + if (this.#contentType === CONTENT_TYPES.DRAINED_STREAM) { + await this.#waitForNewContent(); + } + + // Then make sure no other operation is currently modifying the content + if (this.#contentMutex.isLocked()) { + await this.#contentMutex.waitForUnlock(); + } + + return this.#getStream(); + } + + /** + * Modifies the resource content by applying the given callback function. + * The callback function receives a readable stream of the current content + * and must return either a Buffer or a readable stream with the new content. + * The resource content is locked during the modification to prevent concurrent access. + * + * @param {function(stream.Readable): (Buffer|stream.Readable|Promise)} callback + */ + async modifyStream(callback) { + // First wait for new content if the current content is flagged as drained + if (this.#contentType === CONTENT_TYPES.DRAINED_STREAM) { + await this.#waitForNewContent(); + } + // Then make sure no other operation is currently modifying the content and then lock it + const release = await this.#contentMutex.acquire(); + const newContent = await callback(this.#getStream()); + + // New content is either buffer or stream + if (Buffer.isBuffer(newContent)) { + this.#content = newContent; + this.#contentType = CONTENT_TYPES.BUFFER; + } else if (typeof newContent === "object" && typeof newContent.pipe === "function") { + this.#content = newContent; + this.#contentType = CONTENT_TYPES.STREAM; + } else { + throw new Error("Unable to set new content: Content must be either a Buffer or a Readable Stream"); + } + this.#contendModified(); + release(); + } + + /** + * Returns the content as stream. + * + * @private + * @returns {stream.Readable} Readable stream + */ + #getStream() { + let stream; + switch (this.#contentType) { + case CONTENT_TYPES.BUFFER: + stream = Readable.from(this.#content); + break; + case CONTENT_TYPES.FACTORY: + // Prefer stream factory (which must always be set if content type is FACTORY) + stream = this.#createStreamFactory(); + break; + case CONTENT_TYPES.STREAM: + stream = this.#content; + break; + case CONTENT_TYPES.DRAINED_STREAM: + // This case is unexpected as callers should already handle this content type (by waiting for it to change) + throw new Error(`Unexpected error: Content of Resource ${this.#path} is flagged as drained.`); + case CONTENT_TYPES.IN_TRANSFORMATION: + // This case is unexpected as callers should already handle this content type (by waiting for it to change) + throw new Error(`Unexpected error: Content of Resource ${this.#path} is currently being transformed`); + default: throw new Error(`Resource ${this.#path} has no content`); } + // If a stream instance is being returned, it will typically get drained be the consumer. // In that case, further content access will result in a "Content stream has been drained" error. // However, depending on the execution environment, a resources content stream might have been @@ -230,8 +444,56 @@ class Resource { // To prevent unexpected "Content stream has been drained" errors caused by changing environments, we flag // the resource content as "drained" every time a stream is requested. Even if actually a buffer or // createStream callback is being used. - this.#contentDrained = true; - return contentStream; + this.#contentType = CONTENT_TYPES.DRAINED_STREAM; + return stream; + } + + /** + * Converts the buffer into a stream. + * + * @private + * @param {stream.Readable} stream Readable stream + * @returns {Promise} Promise resolving with buffer. + */ + async #getBufferFromStream(stream) { + const release = await this.#contentMutex.acquire(); + try { + this.#contentType = CONTENT_TYPES.IN_TRANSFORMATION; + if (this.hasSize()) { + // If size is known. preallocate buffer for improved performance + try { + const size = await this.getSize(); + const buffer = Buffer.allocUnsafe(size); + let offset = 0; + for await (const chunk of stream) { + const len = chunk.length; + if (offset + len > size) { + throw new Error(`Stream exceeded expected size: ${size}, got at least ${offset + len}`); + } + chunk.copy(buffer, offset); + offset += len; + } + if (offset !== size) { + throw new Error(`Stream ended early: expected ${size} bytes, got ${offset}`); + } + this.#content = buffer; + } catch (err) { + // Ensure the stream is cleaned up on error + if (!stream.destroyed) { + stream.destroy(err); + } + throw err; + } + } else { + // Is size is unknown, simply use utility consumer from Node.js webstreams + // See https://nodejs.org/api/webstreams.html#utility-consumers + this.#content = await streamToBuffer(stream); + } + this.#contentType = CONTENT_TYPES.BUFFER; + } finally { + release(); + } + return this.#content; } /** @@ -242,37 +504,96 @@ class Resource { callback for dynamic creation of a readable stream */ setStream(stream) { - this.#isModified = true; - this.#sourceMetadata.contentModified = true; - - this.#buffer = null; - // if (this.#stream) { // TODO this may cause strange issues - // this.#stream.destroy(); - // } + if (this.#contentMutex.isLocked()) { + throw new Error(`Unable to set stream: Content of Resource ${this.#path} is currently being transformed`); + } if (typeof stream === "function") { - this.#createStream = stream; - this.#stream = null; + this.#content = undefined; + this.#createStreamFactory = stream; + this.#contentType = CONTENT_TYPES.FACTORY; } else { - this.#stream = stream; - this.#createStream = null; + this.#content = stream; + this.#contentType = CONTENT_TYPES.STREAM; } - this.#contentDrained = false; - this.#streamDrained = false; + this.#contendModified(); } async getHash() { - if (this.#statInfo.isDirectory()) { + if (this.isDirectory()) { + throw new Error(`Unable to calculate hash for directory resource: ${this.#path}`); + } + + // First wait for new content if the current content is flagged as drained + if (this.#contentType === CONTENT_TYPES.DRAINED_STREAM) { + await this.#waitForNewContent(); + } + + // Then make sure no other operation is currently modifying the content + if (this.#contentMutex.isLocked()) { + await this.#contentMutex.waitForUnlock(); + } + + switch (this.#contentType) { + case CONTENT_TYPES.BUFFER: + return ssri.fromData(this.#content, SSRI_OPTIONS).toString(); + case CONTENT_TYPES.FACTORY: + return (await ssri.fromStream(this.#createStreamFactory(), SSRI_OPTIONS)).toString(); + case CONTENT_TYPES.STREAM: + // To be discussed: Should we read the stream into a buffer here (using #getBufferFromStream) to avoid + // draining it? + return (await ssri.fromStream(this.#getStream(), SSRI_OPTIONS)).toString(); + case CONTENT_TYPES.DRAINED_STREAM: + throw new Error(`Unexpected error: Content of Resource ${this.#path} is flagged as drained.`); + case CONTENT_TYPES.IN_TRANSFORMATION: + throw new Error(`Unexpected error: Content of Resource ${this.#path} is currently being transformed`); + default: + throw new Error(`Resource ${this.#path} has no content`); + } + } + + #contendModified() { + this.#sourceMetadata.contentModified = true; + this.#isModified = true; + + this.#byteSize = undefined; + this.#lastModified = new Date().getTime(); // TODO: Always update or keep initial value (= fs stat)? + + if (this.#contentType === CONTENT_TYPES.BUFFER) { + this.#byteSize = this.#content.byteLength; + this.#updateStatInfo(this.#byteSize); + } else { + this.#byteSize = undefined; + // Stat-info can't be updated based on streams or factory functions + } + } + + /** + * In case the resource content is flagged as drained stream, wait for new content to be set. + * Either resolves once the content type is no longer DRAINED_STREAM, or rejects with a timeout error. + */ + async #waitForNewContent() { + if (this.#contentType !== CONTENT_TYPES.DRAINED_STREAM) { return; } - const buffer = await this.getBuffer(); - return crypto.createHash("md5").update(buffer).digest("hex"); + // Stream might currently be processed by another consumer. Try again after a short wait, hoping the + // other consumer has processing it and has set new content + let timeoutCounter = 0; + log.verbose(`Content of Resource ${this.#path} is flagged as drained, waiting for new content...`); + while (this.#contentType === CONTENT_TYPES.DRAINED_STREAM) { + timeoutCounter++; + await setTimeout(1); + if (timeoutCounter > 100) { // 100 ms timeout + throw new Error(`Timeout waiting for content of Resource ${this.#path} to become available.`); + } + } + // New content is now available } - #updateStatInfo(buffer) { + #updateStatInfo(byteSize) { const now = new Date(); this.#statInfo.mtimeMs = now.getTime(); this.#statInfo.mtime = now; - this.#statInfo.size = buffer.byteLength; + this.#statInfo.size = byteSize; } /** @@ -285,6 +606,12 @@ class Resource { return this.#path; } + /** + * Gets the virtual resources path + * + * @public + * @returns {string} (Virtual) path of the resource + */ getOriginalPath() { return this.#path; } @@ -321,31 +648,71 @@ class Resource { * [fs.Stats]{@link https://nodejs.org/api/fs.html#fs_class_fs_stats} instance. * * @public + * @deprecated Use dedicated APIs like Resource.getSize(), .isDirectory(), .getLastModified() instead * @returns {fs.Stats|object} Instance of [fs.Stats]{@link https://nodejs.org/api/fs.html#fs_class_fs_stats} * or similar object */ getStatInfo() { + if (!deprecatedGetStatInfoCalled) { + log.verbose(`[DEPRECATION] Resource.getStatInfo() is deprecated and will be removed in future versions. ` + + `Please switch to dedicated APIs like Resource.getSize() instead.`); + deprecatedGetStatInfoCalled = true; + } return this.#statInfo; } - getLastModified() { + /** + * Checks whether the resource represents a directory. + * + * @public + * @returns {boolean} True if resource is a directory + */ + isDirectory() { + return this.#isDirectory; + } + /** + * Gets the last modified timestamp of the resource. + * + * @public + * @returns {number} Last modified timestamp (in milliseconds since UNIX epoch) + */ + getLastModified() { + return this.#lastModified; } /** - * Size in bytes allocated by the underlying buffer. + * Resource content size in bytes. * + * @public * @see {TypedArray#byteLength} - * @returns {Promise} size in bytes, 0 if there is no content yet + * @returns {Promise} size in bytes, 0 if the resource has no content */ async getSize() { - return this.#statInfo.size; - // // if resource does not have any content it should have 0 bytes - // if (!this.#buffer && !this.#createStream && !this.#stream) { - // return 0; - // } - // const buffer = await this.getBuffer(); - // return buffer.byteLength; + if (this.#byteSize !== undefined) { + return this.#byteSize; + } + if (this.#contentType === undefined) { + return 0; + } + const buffer = await this.getBuffer(); + this.#byteSize = buffer.byteLength; + return this.#byteSize; + } + + /** + * Checks whether the resource size can be determined without reading the entire content. + * E.g. for buffer-based content or if the size has been provided when the resource was created. + * + * @public + * @returns {boolean} True if size can be determined statically + */ + hasSize() { + return ( + this.#contentType === undefined || // No content => size is 0 + this.#byteSize !== undefined || // Size has been determined already + this.#contentType === CONTENT_TYPES.BUFFER // Buffer content => size can be determined + ); } /** @@ -369,20 +736,40 @@ class Resource { } async #getCloneOptions() { + // First wait for new content if the current content is flagged as drained + if (this.#contentType === CONTENT_TYPES.DRAINED_STREAM) { + await this.#waitForNewContent(); + } + + // Then make sure no other operation is currently modifying the content + if (this.#contentMutex.isLocked()) { + await this.#contentMutex.waitForUnlock(); + } + const options = { path: this.#path, statInfo: this.#statInfo, // Will be cloned in constructor + isDirectory: this.#isDirectory, + byteSize: this.#byteSize, + lastModified: this.#lastModified, sourceMetadata: clone(this.#sourceMetadata) }; - if (this.#stream) { - options.buffer = await this.#getBufferFromStream(); - } else if (this.#createStream) { - options.createStream = this.#createStream; - } else if (this.#buffer) { - options.buffer = this.#buffer; + switch (this.#contentType) { + case CONTENT_TYPES.STREAM: + // When cloning resource we have to read the stream into memory + options.buffer = await this.#getBufferFromStream(this.#content); + break; + case CONTENT_TYPES.BUFFER: + options.buffer = this.#content; + break; + case CONTENT_TYPES.FACTORY: + if (this.#createBufferFactory) { + options.createBuffer = this.#createBufferFactory; + } + options.createStream = this.#createStreamFactory; + break; } - return options; } @@ -463,51 +850,6 @@ class Resource { getSourceMetadata() { return this.#sourceMetadata; } - - /** - * Returns the content as stream. - * - * @private - * @returns {stream.Readable} Readable stream - */ - #getStream() { - if (this.#streamDrained) { - throw new Error(`Content stream of Resource ${this.#path} is flagged as drained.`); - } - if (this.#createStream) { - return this.#createStream(); - } - this.#streamDrained = true; - return this.#stream; - } - - /** - * Converts the buffer into a stream. - * - * @private - * @returns {Promise} Promise resolving with buffer. - */ - #getBufferFromStream() { - if (this.#buffering) { // Prevent simultaneous buffering, causing unexpected access to drained stream - return this.#buffering; - } - return this.#buffering = new Promise((resolve, reject) => { - const contentStream = this.#getStream(); - const buffers = []; - contentStream.on("data", (data) => { - buffers.push(data); - }); - contentStream.on("error", (err) => { - reject(err); - }); - contentStream.on("end", () => { - const buffer = Buffer.concat(buffers); - this.#setBuffer(buffer); - this.#buffering = null; - resolve(buffer); - }); - }); - } } const fnTrue = function() { @@ -525,13 +867,13 @@ const fnFalse = function() { */ function parseStat(statInfo) { return { - isFile: statInfo.isFile.bind(statInfo), - isDirectory: statInfo.isDirectory.bind(statInfo), - isBlockDevice: statInfo.isBlockDevice.bind(statInfo), - isCharacterDevice: statInfo.isCharacterDevice.bind(statInfo), - isSymbolicLink: statInfo.isSymbolicLink.bind(statInfo), - isFIFO: statInfo.isFIFO.bind(statInfo), - isSocket: statInfo.isSocket.bind(statInfo), + isFile: statInfo.isFile?.bind(statInfo), + isDirectory: statInfo.isDirectory?.bind(statInfo), + isBlockDevice: statInfo.isBlockDevice?.bind(statInfo), + isCharacterDevice: statInfo.isCharacterDevice?.bind(statInfo), + isSymbolicLink: statInfo.isSymbolicLink?.bind(statInfo), + isFIFO: statInfo.isFIFO?.bind(statInfo), + isSocket: statInfo.isSocket?.bind(statInfo), ino: statInfo.ino, size: statInfo.size, atimeMs: statInfo.atimeMs, @@ -545,24 +887,25 @@ function parseStat(statInfo) { }; } -function createStat(size) { +function createStat(size, isDirectory = false, lastModified) { const now = new Date(); + const mtime = lastModified === undefined ? now : new Date(lastModified); return { - isFile: fnTrue, - isDirectory: fnFalse, + isFile: isDirectory ? fnFalse : fnTrue, + isDirectory: isDirectory ? fnTrue : fnFalse, isBlockDevice: fnFalse, isCharacterDevice: fnFalse, isSymbolicLink: fnFalse, isFIFO: fnFalse, isSocket: fnFalse, ino: 0, - size, + size, // Might be undefined atimeMs: now.getTime(), - mtimeMs: now.getTime(), + mtimeMs: mtime.getTime(), ctimeMs: now.getTime(), birthtimeMs: now.getTime(), atime: now, - mtime: now, + mtime, ctime: now, birthtime: now, }; diff --git a/packages/fs/lib/ResourceFacade.js b/packages/fs/lib/ResourceFacade.js index 9604b56acd1..d9f8f41b5b1 100644 --- a/packages/fs/lib/ResourceFacade.js +++ b/packages/fs/lib/ResourceFacade.js @@ -46,7 +46,7 @@ class ResourceFacade { } /** - * Gets the resources path + * Gets the path original resource's path * * @public * @returns {string} (Virtual) path of the resource @@ -139,16 +139,46 @@ class ResourceFacade { * * Repetitive calls of this function are only possible if new content has been set in the meantime (through * [setStream]{@link @ui5/fs/Resource#setStream}, [setBuffer]{@link @ui5/fs/Resource#setBuffer} - * or [setString]{@link @ui5/fs/Resource#setString}). This - * is to prevent consumers from accessing drained streams. + * or [setString]{@link @ui5/fs/Resource#setString}). + * This is to prevent subsequent consumers from accessing drained streams. * * @public + * @deprecated Use asynchronous Resource.getStreamAsync() instead * @returns {stream.Readable} Readable stream for the resource content. */ getStream() { return this.#resource.getStream(); } + /** + * Gets a readable stream for the resource content. + * + * Repetitive calls of this function are only possible if new content has been set in the meantime (through + * [setStream]{@link @ui5/fs/Resource#setStream}, [setBuffer]{@link @ui5/fs/Resource#setBuffer} + * or [setString]{@link @ui5/fs/Resource#setString}). + * This is to prevent subsequent consumers from accessing drained streams. + * + * For atomic operations, please use [modifyStream]{@link @ui5/fs/Resource#modifyStream} + * + * @public + * @returns {Promise} Promise resolving with a readable stream for the resource content. + */ + async getStreamAsync() { + return this.#resource.getStreamAsync(); + } + + /** + * Modifies the resource content by applying the given callback function. + * The callback function receives a readable stream of the current content + * and must return either a Buffer or a readable stream with the new content. + * The resource content is locked during the modification to prevent concurrent access. + * + * @param {function(stream.Readable): (Buffer|stream.Readable|Promise)} callback + */ + async modifyStream(callback) { + return this.#resource.modifyStream(callback); + } + /** * Sets a readable stream as content. * @@ -171,6 +201,7 @@ class ResourceFacade { * [fs.Stats]{@link https://nodejs.org/api/fs.html#fs_class_fs_stats} instance. * * @public + * @deprecated Use dedicated APIs like Resource.getSize(), .isDirectory(), .getLastModified() instead * @returns {fs.Stats|object} Instance of [fs.Stats]{@link https://nodejs.org/api/fs.html#fs_class_fs_stats} * or similar object */ @@ -178,16 +209,47 @@ class ResourceFacade { return this.#resource.getStatInfo(); } + /** + * Checks whether the resource represents a directory. + * + * @public + * @returns {boolean} True if resource is a directory + */ + isDirectory() { + return this.#resource.isDirectory(); + } + + /** + * Gets the last modified timestamp of the resource. + * + * @public + * @returns {number} Last modified timestamp (in milliseconds since UNIX epoch) + */ + getLastModified() { + return this.#resource.getLastModified(); + } + /** * Size in bytes allocated by the underlying buffer. * * @see {TypedArray#byteLength} - * @returns {Promise} size in bytes, 0 if there is no content yet + * @returns {Promise} size in bytes, 0 if the resource has no content */ async getSize() { return this.#resource.getSize(); } + /** + * Checks whether the resource size can be determined without reading the entire content. + * E.g. for buffer-based content or if the size has been provided when the resource was created. + * + * @public + * @returns {boolean} True if size can be determined statically + */ + hasSize() { + return this.#resource.hasSize(); + } + /** * Adds a resource collection name that was involved in locating this resource. * diff --git a/packages/fs/package.json b/packages/fs/package.json index 2a2ff4a35b6..55c81e04c25 100644 --- a/packages/fs/package.json +++ b/packages/fs/package.json @@ -57,6 +57,7 @@ }, "dependencies": { "@ui5/logger": "^5.0.0-alpha.2", + "async-mutex": "^0.5.0", "clone": "^2.1.2", "escape-string-regexp": "^5.0.0", "globby": "^15.0.0", @@ -64,7 +65,8 @@ "micromatch": "^4.0.8", "minimatch": "^10.0.3", "pretty-hrtime": "^1.0.3", - "random-int": "^3.1.0" + "random-int": "^3.1.0", + "ssri": "^13.0.0" }, "devDependencies": { "@istanbuljs/esm-loader-hook": "^0.3.0", diff --git a/packages/fs/test/lib/Resource.js b/packages/fs/test/lib/Resource.js index aca04728746..97f5d95cb44 100644 --- a/packages/fs/test/lib/Resource.js +++ b/packages/fs/test/lib/Resource.js @@ -1,18 +1,21 @@ import test from "ava"; +import sinon from "sinon"; import {Stream, Transform} from "node:stream"; -import {promises as fs, createReadStream} from "node:fs"; +import {statSync, createReadStream} from "node:fs"; +import {stat, readFile} from "node:fs/promises"; import path from "node:path"; import Resource from "../../lib/Resource.js"; function createBasicResource() { const fsPath = path.join("test", "fixtures", "application.a", "webapp", "index.html"); + const statInfo = statSync(fsPath); const resource = new Resource({ path: "/app/index.html", createStream: function() { return createReadStream(fsPath); }, project: {}, - statInfo: {}, + statInfo: statInfo, fsPath }); return resource; @@ -39,6 +42,10 @@ const readStream = (readableStream) => { }); }; +test.afterEach.always((t) => { + sinon.restore(); +}); + test("Resource: constructor with missing path parameter", (t) => { t.throws(() => { new Resource({}); @@ -85,12 +92,152 @@ test("Resource: constructor with duplicated content parameter", (t) => { new Resource(resourceParams); }, { instanceOf: Error, - message: "Unable to create Resource: Please set only one content parameter. " + - "'buffer', 'string', 'stream' or 'createStream'" + message: "Unable to create Resource: Multiple content parameters provided. " + + "Please provide only one of the following parameters: 'buffer', 'string', 'stream' or 'createStream'" }, "Threw with expected error message"); }); }); +test("Resource: constructor with createBuffer factory must provide createStream", (t) => { + t.throws(() => { + new Resource({ + path: "/my/path", + createBuffer: () => Buffer.from("Content"), + }); + }, { + instanceOf: Error, + message: "Unable to create Resource: Parameter 'createStream' must be provided when " + + "parameter 'createBuffer' is used" + }); +}); + +test("Resource: constructor with invalid createBuffer parameter", (t) => { + t.throws(() => { + new Resource({ + path: "/my/path", + createBuffer: "not a function", + createStream: () => { + return new Stream.Readable(); + } + }); + }, { + instanceOf: Error, + message: "Unable to create Resource: Parameter 'createBuffer' must be a function" + }); +}); + +test("Resource: constructor with invalid content parameters", (t) => { + t.throws(() => { + new Resource({ + path: "/my/path", + createStream: "not a function" + }); + }, { + instanceOf: Error, + message: "Unable to create Resource: Parameter 'createStream' must be a function" + }); + + t.throws(() => { + new Resource({ + path: "/my/path", + stream: "not a stream" + }); + }, { + instanceOf: Error, + message: "Unable to create Resource: Parameter 'stream' must be a readable stream" + }); + + t.throws(() => { + new Resource({ + path: "/my/path", + buffer: "not a buffer" + }); + }, { + instanceOf: Error, + message: "Unable to create Resource: Parameter 'buffer' must be of type Buffer" + }); + + t.throws(() => { + new Resource({ + path: "/my/path", + string: 123 + }); + }, { + instanceOf: Error, + message: "Unable to create Resource: Parameter 'string' must be of type string" + }); + + t.throws(() => { + new Resource({ + path: "/my/path", + buffer: Buffer.from("Content"), + byteSize: -1 + }); + }, { + instanceOf: Error, + message: "Unable to create Resource: Parameter 'byteSize' must be a positive number" + }); + + t.throws(() => { + new Resource({ + path: "/my/path", + buffer: Buffer.from("Content"), + byteSize: "not a number" + }); + }, { + instanceOf: Error, + message: "Unable to create Resource: Parameter 'byteSize' must be a positive number" + }); + + t.throws(() => { + new Resource({ + path: "/my/path", + buffer: Buffer.from("Content"), + lastModified: -1 + }); + }, { + instanceOf: Error, + message: "Unable to create Resource: Parameter 'lastModified' must be a positive number" + }); + + t.throws(() => { + new Resource({ + path: "/my/path", + buffer: Buffer.from("Content"), + lastModified: "not a number" + }); + }, { + instanceOf: Error, + message: "Unable to create Resource: Parameter 'lastModified' must be a positive number" + }); + + const invalidStatInfo = { + isDirectory: () => false, + isFile: () => false, + size: 100, + mtimeMs: Date.now() + }; + t.throws(() => { + new Resource({ + path: "/my/path", + statInfo: invalidStatInfo + }); + }, { + instanceOf: Error, + message: "Unable to create Resource: statInfo must represent either a file or a directory" + }); + + t.throws(() => { + new Resource({ + path: "/my/path", + sourceMetadata: "invalid value" + }); + }, { + instanceOf: Error, + message: `Unable to create Resource: Parameter 'sourceMetadata' must be of type "object"` + }); +}); + test("Resource: From buffer", async (t) => { const resource = new Resource({ path: "/my/path", @@ -126,6 +273,24 @@ test("Resource: From createStream", async (t) => { const fsPath = path.join("test", "fixtures", "application.a", "webapp", "index.html"); const resource = new Resource({ path: "/my/path", + byteSize: 91, + createStream: () => { + return createReadStream(fsPath); + } + }); + t.is(await resource.getSize(), 91, "Content is set"); + t.false(resource.isModified(), "Content of new resource is not modified"); + t.false(resource.getSourceMetadata().contentModified, "Content of new resource is not modified"); +}); + +test("Resource: From createBuffer", async (t) => { + const fsPath = path.join("test", "fixtures", "application.a", "webapp", "index.html"); + const resource = new Resource({ + path: "/my/path", + byteSize: 91, + createBuffer: async () => { + return Buffer.from(await readFile(fsPath)); + }, createStream: () => { return createReadStream(fsPath); } @@ -150,6 +315,7 @@ test("Resource: Source metadata", async (t) => { t.is(resource.getSourceMetadata().adapter, "My Adapter", "Correct source metadata 'adapter' value"); t.is(resource.getSourceMetadata().fsPath, "/some/path", "Correct source metadata 'fsPath' value"); }); + test("Resource: Source metadata with modified content", async (t) => { const resource = new Resource({ path: "/my/path", @@ -307,6 +473,31 @@ test("Resource: getStream throwing an error", (t) => { }); }); +test("Resource: getStream call while resource is being transformed", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + stream: new Stream.Readable({ + read() { + this.push("Stream content"); + this.push(null); + } + }) + }); + + const p1 = resource.getBuffer(); // Trigger async transformation of stream to buffer + t.throws(() => { + resource.getStream(); // Synchronous getStream can't wait for transformation to finish + }, { + message: /Content of Resource \/my\/path\/to\/resource is currently being transformed. Consider using Resource.getStreamAsync\(\) to wait for the transformation to finish./ + }); + await p1; // Wait for initial transformation to finish + + t.false(resource.isModified(), "Resource has not been modified"); + + const value = await resource.getString(); + t.is(value, "Stream content", "Initial content still set"); +}); + test("Resource: setString", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", @@ -315,11 +506,13 @@ test("Resource: setString", async (t) => { t.is(resource.getSourceMetadata().contentModified, false, "sourceMetadata modified flag set correctly"); t.false(resource.isModified(), "Resource is not modified"); + t.falsy(resource.getLastModified(), "lastModified is not set"); resource.setString("Content"); t.is(resource.getSourceMetadata().contentModified, true, "sourceMetadata modified flag updated correctly"); t.true(resource.isModified(), "Resource is modified"); + t.truthy(resource.getLastModified(), "lastModified should be updated"); const value = await resource.getString(); t.is(value, "Content", "String set"); @@ -333,20 +526,48 @@ test("Resource: setBuffer", async (t) => { t.is(resource.getSourceMetadata().contentModified, false, "sourceMetadata modified flag set correctly"); t.false(resource.isModified(), "Resource is not modified"); + t.falsy(resource.getLastModified(), "lastModified is not set"); resource.setBuffer(Buffer.from("Content")); t.is(resource.getSourceMetadata().contentModified, true, "sourceMetadata modified flag updated correctly"); t.true(resource.isModified(), "Resource is modified"); + t.truthy(resource.getLastModified(), "lastModified should be updated"); const value = await resource.getString(); t.is(value, "Content", "String set"); }); +test("Resource: setBuffer call while resource is being transformed", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + stream: new Stream.Readable({ + read() { + this.push("Stream content"); + this.push(null); + } + }) + }); + + const p1 = resource.getBuffer(); // Trigger async transformation of stream to buffer + t.throws(() => { + resource.setBuffer(Buffer.from("Content")); // Set new buffer while transformation is still ongoing + }, { + message: `Unable to set buffer: Content of Resource /my/path/to/resource is currently being transformed` + }); + await p1; // Wait for initial transformation to finish + + t.false(resource.isModified(), "Resource has not been modified"); + + const value = await resource.getString(); + t.is(value, "Stream content", "Initial content still set"); +}); + test("Resource: size modification", async (t) => { const resource = new Resource({ path: "/my/path/to/resource" }); + t.true(resource.hasSize(), "resource without content has size"); t.is(await resource.getSize(), 0, "initial size without content"); // string @@ -361,9 +582,11 @@ test("Resource: size modification", async (t) => { // buffer resource.setBuffer(Buffer.from("Super")); + t.true(resource.hasSize(), "has size"); t.is(await resource.getSize(), 5, "size after manually setting the string"); const clonedResource1 = await resource.clone(); + t.true(clonedResource1.hasSize(), "has size after cloning"); t.is(await clonedResource1.getSize(), 5, "size after cloning the resource"); // buffer with alloc @@ -378,6 +601,7 @@ test("Resource: size modification", async (t) => { }).getSize(), 1234, "buffer with alloc when passing buffer to constructor"); const clonedResource2 = await resource.clone(); + t.true(clonedResource2.hasSize(), "buffer with alloc after clone has size"); t.is(await clonedResource2.getSize(), 1234, "buffer with alloc after clone"); // stream @@ -392,9 +616,11 @@ test("Resource: size modification", async (t) => { stream.push(null); streamResource.setStream(stream); + t.false(streamResource.hasSize(), "size not yet known for streamResource"); // stream is read and stored in buffer // test parallel size retrieval + await streamResource.getBuffer(); const [size1, size2] = await Promise.all([streamResource.getSize(), streamResource.getSize()]); t.is(size1, 23, "size for streamResource, parallel 1"); t.is(size2, 23, "size for streamResource, parallel 2"); @@ -409,6 +635,7 @@ test("Resource: setStream (Stream)", async (t) => { t.is(resource.getSourceMetadata().contentModified, false, "sourceMetadata modified flag set correctly"); t.false(resource.isModified(), "Resource is not modified"); + t.falsy(resource.getLastModified(), "lastModified is not set"); const stream = new Stream.Readable(); stream._read = function() {}; @@ -421,6 +648,7 @@ test("Resource: setStream (Stream)", async (t) => { t.is(resource.getSourceMetadata().contentModified, true, "sourceMetadata modified flag updated correctly"); t.true(resource.isModified(), "Resource is modified"); + t.truthy(resource.getLastModified(), "lastModified should be updated"); const value = await resource.getString(); t.is(value, "I am a readable stream!", "Stream set correctly"); @@ -434,6 +662,7 @@ test("Resource: setStream (Create stream callback)", async (t) => { t.is(resource.getSourceMetadata().contentModified, false, "sourceMetadata modified flag set correctly"); t.false(resource.isModified(), "Resource is not modified"); + t.falsy(resource.getLastModified(), "lastModified is not set"); resource.setStream(() => { const stream = new Stream.Readable(); @@ -447,11 +676,38 @@ test("Resource: setStream (Create stream callback)", async (t) => { t.is(resource.getSourceMetadata().contentModified, true, "sourceMetadata modified flag updated correctly"); t.true(resource.isModified(), "Resource is modified"); + t.truthy(resource.getLastModified(), "lastModified should be updated"); const value = await resource.getString(); t.is(value, "I am a readable stream!", "Stream set correctly"); }); +test("Resource: setStream call while resource is being transformed", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + stream: new Stream.Readable({ + read() { + this.push("Stream content"); + this.push(null); + } + }) + }); + + const p1 = resource.getBuffer(); // Trigger async transformation of stream to buffer + t.throws(() => { + resource.setStream(new Stream.Readable()); // Set new stream while transformation is still ongoing + }, { + message: `Unable to set stream: Content of Resource /my/path/to/resource is currently being transformed` + }); + await p1; // Wait for initial transformation to finish + + t.false(resource.isModified(), "Resource has not been modified"); + + const value = await resource.getString(); + t.is(value, "Stream content", "Initial content still set"); +}); + + test("Resource: clone resource with buffer", async (t) => { t.plan(2); @@ -487,6 +743,89 @@ test("Resource: clone resource with stream", async (t) => { t.is(clonedResourceContent, "Content", "Cloned resource has correct content string"); }); +test("Resource: clone resource with createBuffer factory", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + createStream: () => { + const stream = new Stream.Readable(); + stream._read = function() {}; + stream.push("Stream Content"); + stream.push(null); + return stream; + }, + createBuffer: async () => { + return Buffer.from("Buffer Content"); + } + + }); + + const clonedResource = await resource.clone(); + + const clonedResourceContent = await clonedResource.getString(); + t.is(clonedResourceContent, "Buffer Content", "Cloned resource has correct content string"); +}); + +test("Resource: clone resource with createStream factory", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + createStream: () => { + const stream = new Stream.Readable(); + stream._read = function() {}; + stream.push("Stream Content"); + stream.push(null); + return stream; + }, + }); + + const clonedResource = await resource.clone(); + + const clonedResourceContent = await clonedResource.getString(); + t.is(clonedResourceContent, "Stream Content", "Cloned resource has correct content string"); +}); + +test("Resource: clone resource with stream during transformation to buffer", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource" + }); + const stream = new Stream.Readable(); + stream._read = function() {}; + stream.push("Content"); + stream.push(null); + + resource.setStream(stream); + + const p1 = resource.getBuffer(); // Trigger async transformation of stream to buffer + + const clonedResource = await resource.clone(); + t.pass("Resource cloned"); + await p1; // Wait for initial transformation to finish + + t.is(await resource.getString(), "Content", "Original resource has correct content string"); + t.is(await clonedResource.getString(), "Content", "Cloned resource has correct content string"); +}); + +test("Resource: clone resource while stream is drained/waiting for new content", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource" + }); + const stream = new Stream.Readable(); + stream._read = function() {}; + stream.push("Content"); + stream.push(null); + + resource.setStream(stream); + + resource.getStream(); // Drain stream + + const p1 = resource.clone(); // Trigger async clone while stream is drained + + resource.setString("New Content"); + const clonedResource = await p1; // Wait for clone to finish + + t.is(await resource.getString(), "New Content", "Original resource has correct content string"); + t.is(await clonedResource.getString(), "New Content", "Cloned resource has correct content string"); +}); + test("Resource: clone resource with sourceMetadata", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", @@ -553,6 +892,7 @@ test("Resource: create resource with sourceMetadata.contentModified: true", (t) t.true(resource.getSourceMetadata().contentModified, "Modified flag is still true"); t.false(resource.isModified(), "Resource is not modified"); + t.falsy(resource.getLastModified(), "lastModified is not set"); }); test("getStream with createStream callback content: Subsequent content requests should throw error due " + @@ -561,9 +901,13 @@ test("getStream with createStream callback content: Subsequent content requests resource.getStream(); t.throws(() => { resource.getStream(); - }, {message: /Content of Resource \/app\/index.html has been drained/}); - await t.throwsAsync(resource.getBuffer(), {message: /Content of Resource \/app\/index.html has been drained/}); - await t.throwsAsync(resource.getString(), {message: /Content of Resource \/app\/index.html has been drained/}); + }, {message: /Content of Resource \/app\/index.html is currently flagged as drained. Consider using Resource\.getStreamAsync\(\) to wait for new content./}); + await t.throwsAsync(resource.getBuffer(), { + message: /Timeout waiting for content of Resource \/app\/index.html to become available/ + }); + await t.throwsAsync(resource.getString(), { + message: /Timeout waiting for content of Resource \/app\/index.html to become available/ + }); }); test("getStream with Buffer content: Subsequent content requests should throw error due to drained " + @@ -573,9 +917,9 @@ test("getStream with Buffer content: Subsequent content requests should throw er resource.getStream(); t.throws(() => { resource.getStream(); - }, {message: /Content of Resource \/app\/index.html has been drained/}); - await t.throwsAsync(resource.getBuffer(), {message: /Content of Resource \/app\/index.html has been drained/}); - await t.throwsAsync(resource.getString(), {message: /Content of Resource \/app\/index.html has been drained/}); + }, {message: /Content of Resource \/app\/index.html is currently flagged as drained. Consider using Resource\.getStreamAsync\(\) to wait for new content./}); + await t.throwsAsync(resource.getBuffer(), {message: /Timeout waiting for content of Resource \/app\/index.html to become available./}); + await t.throwsAsync(resource.getString(), {message: /Timeout waiting for content of Resource \/app\/index.html to become available./}); }); test("getStream with Stream content: Subsequent content requests should throw error due to drained " + @@ -594,51 +938,552 @@ test("getStream with Stream content: Subsequent content requests should throw er resource.getStream(); t.throws(() => { resource.getStream(); - }, {message: /Content of Resource \/app\/index.html has been drained/}); - await t.throwsAsync(resource.getBuffer(), {message: /Content of Resource \/app\/index.html has been drained/}); - await t.throwsAsync(resource.getString(), {message: /Content of Resource \/app\/index.html has been drained/}); + }, {message: /Content of Resource \/app\/index.html is currently flagged as drained. Consider using Resource\.getStreamAsync\(\) to wait for new content./}); + await t.throwsAsync(resource.getBuffer(), {message: /Timeout waiting for content of Resource \/app\/index.html to become available./}); + await t.throwsAsync(resource.getString(), {message: /Timeout waiting for content of Resource \/app\/index.html to become available./}); }); -test("getBuffer from Stream content: Subsequent content requests should not throw error due to drained " + - "content", async (t) => { - const resource = createBasicResource(); - const tStream = new Transform({ - transform(chunk, encoding, callback) { - this.push(chunk.toString()); - callback(); - } +test("getStream from factory content: Prefers createStream factory over createBuffer", async (t) => { + const createBufferStub = sinon.stub().resolves(Buffer.from("Buffer content")); + const createStreamStub = sinon.stub().returns( + new Stream.Readable({ + read() { + this.push("Stream content"); + this.push(null); + } + })); + const resource = new Resource({ + path: "/my/path/to/resource", + createBuffer: createBufferStub, + createStream: createStreamStub }); - const stream = resource.getStream(); - stream.pipe(tStream); - resource.setStream(tStream); - - const p1 = resource.getBuffer(); - const p2 = resource.getBuffer(); - - await t.notThrowsAsync(p1); - - // Race condition in _getBufferFromStream used to cause p2 - // to throw "Content stream of Resource /app/index.html is flagged as drained." - await t.notThrowsAsync(p2); + const stream = await resource.getStream(); + const streamedResult = await readStream(stream); + t.is(streamedResult, "Stream content", "getStream used createStream factory"); + t.true(createStreamStub.calledOnce, "createStream factory called once"); + t.false(createBufferStub.called, "createBuffer factory not called"); }); -test("Resource: getProject", (t) => { - t.plan(1); +test("getStreamAsync with Buffer content", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", - project: {getName: () => "Mock Project"} + buffer: Buffer.from("Content") }); - const project = resource.getProject(); - t.is(project.getName(), "Mock Project"); + + const stream = await resource.getStreamAsync(); + const result = await readStream(stream); + t.is(result, "Content", "Stream has been read correctly"); }); -test("Resource: setProject", (t) => { - t.plan(1); +test("getStreamAsync with createStream callback", async (t) => { + const fsPath = path.join("test", "fixtures", "application.a", "webapp", "index.html"); const resource = new Resource({ - path: "/my/path/to/resource" + path: "/my/path/to/resource", + createStream: () => { + return createReadStream(fsPath); + } }); - const project = {getName: () => "Mock Project"}; - resource.setProject(project); + + const stream = await resource.getStreamAsync(); + const result = await readStream(stream); + t.is(result.length, 91, "Stream content has correct length"); +}); + +test("getStreamAsync with Stream content", async (t) => { + const stream = new Stream.Readable(); + stream._read = function() {}; + stream.push("Stream "); + stream.push("content!"); + stream.push(null); + + const resource = new Resource({ + path: "/my/path/to/resource", + stream + }); + + const resultStream = await resource.getStreamAsync(); + const result = await readStream(resultStream); + t.is(result, "Stream content!", "Stream has been read correctly"); +}); + +test("getStreamAsync: Factory content can be used to create new streams after setting new content", async (t) => { + const fsPath = path.join("test", "fixtures", "application.a", "webapp", "index.html"); + const createStreamStub = sinon.stub().returns( + new Stream.Readable({ + read() { + this.push("Stream content"); + this.push(null); + } + })); + const resource = new Resource({ + path: "/my/path/to/resource", + createStream: createStreamStub, + }); + + // First call creates a stream + const stream1 = await resource.getStreamAsync(); + const result1 = await readStream(stream1); + t.is(result1.length, 14, "First stream read successfully"); + t.is(createStreamStub.callCount, 1, "Factory called once"); + + // Content is now drained. To call getStreamAsync again, we need to set new content + // by calling setStream with the factory again + resource.setStream(() => createReadStream(fsPath)); + + const stream2 = await resource.getStreamAsync(); + const result2 = await readStream(stream2); + t.is(result2.length, 91, "Second stream read successfully after resetting content"); +}); + +test("getStreamAsync: Waits for new content after stream is drained", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + string: "Initial content" + }); + + const stream1 = await resource.getStreamAsync(); + const result1 = await readStream(stream1); + t.is(result1, "Initial content", "First stream read successfully"); + + // Content is now drained, set new content + setTimeout(() => { + resource.setString("New content"); + }, 10); + + const stream2 = await resource.getStreamAsync(); + const result2 = await readStream(stream2); + t.is(result2, "New content", "Second stream read successfully after setting new content"); +}); + +test("getStreamAsync: Waits for content transformation to complete", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + stream: new Stream.Readable({ + read() { + this.push("Initial content"); + this.push(null); + } + }) + }); + + // Start getBuffer which will transform content + const bufferPromise = resource.getBuffer(); + + // Immediately call getStreamAsync while transformation is in progress + const streamPromise = resource.getStreamAsync(); + + // Both should complete successfully + await bufferPromise; + const stream = await streamPromise; + const result = await readStream(stream); + t.is(result, "Initial content", "Stream read successfully after waiting for transformation"); +}); + +test("getStreamAsync with no content throws error", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource" + }); + + await t.throwsAsync(resource.getStreamAsync(), { + message: "Resource /my/path/to/resource has no content" + }); +}); + +test("getStreamAsync from factory content: Prefers createStream factory", async (t) => { + const createBufferStub = sinon.stub().resolves(Buffer.from("Buffer content")); + const createStreamStub = sinon.stub().returns( + new Stream.Readable({ + read() { + this.push("Stream content"); + this.push(null); + } + })); + const resource = new Resource({ + path: "/my/path/to/resource", + createBuffer: createBufferStub, + createStream: createStreamStub + }); + + const stream = await resource.getStreamAsync(); + const streamedResult = await readStream(stream); + t.is(streamedResult, "Stream content", "getStreamAsync used createStream factory"); + t.true(createStreamStub.calledOnce, "createStream factory called once"); + t.false(createBufferStub.called, "createBuffer factory not called"); +}); + +test("modifyStream: Modify buffer content with transform stream", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + string: "hello world" + }); + + t.false(resource.isModified(), "Resource is not modified initially"); + + await resource.modifyStream(async (stream) => { + const content = await readStream(stream); + return Buffer.from(content.toUpperCase()); + }); + + const result = await resource.getString(); + t.is(result, "HELLO WORLD", "Content was modified correctly"); + t.true(resource.isModified(), "Resource is marked as modified"); +}); + +test("modifyStream: Return new stream from callback", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + string: "test content" + }); + + await resource.modifyStream((stream) => { + const transformStream = new Transform({ + transform(chunk, encoding, callback) { + this.push(chunk.toString().toUpperCase()); + callback(); + } + }); + stream.pipe(transformStream); + return transformStream; + }); + + const result = await resource.getString(); + t.is(result, "TEST CONTENT", "Content was modified with transform stream"); +}); + +test("modifyStream: Can modify multiple times", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + string: "test" + }); + + await resource.modifyStream(async (stream) => { + const content = await readStream(stream); + return Buffer.from(content + " modified"); + }); + + t.is(await resource.getString(), "test modified", "First modification applied"); + + await resource.modifyStream(async (stream) => { + const content = await readStream(stream); + return Buffer.from(content + " again"); + }); + + t.is(await resource.getString(), "test modified again", "Second modification applied"); +}); + +test("modifyStream: Works with factory content", async (t) => { + const fsPath = path.join("test", "fixtures", "application.a", "webapp", "index.html"); + const resource = new Resource({ + path: "/my/path/to/resource", + createStream: () => createReadStream(fsPath) + }); + + await resource.modifyStream(async (stream) => { + const content = await readStream(stream); + return Buffer.from(content.toUpperCase()); + }); + + const result = await resource.getString(); + t.true(result.includes(""), "Content was read and modified from factory"); +}); + +test("modifyStream: Waits for drained content", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + string: "initial" + }); + + // Drain the content + const stream1 = await resource.getStreamAsync(); + await readStream(stream1); + + // Set new content after a delay + setTimeout(() => { + resource.setString("new content"); + }, 10); + + // modifyStream should wait for new content + await resource.modifyStream(async (stream) => { + const content = await readStream(stream); + return Buffer.from(content.toUpperCase()); + }); + + const result = await resource.getString(); + t.is(result, "NEW CONTENT", "modifyStream waited for new content and modified it"); +}); + +test("modifyStream: Locks content during modification", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + string: "test" + }); + + const modifyPromise = resource.modifyStream(async (stream) => { + // Simulate slow transformation + await new Promise((resolve) => setTimeout(resolve, 20)); + const content = await readStream(stream); + return Buffer.from(content.toUpperCase()); + }); + + // Try to access content while modification is in progress + // This should wait for the lock to be released + const bufferPromise = resource.getBuffer(); + + await modifyPromise; + const buffer = await bufferPromise; + + t.is(buffer.toString(), "TEST", "Content access waited for modification to complete"); +}); + +test("modifyStream: Throws error if callback returns invalid content", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + string: "test" + }); + + await t.throwsAsync( + resource.modifyStream(async (stream) => { + return "not a buffer or stream"; + }), + { + message: "Unable to set new content: Content must be either a Buffer or a Readable Stream" + } + ); +}); + +test("modifyStream: Async callback returning Promise", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + string: "async test" + }); + + await resource.modifyStream(async (stream) => { + const content = await readStream(stream); + // Simulate async operation + await new Promise((resolve) => setTimeout(resolve, 5)); + return Buffer.from(content.replace("async", "ASYNC")); + }); + + const result = await resource.getString(); + t.is(result, "ASYNC test", "Async callback worked correctly"); +}); + +test("modifyStream: Sync callback returning Buffer", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + string: "sync test" + }); + + await resource.modifyStream((stream) => { + // Return buffer synchronously + return Buffer.from("SYNC TEST"); + }); + + const result = await resource.getString(); + t.is(result, "SYNC TEST", "Sync callback returning Buffer worked correctly"); +}); + +test("modifyStream: Updates modified flag", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + string: "test", + sourceMetadata: {} + }); + + t.false(resource.isModified(), "Resource is not marked as modified"); + t.false(resource.getSourceMetadata().contentModified, "contentModified is false initially"); + + await resource.modifyStream(async (stream) => { + const content = await readStream(stream); + return Buffer.from(content.toUpperCase()); + }); + + t.true(resource.isModified(), "Resource is marked as modified"); + t.true(resource.getSourceMetadata().contentModified, "contentModified is true after modification"); +}); + +test("getBuffer from Stream content with known size", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + byteSize: 14, + stream: new Stream.Readable({ + read() { + this.push("Stream content"); + this.push(null); + } + }) + }); + + const p1 = resource.getBuffer(); + const p2 = resource.getBuffer(); + + t.is((await p1).toString(), "Stream content"); + t.is((await p2).toString(), "Stream content"); +}); + +test("getBuffer from Stream content with incorrect size", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + byteSize: 80, + stream: new Stream.Readable({ + read() { + this.push("Stream content"); + this.push(null); + } + }) + }); + + await await t.throwsAsync(resource.getBuffer(), { + message: `Stream ended early: expected 80 bytes, got 14` + }, `Threw with expected error message`); + + const resource2 = new Resource({ + path: "/my/path/to/resource", + byteSize: 1, + stream: new Stream.Readable({ + read() { + this.push("Stream content"); + this.push(null); + } + }) + }); + + await await t.throwsAsync(resource2.getBuffer(), { + message: `Stream exceeded expected size: 1, got at least 14` + }, `Threw with expected error message`); +}); + +test("getBuffer from Stream content with stream error", async (t) => { + let destroyCalled = false; + const resource = new Resource({ + path: "/my/path/to/resource", + byteSize: 14, + stream: new Stream.Readable({ + read() { + this.emit("error", new Error("Stream failure")); + }, + destroy(err, callback) { + destroyCalled = true; + // The error will be present when stream.destroy is called due to the error + t.truthy(err, "destroy called with error"); + callback(err); + } + }) + }); + + await t.throwsAsync(resource.getBuffer()); + t.true(destroyCalled, "Stream destroy was called due to error"); +}); + +test("getBuffer from Stream content: Subsequent content requests should not throw error due to drained " + + "content", async (t) => { + const resource = createBasicResource(); + const tStream = new Transform({ + transform(chunk, encoding, callback) { + this.push(chunk.toString()); + callback(); + } + }); + const stream = resource.getStream(); + stream.pipe(tStream); + resource.setStream(tStream); + + const p1 = resource.getBuffer(); + const p2 = resource.getBuffer(); + + await t.notThrowsAsync(p1); + + // Race condition in _getBufferFromStream used to cause p2 + // to throw "Content stream of Resource /app/index.html is flagged as drained." + await t.notThrowsAsync(p2); +}); + +test("getBuffer from Stream content: getBuffer call while stream is consumed and new content is not yet set", + async (t) => { + const resource = createBasicResource(); + const tStream = new Transform({ + transform(chunk, encoding, callback) { + this.push(chunk.toString()); + callback(); + } + }); + const stream = resource.getStream(); + const p1 = resource.getBuffer(); + stream.pipe(tStream); + resource.setStream(tStream); + + const p2 = resource.getBuffer(); + + await t.notThrowsAsync(p1); + + // Race condition in _getBufferFromStream used to cause p2 + // to throw "Content stream of Resource /app/index.html is flagged as drained." + await t.notThrowsAsync(p2); + }); + +test("getBuffer from factory content: Prefers createBuffer factory over createStream", async (t) => { + const createBufferStub = sinon.stub().resolves(Buffer.from("Buffer content")); + const createStreamStub = sinon.stub().returns( + new Stream.Readable({ + read() { + this.push("Stream content"); + this.push(null); + } + })); + const resource = new Resource({ + path: "/my/path/to/resource", + createBuffer: createBufferStub, + createStream: createStreamStub + }); + const buffer = await resource.getBuffer(); + t.is(buffer.toString(), "Buffer content", "getBuffer used createBuffer factory"); + t.true(createBufferStub.calledOnce, "createBuffer factory called once"); + t.false(createStreamStub.called, "createStream factory not called"); + + // Calling getBuffer again should not call factories again + const buffer2 = await resource.getBuffer(); + t.is(buffer2, buffer, "getBuffer returned same buffer instance"); + t.true(createBufferStub.calledOnce, "createBuffer factory still called only once"); +}); + +test("getBuffer from factory content: Factory does not return buffer instance", async (t) => { + const createBufferStub = sinon.stub().resolves("Buffer content"); + const createStreamStub = sinon.stub().returns( + new Stream.Readable({ + read() { + this.push("Stream content"); + this.push(null); + } + })); + const resource = new Resource({ + path: "/my/path/to/resource", + createBuffer: createBufferStub, + createStream: createStreamStub + }); + await t.throwsAsync(resource.getBuffer(), { + message: `Buffer factory of Resource /my/path/to/resource did not return a Buffer instance` + }, `Threw with expected error message`); + t.true(createBufferStub.calledOnce, "createBuffer factory called once"); + t.false(createStreamStub.called, "createStream factory not called"); +}); + +test("Resource: getProject", (t) => { + t.plan(1); + const resource = new Resource({ + path: "/my/path/to/resource", + project: {getName: () => "Mock Project"} + }); + const project = resource.getProject(); + t.is(project.getName(), "Mock Project"); +}); + +test("Resource: setProject", (t) => { + t.plan(1); + const resource = new Resource({ + path: "/my/path/to/resource" + }); + const project = {getName: () => "Mock Project"}; + resource.setProject(project); t.is(resource.getProject().getName(), "Mock Project"); }); @@ -665,6 +1510,7 @@ test("Resource: constructor with stream", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", stream, + byteSize: 23, sourceMetadata: {} // Needs to be passed in order to get the "modified" state }); @@ -677,9 +1523,9 @@ test("Resource: constructor with stream", async (t) => { t.is(resource.getSourceMetadata().contentModified, false); }); -test("integration stat - resource size", async (t) => { +test("integration stat", async (t) => { const fsPath = path.join("test", "fixtures", "application.a", "webapp", "index.html"); - const statInfo = await fs.stat(fsPath); + const statInfo = await stat(fsPath); const resource = new Resource({ path: "/some/path", @@ -689,11 +1535,295 @@ test("integration stat - resource size", async (t) => { } }); t.is(await resource.getSize(), 91); + t.false(resource.isDirectory()); + t.is(resource.getLastModified(), statInfo.mtimeMs); // Setting the same content again should end up with the same size resource.setString(await resource.getString()); t.is(await resource.getSize(), 91); + t.true(resource.getLastModified() > statInfo.mtimeMs, "lastModified should be updated"); resource.setString("myvalue"); t.is(await resource.getSize(), 7); }); + +test("getSize", async (t) => { + const fsPath = path.join("test", "fixtures", "application.a", "webapp", "index.html"); + const statInfo = await stat(fsPath); + + const resource = new Resource({ + path: "/some/path", + byteSize: statInfo.size, + createStream: () => { + return createReadStream(fsPath); + } + }); + t.true(resource.hasSize()); + t.is(await resource.getSize(), 91); + + const resourceNoSize = new Resource({ + path: "/some/path", + createStream: () => { + return createReadStream(fsPath); + } + }); + t.false(resourceNoSize.hasSize(), "Resource with createStream and no byteSize has no size"); + t.is(await resourceNoSize.getSize(), 91); +}); + +/* Hash Glossary + + "Content" = "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" + "New content" = "sha256-EvQbHDId8MgpzlgZllZv3lKvbK/h0qDHRmzeU+bxPMo=" +*/ +test("getHash: Throws error for directory resource", async (t) => { + const resource = new Resource({ + path: "/my/directory", + isDirectory: true + }); + + await t.throwsAsync(resource.getHash(), { + message: "Unable to calculate hash for directory resource: /my/directory" + }); +}); + +test("getHash: Returns hash for buffer content", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + buffer: Buffer.from("Content") + }); + + const hash = await resource.getHash(); + t.is(typeof hash, "string", "Hash is a string"); + t.true(hash.startsWith("sha256-"), "Hash starts with sha256-"); + t.is(hash, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash for content"); +}); + +test("getHash: Returns hash for stream content", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + stream: new Stream.Readable({ + read() { + this.push("Content"); + this.push(null); + } + }), + }); + + const hash = await resource.getHash(); + t.is(typeof hash, "string", "Hash is a string"); + t.true(hash.startsWith("sha256-"), "Hash starts with sha256-"); + t.is(hash, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash for content"); +}); + +test("getHash: Returns hash for factory content", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + createStream: () => { + return new Stream.Readable({ + read() { + this.push("Content"); + this.push(null); + } + }); + } + }); + + const hash = await resource.getHash(); + t.is(typeof hash, "string", "Hash is a string"); + t.true(hash.startsWith("sha256-"), "Hash starts with sha256-"); + t.is(hash, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash for content"); +}); + +test("getHash: Throws error for resource with no content", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource" + }); + + await t.throwsAsync(resource.getHash(), { + message: "Resource /my/path/to/resource has no content" + }); +}); + +test("getHash: Different content produces different hashes", async (t) => { + const resource1 = new Resource({ + path: "/my/path/to/resource1", + string: "Content 1" + }); + + const resource2 = new Resource({ + path: "/my/path/to/resource2", + string: "Content 2" + }); + + const hash1 = await resource1.getHash(); + const hash2 = await resource2.getHash(); + + t.not(hash1, hash2, "Different content produces different hashes"); +}); + +test("getHash: Same content produces same hash", async (t) => { + const resource1 = new Resource({ + path: "/my/path/to/resource1", + string: "Content" + }); + + const resource2 = new Resource({ + path: "/my/path/to/resource2", + buffer: Buffer.from("Content") + }); + + const resource3 = new Resource({ + path: "/my/path/to/resource2", + stream: new Stream.Readable({ + read() { + this.push("Content"); + this.push(null); + } + }), + }); + + const hash1 = await resource1.getHash(); + const hash2 = await resource2.getHash(); + const hash3 = await resource3.getHash(); + + t.is(hash1, hash2, "Same content produces same hash for string and buffer content"); + t.is(hash1, hash3, "Same content produces same hash for string and stream"); +}); + +test("getHash: Waits for drained content", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + string: "Initial content" + }); + + // Drain the stream + await resource.getStream(); + const p1 = resource.getHash(); // Start getHash which should wait for new content + + resource.setString("New content"); + + const hash = await p1; + t.is(hash, "sha256-EvQbHDId8MgpzlgZllZv3lKvbK/h0qDHRmzeU+bxPMo=", "Correct hash for new content"); +}); + +test("getHash: Waits for content transformation to complete", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + stream: new Stream.Readable({ + read() { + this.push("Content"); + this.push(null); + } + }) + }); + + // Start getBuffer which will transform content + const bufferPromise = resource.getBuffer(); + + // Immediately call getHash while transformation is in progress + const hashPromise = resource.getHash(); + + // Both should complete successfully + await bufferPromise; + const hash = await hashPromise; + t.is(hash, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash after waiting for transformation"); +}); + +test("getHash: Can be called multiple times on buffer content", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + buffer: Buffer.from("Content") + }); + + const hash1 = await resource.getHash(); + const hash2 = await resource.getHash(); + const hash3 = await resource.getHash(); + + t.is(hash1, hash2, "First and second hash are identical"); + t.is(hash2, hash3, "Second and third hash are identical"); + t.is(hash1, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash value"); +}); + +test("getHash: Can be called multiple times on factory content", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + createStream: () => { + return new Stream.Readable({ + read() { + this.push("Content"); + this.push(null); + } + }); + } + }); + + const hash1 = await resource.getHash(); + const hash2 = await resource.getHash(); + const hash3 = await resource.getHash(); + + t.is(hash1, hash2, "First and second hash are identical"); + t.is(hash2, hash3, "Second and third hash are identical"); + t.is(hash1, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash value"); +}); + +test("getHash: Can only be called once on stream content", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + stream: new Stream.Readable({ + read() { + this.push("Content"); + this.push(null); + } + }) + }); + + const hash1 = await resource.getHash(); + await t.throwsAsync(resource.getHash(), { + message: /Timeout waiting for content of Resource \/my\/path\/to\/resource to become available./ + }, `Threw with expected error message`); + + t.is(hash1, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash value"); +}); + +test("getHash: Hash changes after content modification", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + string: "Original content" + }); + + const hash1 = await resource.getHash(); + t.is(hash1, "sha256-OUni2q0Lopc2NkTnXeaaYPNQJNUATQtbAqMWJvtCVNo=", "Correct hash for original content"); + + resource.setString("Modified content"); + + const hash2 = await resource.getHash(); + t.is(hash2, "sha256-8fba0TDG5CusKMUf/7GVTTxaYjVbRXacQv2lt3RdtT8=", "Hash changes after modification"); + t.not(hash1, hash2, "New hash is different from original"); +}); + +test("getHash: Works with empty content", async (t) => { + const resource = new Resource({ + path: "/my/path/to/resource", + string: "" + }); + + const hash = await resource.getHash(); + t.is(typeof hash, "string", "Hash is a string"); + t.true(hash.startsWith("sha256-"), "Hash starts with sha256-"); + t.is(hash, "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=", "Correct hash for empty content"); +}); + +test("getHash: Works with large content", async (t) => { + const largeContent = "x".repeat(1024 * 1024); // 1MB of 'x' + const resource = new Resource({ + path: "/my/path/to/resource", + string: largeContent + }); + + const hash = await resource.getHash(); + t.is(typeof hash, "string", "Hash is a string"); + t.true(hash.startsWith("sha256-"), "Hash starts with sha256-"); + // Hash of 1MB of 'x' characters + t.is(hash, "sha256-j5kLoLV3tRzwCeoEk2jBa72hsh4bk74HqCR1i7JTw5s=", "Correct hash for large content"); +}); diff --git a/packages/fs/test/lib/ResourceFacade.js b/packages/fs/test/lib/ResourceFacade.js index 5dee2fc8f1c..cabaa1b6748 100644 --- a/packages/fs/test/lib/ResourceFacade.js +++ b/packages/fs/test/lib/ResourceFacade.js @@ -17,6 +17,7 @@ test("Create instance", (t) => { resource }); t.is(resourceFacade.getPath(), "/my/path", "Returns correct path"); + t.is(resourceFacade.getOriginalPath(), "/my/path/to/resource", "Returns correct original path"); t.is(resourceFacade.getName(), "path", "Returns correct name"); t.is(resourceFacade.getConcealedResource(), resource, "Returns correct concealed resource"); }); @@ -86,7 +87,7 @@ test("ResourceFacade provides same public functions as Resource", (t) => { methods.forEach((method) => { t.truthy(resourceFacade[method], `resourceFacade provides function #${method}`); - if (["constructor", "getPath", "getName", "setPath", "clone"].includes(method)) { + if (["constructor", "getPath", "getOriginalPath", "getName", "setPath", "clone"].includes(method)) { // special functions with separate tests return; } diff --git a/packages/fs/test/lib/adapters/FileSystem_write.js b/packages/fs/test/lib/adapters/FileSystem_write.js index 8386c2a5487..33b3a72f021 100644 --- a/packages/fs/test/lib/adapters/FileSystem_write.js +++ b/packages/fs/test/lib/adapters/FileSystem_write.js @@ -116,7 +116,7 @@ test("Write modified resource in drain mode", async (t) => { await t.notThrowsAsync(fileEqual(t, destFsPath, "./test/fixtures/application.a/webapp/index.html")); await t.throwsAsync(resource.getBuffer(), - {message: /Content of Resource \/app\/index.html has been drained/}); + {message: /Timeout waiting for content of Resource \/app\/index.html to become available./}); }); test("Write with readOnly and drain options set should fail", async (t) => { @@ -216,7 +216,7 @@ test("Write modified resource into same file in drain mode", async (t) => { await t.notThrowsAsync(fileEqual(t, destFsPath, "./test/fixtures/application.a/webapp/index.html")); await t.throwsAsync(resource.getBuffer(), - {message: /Content of Resource \/app\/index.html has been drained/}); + {message: /Timeout waiting for content of Resource \/app\/index.html to become available./}); }); test("Write modified resource into same file in read-only mode", async (t) => { @@ -268,7 +268,7 @@ test("Write new resource in drain mode", async (t) => { await readerWriters.dest.write(resource, {drain: true}); await t.notThrowsAsync(fileContent(t, destFsPath, "Resource content")); await t.throwsAsync(resource.getBuffer(), - {message: /Content of Resource \/app\/index.html has been drained/}); + {message: /Timeout waiting for content of Resource \/app\/index.html to become available./}); }); test("Write new resource in read-only mode", async (t) => { From 2d0d8f04d561a6218f542385950a8708e7532dcd Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Mon, 1 Dec 2025 13:59:03 +0100 Subject: [PATCH 011/110] refactor(fs): Provide createBuffer factory in FileSystem adapter --- packages/fs/lib/adapters/FileSystem.js | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/packages/fs/lib/adapters/FileSystem.js b/packages/fs/lib/adapters/FileSystem.js index 284d95d84a4..84c133adbc1 100644 --- a/packages/fs/lib/adapters/FileSystem.js +++ b/packages/fs/lib/adapters/FileSystem.js @@ -7,6 +7,7 @@ const copyFile = promisify(fs.copyFile); const chmod = promisify(fs.chmod); const mkdir = promisify(fs.mkdir); const stat = promisify(fs.stat); +const readFile = promisify(fs.readFile); import {globby, isGitIgnored} from "globby"; import {PassThrough} from "node:stream"; import AbstractAdapter from "./AbstractAdapter.js"; @@ -129,6 +130,9 @@ class FileSystem extends AbstractAdapter { }, createStream: () => { return fs.createReadStream(fsPath); + }, + createBuffer: () => { + return readFile(fsPath); } })); } @@ -202,6 +206,9 @@ class FileSystem extends AbstractAdapter { resourceOptions.createStream = function() { return fs.createReadStream(fsPath); }; + resourceOptions.createBuffer = function() { + return readFile(fsPath); + }; } return this._createResource(resourceOptions); From ed04c7f07a54ce50cf108cd1ed3b518f79151445 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Mon, 1 Dec 2025 14:36:14 +0100 Subject: [PATCH 012/110] refactor(project): Refactor cache classes --- packages/project/lib/build/TaskRunner.js | 3 + .../project/lib/build/cache/BuildTaskCache.js | 126 ++++++++++++- .../lib/build/cache/ProjectBuildCache.js | 176 +++++++++++++++--- 3 files changed, 268 insertions(+), 37 deletions(-) diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index 08473e39b2b..2dbd7c63686 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -489,6 +489,9 @@ class TaskRunner { */ async _executeTask(taskName, taskFunction, taskParams) { if (this._cache.hasValidCacheForTask(taskName)) { + // Immediately skip task if cache is valid + // Continue if cache is (potentially) invalid, in which case taskFunction will + // validate the cache thoroughly this._log.skipTask(taskName); return; } diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index 1927b33e58c..a0aa46f572a 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -2,6 +2,26 @@ import micromatch from "micromatch"; import {getLogger} from "@ui5/logger"; const log = getLogger("build:cache:BuildTaskCache"); +/** + * @typedef {object} RequestMetadata + * @property {string[]} pathsRead - Specific resource paths that were read + * @property {string[]} patterns - Glob patterns used to read resources + */ + +/** + * @typedef {object} ResourceMetadata + * @property {string} hash - Content hash of the resource + * @property {number} lastModified - Last modified timestamp (mtimeMs) + */ + +/** + * @typedef {object} TaskCacheMetadata + * @property {RequestMetadata} [projectRequests] - Project resource requests + * @property {RequestMetadata} [dependencyRequests] - Dependency resource requests + * @property {Object.} [resourcesRead] - Resources read by task + * @property {Object.} [resourcesWritten] - Resources written by task + */ + function unionArray(arr, items) { for (const item of items) { if (!arr.includes(item)) { @@ -35,6 +55,12 @@ async function createMetadataForResources(resourceMap) { return metadata; } +/** + * Manages the build cache for a single task + * + * Tracks resource reads/writes and provides methods to validate cache validity + * based on resource changes. + */ export default class BuildTaskCache { #projectName; #taskName; @@ -54,6 +80,15 @@ export default class BuildTaskCache { #resourcesRead; #resourcesWritten; + // ===== LIFECYCLE ===== + + /** + * Creates a new BuildTaskCache instance + * + * @param {string} projectName - Name of the project + * @param {string} taskName - Name of the task + * @param {TaskCacheMetadata} metadata - Task cache metadata + */ constructor(projectName, taskName, {projectRequests, dependencyRequests, resourcesRead, resourcesWritten}) { this.#projectName = projectName; this.#taskName = taskName; @@ -71,11 +106,27 @@ export default class BuildTaskCache { this.#resourcesWritten = resourcesWritten ?? Object.create(null); } + // ===== METADATA ACCESS ===== + + /** + * Gets the name of the task + * + * @returns {string} Task name + */ getTaskName() { return this.#taskName; } - updateResources(projectRequests, dependencyRequests, resourcesRead, resourcesWritten) { + /** + * Updates the task cache with new resource metadata + * + * @param {RequestMetadata} projectRequests - Project resource requests + * @param {RequestMetadata} [dependencyRequests] - Dependency resource requests + * @param {Object.} resourcesRead - Resources read by task + * @param {Object.} resourcesWritten - Resources written by task + * @returns {void} + */ + updateMetadata(projectRequests, dependencyRequests, resourcesRead, resourcesWritten) { unionArray(this.#projectRequests.pathsRead, projectRequests.pathsRead); unionArray(this.#projectRequests.patterns, projectRequests.patterns); @@ -88,7 +139,12 @@ export default class BuildTaskCache { unionObject(this.#resourcesWritten, resourcesWritten); } - async toObject() { + /** + * Serializes the task cache to a JSON-compatible object + * + * @returns {Promise} Serialized task cache data + */ + async toJSON() { return { taskName: this.#taskName, resourceMetadata: { @@ -100,7 +156,19 @@ export default class BuildTaskCache { }; } - checkPossiblyInvalidatesTask(projectResourcePaths, dependencyResourcePaths) { + // ===== VALIDATION ===== + + /** + * Checks if changed resources match this task's tracked resources + * + * This is a fast check that determines if the task *might* be invalidated + * based on path matching and glob patterns. + * + * @param {Set|string[]} projectResourcePaths - Changed project resource paths + * @param {Set|string[]} dependencyResourcePaths - Changed dependency resource paths + * @returns {boolean} True if any changed resources match this task's tracked resources + */ + matchesChangedResources(projectResourcePaths, dependencyResourcePaths) { if (this.#isRelevantResourceChange(this.#projectRequests, projectResourcePaths)) { log.verbose( `Build cache for task ${this.#taskName} of project ${this.#projectName} possibly invalidated ` + @@ -118,15 +186,35 @@ export default class BuildTaskCache { return false; } - getReadResourceCacheEntry(searchResourcePath) { + // ===== CACHE LOOKUPS ===== + + /** + * Gets the cache entry for a resource that was read + * + * @param {string} searchResourcePath - Path of the resource to look up + * @returns {ResourceMetadata|object|undefined} Cache entry or undefined if not found + */ + getReadCacheEntry(searchResourcePath) { return this.#resourcesRead[searchResourcePath]; } - getWrittenResourceCache(searchResourcePath) { + /** + * Gets the cache entry for a resource that was written + * + * @param {string} searchResourcePath - Path of the resource to look up + * @returns {ResourceMetadata|object|undefined} Cache entry or undefined if not found + */ + getWriteCacheEntry(searchResourcePath) { return this.#resourcesWritten[searchResourcePath]; } - async isResourceInReadCache(resource) { + /** + * Checks if a resource exists in the read cache and has the same content + * + * @param {object} resource - Resource instance to check + * @returns {Promise} True if resource is in cache with matching content + */ + async hasResourceInReadCache(resource) { const cachedResource = this.#resourcesRead[resource.getPath()]; if (!cachedResource) { return false; @@ -138,7 +226,13 @@ export default class BuildTaskCache { } } - async isResourceInWriteCache(resource) { + /** + * Checks if a resource exists in the write cache and has the same content + * + * @param {object} resource - Resource instance to check + * @returns {Promise} True if resource is in cache with matching content + */ + async hasResourceInWriteCache(resource) { const cachedResource = this.#resourcesWritten[resource.getPath()]; if (!cachedResource) { return false; @@ -150,6 +244,14 @@ export default class BuildTaskCache { } } + /** + * Compares two resource instances for equality + * + * @param {object} resourceA - First resource to compare + * @param {object} resourceB - Second resource to compare + * @returns {Promise} True if resources are equal + * @throws {Error} If either resource is undefined + */ async #isResourceEqual(resourceA, resourceB) { if (!resourceA || !resourceB) { throw new Error("Cannot compare undefined resources"); @@ -157,7 +259,7 @@ export default class BuildTaskCache { if (resourceA === resourceB) { return true; } - if (resourceA.getStatInfo()?.mtimeMs !== resourceA.getStatInfo()?.mtimeMs) { + if (resourceA.getStatInfo()?.mtimeMs !== resourceB.getStatInfo()?.mtimeMs) { return false; } if (await resourceA.getString() === await resourceB.getString()) { @@ -166,6 +268,14 @@ export default class BuildTaskCache { return false; } + /** + * Compares a resource instance with cached metadata fingerprint + * + * @param {object} resourceA - Resource instance to compare + * @param {ResourceMetadata} resourceBMetadata - Cached metadata to compare against + * @returns {Promise} True if resource matches the fingerprint + * @throws {Error} If resource or metadata is undefined + */ async #isResourceFingerprintEqual(resourceA, resourceBMetadata) { if (!resourceA || !resourceBMetadata) { throw new Error("Cannot compare undefined resources"); diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 3fc87b06afe..4d8fe8c2ee0 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -36,10 +36,11 @@ export default class ProjectBuildCache { #restoreFailed = false; /** + * Creates a new ProjectBuildCache instance * - * @param {Project} project Project instance - * @param {string} cacheKey Cache key - * @param {string} [cacheDir] Cache directory + * @param {object} project - Project instance + * @param {string} cacheKey - Cache key identifying this build configuration + * @param {string} [cacheDir] - Optional cache directory for persistence */ constructor(project, cacheKey, cacheDir) { this.#project = project; @@ -51,7 +52,22 @@ export default class ProjectBuildCache { }); } - async updateTaskResult(taskName, workspaceTracker, dependencyTracker) { + // ===== TASK MANAGEMENT ===== + + /** + * Records the result of a task execution and updates the cache + * + * This method: + * 1. Stores metadata about resources read/written by the task + * 2. Detects which resources have actually changed + * 3. Invalidates downstream tasks if necessary + * + * @param {string} taskName - Name of the executed task + * @param {object} workspaceTracker - Tracker that monitored workspace reads + * @param {object} [dependencyTracker] - Tracker that monitored dependency reads + * @returns {Promise} + */ + async recordTaskResult(taskName, workspaceTracker, dependencyTracker) { const projectTrackingResults = workspaceTracker.getResults(); const dependencyTrackingResults = dependencyTracker?.getResults(); @@ -74,7 +90,7 @@ export default class ProjectBuildCache { const changedPaths = new Set((await Promise.all(writtenResourcePaths .map(async (resourcePath) => { // Check whether resource content actually changed - if (await taskCache.isResourceInWriteCache(resourcesWritten[resourcePath])) { + if (await taskCache.hasResourceInWriteCache(resourcesWritten[resourcePath])) { return undefined; } return resourcePath; @@ -97,7 +113,7 @@ export default class ProjectBuildCache { const emptySet = new Set(); for (let i = taskIndex + 1; i < allTasks.length; i++) { const nextTaskName = allTasks[i]; - if (!this.#taskCache.get(nextTaskName).checkPossiblyInvalidatesTask(changedPaths, emptySet)) { + if (!this.#taskCache.get(nextTaskName).matchesChangedResources(changedPaths, emptySet)) { continue; } if (this.#invalidatedTasks.has(taskName)) { @@ -114,7 +130,7 @@ export default class ProjectBuildCache { } } } - taskCache.updateResources( + taskCache.updateMetadata( projectTrackingResults.requests, dependencyTrackingResults?.requests, resourcesRead, @@ -137,7 +153,27 @@ export default class ProjectBuildCache { } } - harvestUpdatedResources() { + /** + * Returns the task cache for a specific task + * + * @param {string} taskName - Name of the task + * @returns {BuildTaskCache|undefined} The task cache or undefined if not found + */ + getTaskCache(taskName) { + return this.#taskCache.get(taskName); + } + + // ===== INVALIDATION ===== + + /** + * Collects all modified resource paths and clears the internal tracking set + * + * Note: This method has side effects - it clears the internal modified resources set. + * Call this only when you're ready to consume and process all accumulated changes. + * + * @returns {Set} Set of resource paths that have been modified + */ + collectAndClearModifiedPaths() { const updatedResources = new Set(this.#updatedResources); this.#updatedResources.clear(); return updatedResources; @@ -169,7 +205,19 @@ export default class ProjectBuildCache { return taskInvalidated; } - async validateChangedProjectResources(taskName, workspace, dependencies) { + /** + * Validates whether supposedly changed resources have actually changed + * + * Performs fine-grained validation by comparing resource content (hash/mtime) + * and removes false positives from the invalidation set. + * + * @param {string} taskName - Name of the task to validate + * @param {object} workspace - Workspace reader + * @param {object} dependencies - Dependencies reader + * @returns {Promise} + * @throws {Error} If task cache not found for the given taskName + */ + async validateChangedResources(taskName, workspace, dependencies) { // Check whether the supposedly changed resources for the task have actually changed if (!this.#invalidatedTasks.has(taskName)) { return; @@ -196,7 +244,7 @@ export default class ProjectBuildCache { if (!taskCache) { throw new Error(`Failed to validate changed resources for task ${taskName}: Task cache not found`); } - if (await taskCache.isResourceInReadCache(resource)) { + if (await taskCache.hasResourceInReadCache(resource)) { log.verbose(`Resource content has not changed for task ${taskName}, ` + `removing ${resourcePath} from set of changed resource paths`); changedResourcePaths.delete(resourcePath); @@ -204,36 +252,91 @@ export default class ProjectBuildCache { } } - getChangedProjectResourcePaths(taskName) { + /** + * Gets the set of changed project resource paths for a task + * + * @param {string} taskName - Name of the task + * @returns {Set} Set of changed project resource paths + */ + getChangedProjectPaths(taskName) { return this.#invalidatedTasks.get(taskName)?.changedProjectResourcePaths ?? new Set(); } - getChangedDependencyResourcePaths(taskName) { + /** + * Gets the set of changed dependency resource paths for a task + * + * @param {string} taskName - Name of the task + * @returns {Set} Set of changed dependency resource paths + */ + getChangedDependencyPaths(taskName) { return this.#invalidatedTasks.get(taskName)?.changedDependencyResourcePaths ?? new Set(); } - hasCache() { + // ===== CACHE QUERIES ===== + + /** + * Checks if any task cache exists + * + * @returns {boolean} True if at least one task has been cached + */ + hasAnyCache() { return this.#taskCache.size > 0; } - /* - Check whether the project's build cache has an entry for the given stage. - This means that the cache has been filled with the output of the given stage. - */ - hasCacheForTask(taskName) { + /** + * Checks whether the project's build cache has an entry for the given task + * + * This means that the cache has been filled with the input and output of the given task. + * + * @param {string} taskName - Name of the task + * @returns {boolean} True if cache exists for this task + */ + hasTaskCache(taskName) { return this.#taskCache.has(taskName); } - hasValidCacheForTask(taskName) { + /** + * Checks whether the cache for a specific task is currently valid + * + * @param {string} taskName - Name of the task + * @returns {boolean} True if cache exists and is valid for this task + */ + isTaskCacheValid(taskName) { return this.#taskCache.has(taskName) && !this.#invalidatedTasks.has(taskName); } - getCacheForTask(taskName) { - return this.#taskCache.get(taskName); + /** + * Determines whether a rebuild is needed + * + * @returns {boolean} True if no cache exists or if any tasks have been invalidated + */ + needsRebuild() { + return !this.hasAnyCache() || this.#invalidatedTasks.size > 0; } - requiresBuild() { - return !this.hasCache() || this.#invalidatedTasks.size > 0; + /** + * Gets the current status of the cache for debugging and monitoring + * + * @returns {object} Status information including cache state and statistics + */ + getStatus() { + return { + hasCache: this.hasAnyCache(), + totalTasks: this.#taskCache.size, + invalidatedTasks: this.#invalidatedTasks.size, + modifiedResourceCount: this.#updatedResources.size, + cacheKey: this.#cacheKey, + restoreFailed: this.#restoreFailed + }; + } + + /** + * Gets the names of all invalidated tasks + * + * @returns {string[]} Array of task names that have been invalidated + */ + getInvalidatedTaskNames() { + return Array.from(this.#invalidatedTasks.keys()); } async toObject() { @@ -255,7 +358,7 @@ export default class ProjectBuildCache { // } const taskCache = []; for (const cache of this.#taskCache.values()) { - const cacheObject = await cache.toObject(); + const cacheObject = await cache.toJSON(); taskCache.push(cacheObject); // addResourcesToIndex(taskName, cacheObject.resources.project.resourcesRead); // addResourcesToIndex(taskName, cacheObject.resources.project.resourcesWritten); @@ -283,7 +386,7 @@ export default class ProjectBuildCache { } async #serializeMetadata() { - const serializedCache = await this.toObject(); + const serializedCache = await this.toJSON(); const cacheContent = JSON.stringify(serializedCache, null, 2); const res = createResource({ path: `/cache-info.json`, @@ -351,8 +454,8 @@ export default class ProjectBuildCache { }*/ } if (changedResources.size) { - const tasksInvalidated = this.resourceChanged(changedResources, new Set()); - if (tasksInvalidated) { + const invalidatedTasks = this.markResourcesChanged(changedResources, new Set()); + if (invalidatedTasks.length > 0) { log.info(`Invalidating tasks due to changed resources for project ${this.#project.getName()}`); } } @@ -379,7 +482,13 @@ export default class ProjectBuildCache { this.#project.importCachedStages(cachedStages); } - async serializeToDisk() { + /** + * Saves the cache to disk + * + * @returns {Promise} + * @throws {Error} If cache persistence is not available + */ + async saveToDisk() { if (!this.#cacheRoot) { log.error("Cannot save cache to disk: No cache persistence available"); return; @@ -390,7 +499,16 @@ export default class ProjectBuildCache { ]); } - async attemptDeserializationFromDisk() { + /** + * Attempts to load the cache from disk + * + * If a cache file exists, it will be loaded and validated. If any source files + * have changed since the cache was created, affected tasks will be invalidated. + * + * @returns {Promise} + * @throws {Error} If cache restoration fails + */ + async loadFromDisk() { if (this.#restoreFailed || !this.#cacheRoot) { return; } From 01646f92ceb833cceb2f28c29cb2d9a5ae11593e Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Thu, 4 Dec 2025 11:18:41 +0100 Subject: [PATCH 013/110] refactor(fs): Add Proxy reader --- packages/fs/lib/Resource.js | 41 ++++++++-- packages/fs/lib/readers/Filter.js | 1 + packages/fs/lib/readers/Link.js | 1 + packages/fs/lib/readers/Proxy.js | 126 +++++++++++++++++++++++++++++ packages/fs/lib/resourceFactory.js | 14 ++++ 5 files changed, 178 insertions(+), 5 deletions(-) create mode 100644 packages/fs/lib/readers/Proxy.js diff --git a/packages/fs/lib/Resource.js b/packages/fs/lib/Resource.js index 19c937ba4b4..228f365c86b 100644 --- a/packages/fs/lib/Resource.js +++ b/packages/fs/lib/Resource.js @@ -47,6 +47,8 @@ class Resource { #lastModified; #statInfo; #isDirectory; + #integrity; + #inode; /* States */ #isModified = false; @@ -91,10 +93,12 @@ class Resource { * @param {boolean} [parameters.isDirectory] Flag whether the resource represents a directory * @param {number} [parameters.byteSize] Size of the resource content in bytes * @param {number} [parameters.lastModified] Last modified timestamp (in milliseconds since UNIX epoch) + * @param {string} [parameters.integrity] Integrity hash of the resource content + * @param {number} [parameters.inode] Inode number of the resource */ constructor({ path, statInfo, buffer, createBuffer, string, createStream, stream, project, sourceMetadata, - isDirectory, byteSize, lastModified, + isDirectory, byteSize, lastModified, integrity, inode, }) { if (!path) { throw new Error("Unable to create Resource: Missing parameter 'path'"); @@ -140,6 +144,7 @@ class Resource { this.#sourceMetadata.contentModified ??= false; this.#project = project; + this.#integrity = integrity; if (createStream) { // We store both factories individually @@ -193,6 +198,13 @@ class Resource { this.#lastModified = lastModified; } + if (inode !== undefined) { + if (typeof inode !== "number" || inode < 0) { + throw new Error("Unable to create Resource: Parameter 'inode' must be a positive number"); + } + this.#inode = inode; + } + if (statInfo) { this.#isDirectory ??= statInfo.isDirectory(); if (!this.#isDirectory && statInfo.isFile && !statInfo.isFile()) { @@ -200,6 +212,7 @@ class Resource { } this.#byteSize ??= statInfo.size; this.#lastModified ??= statInfo.mtimeMs; + this.#inode ??= statInfo.ino; // Create legacy statInfo object this.#statInfo = parseStat(statInfo); @@ -518,7 +531,10 @@ class Resource { this.#contendModified(); } - async getHash() { + async getIntegrity() { + if (this.#integrity) { + return this.#integrity; + } if (this.isDirectory()) { throw new Error(`Unable to calculate hash for directory resource: ${this.#path}`); } @@ -535,13 +551,16 @@ class Resource { switch (this.#contentType) { case CONTENT_TYPES.BUFFER: - return ssri.fromData(this.#content, SSRI_OPTIONS).toString(); + this.#integrity = ssri.fromData(this.#content, SSRI_OPTIONS); + break; case CONTENT_TYPES.FACTORY: - return (await ssri.fromStream(this.#createStreamFactory(), SSRI_OPTIONS)).toString(); + this.#integrity = await ssri.fromStream(this.#createStreamFactory(), SSRI_OPTIONS); + break; case CONTENT_TYPES.STREAM: // To be discussed: Should we read the stream into a buffer here (using #getBufferFromStream) to avoid // draining it? - return (await ssri.fromStream(this.#getStream(), SSRI_OPTIONS)).toString(); + this.#integrity = ssri.fromData(await this.#getBufferFromStream(this.#content), SSRI_OPTIONS); + break; case CONTENT_TYPES.DRAINED_STREAM: throw new Error(`Unexpected error: Content of Resource ${this.#path} is flagged as drained.`); case CONTENT_TYPES.IN_TRANSFORMATION: @@ -549,6 +568,7 @@ class Resource { default: throw new Error(`Resource ${this.#path} has no content`); } + return this.#integrity; } #contendModified() { @@ -556,6 +576,7 @@ class Resource { this.#isModified = true; this.#byteSize = undefined; + this.#integrity = undefined; this.#lastModified = new Date().getTime(); // TODO: Always update or keep initial value (= fs stat)? if (this.#contentType === CONTENT_TYPES.BUFFER) { @@ -681,6 +702,16 @@ class Resource { return this.#lastModified; } + /** + * Gets the inode number of the resource. + * + * @public + * @returns {number} Inode number of the resource + */ + getInode() { + return this.#inode; + } + /** * Resource content size in bytes. * diff --git a/packages/fs/lib/readers/Filter.js b/packages/fs/lib/readers/Filter.js index 1e4cf31e727..903f43cef76 100644 --- a/packages/fs/lib/readers/Filter.js +++ b/packages/fs/lib/readers/Filter.js @@ -23,6 +23,7 @@ class Filter extends AbstractReader { * * @public * @param {object} parameters Parameters + * @param {object} parameters.name Name of the reader * @param {@ui5/fs/AbstractReader} parameters.reader The resource reader or collection to wrap * @param {@ui5/fs/readers/Filter~callback} parameters.callback * Filter function. Will be called for every resource read through this reader. diff --git a/packages/fs/lib/readers/Link.js b/packages/fs/lib/readers/Link.js index dd6c56dd16d..6e394b74817 100644 --- a/packages/fs/lib/readers/Link.js +++ b/packages/fs/lib/readers/Link.js @@ -41,6 +41,7 @@ class Link extends AbstractReader { * * @public * @param {object} parameters Parameters + * @param {object} parameters.name Name of the reader * @param {@ui5/fs/AbstractReader} parameters.reader The resource reader or collection to wrap * @param {@ui5/fs/readers/Link/PathMapping} parameters.pathMapping */ diff --git a/packages/fs/lib/readers/Proxy.js b/packages/fs/lib/readers/Proxy.js new file mode 100644 index 00000000000..23f340f27bb --- /dev/null +++ b/packages/fs/lib/readers/Proxy.js @@ -0,0 +1,126 @@ +import micromatch from "micromatch"; +import AbstractReader from "../AbstractReader.js"; + +/** + * Callback function to retrieve a resource by its virtual path. + * + * @public + * @callback @ui5/fs/readers/Proxy~getResource + * @param {string} virPath Virtual path + * @returns {Promise} Promise resolving with a Resource instance + */ + +/** + * Callback function to list all available virtual resource paths. + * + * @public + * @callback @ui5/fs/readers/Proxy~listResourcePaths + * @returns {Promise} Promise resolving to an array of strings (the virtual resource paths) + */ + +/** + * Generic proxy adapter. Allowing to serve resources using callback functions. Read only. + * + * @public + * @class + * @alias @ui5/fs/readers/Proxy + * @extends @ui5/fs/readers/AbstractReader + */ +class Proxy extends AbstractReader { + /** + * Constructor + * + * @public + * @param {object} parameters + * @param {object} parameters.name Name of the reader + * @param {@ui5/fs/readers/Proxy~getResource} parameters.getResource + * Callback function to retrieve a resource by its virtual path. + * @param {@ui5/fs/readers/Proxy~listResourcePaths} parameters.listResourcePaths + * Callback function to list all available virtual resource paths. + * @returns {@ui5/fs/readers/Proxy} Reader instance + */ + constructor({name, getResource, listResourcePaths}) { + super(name); + if (typeof getResource !== "function") { + throw new Error(`Proxy adapter: Missing or invalid parameter 'getResource'`); + } + if (typeof listResourcePaths !== "function") { + throw new Error(`Proxy adapter: Missing or invalid parameter 'listResourcePaths'`); + } + this._getResource = getResource; + this._listResourcePaths = listResourcePaths; + } + + async _listResourcePaths() { + const virPaths = await this._listResourcePaths(); + if (!Array.isArray(virPaths) || !virPaths.every((p) => typeof p === "string")) { + throw new Error( + `Proxy adapter: 'listResourcePaths' did not return an array of strings`); + } + return virPaths; + } + + /** + * Matches and returns resources from a given map (either _virFiles or _virDirs). + * + * @private + * @param {string[]} patterns + * @param {string[]} resourcePaths + * @returns {Promise} + */ + async _matchPatterns(patterns, resourcePaths) { + const matchedPaths = micromatch(resourcePaths, patterns, { + dot: true + }); + return await Promise.all(matchedPaths.map((virPath) => { + return this._getResource(virPath); + })); + } + + /** + * Locate resources by glob. + * + * @private + * @param {string|string[]} virPattern glob pattern as string or array of glob patterns for + * virtual directory structure + * @param {object} [options={}] glob options + * @param {boolean} [options.nodir=true] Do not match directories + * @param {@ui5/fs/tracing.Trace} trace Trace instance + * @returns {Promise<@ui5/fs/Resource[]>} Promise resolving to list of resources + */ + async _byGlob(virPattern, options = {nodir: true}, trace) { + if (!(virPattern instanceof Array)) { + virPattern = [virPattern]; + } + + if (virPattern[0] === "" && !options.nodir) { // Match virtual root directory + return [ + this._createDirectoryResource(this._virBasePath.slice(0, -1)) + ]; + } + + return await this._matchPatterns(virPattern, await this._listResourcePaths()); + } + + /** + * Locates resources by path. + * + * @private + * @param {string} virPath Virtual path + * @param {object} options Options + * @param {@ui5/fs/tracing.Trace} trace Trace instance + * @returns {Promise<@ui5/fs/Resource>} Promise resolving to a single resource + */ + async _byPath(virPath, options, trace) { + trace.pathCall(); + + const resource = await this._getResource(virPath); + if (!resource || (options.nodir && resource.getStatInfo().isDirectory())) { + return null; + } else { + return resource; + } + } +} + +export default Proxy; diff --git a/packages/fs/lib/resourceFactory.js b/packages/fs/lib/resourceFactory.js index 88050085bb1..cffc34f36ba 100644 --- a/packages/fs/lib/resourceFactory.js +++ b/packages/fs/lib/resourceFactory.js @@ -9,6 +9,7 @@ import Resource from "./Resource.js"; import WriterCollection from "./WriterCollection.js"; import Filter from "./readers/Filter.js"; import Link from "./readers/Link.js"; +import Proxy from "./readers/Proxy.js"; import Tracker from "./Tracker.js"; import DuplexTracker from "./DuplexTracker.js"; import {getLogger} from "@ui5/logger"; @@ -238,6 +239,19 @@ export function createLinkReader(parameters) { return new Link(parameters); } +/** + * @param {object} parameters + * @param {object} parameters.name Name of the reader + * @param {@ui5/fs/readers/Proxy~getResource} parameters.getResource + * Callback function to retrieve a resource by its virtual path. + * @param {@ui5/fs/readers/Proxy~listResourcePaths} parameters.listResourcePaths + * Callback function to list all available virtual resource paths. + * @returns {@ui5/fs/readers/Proxy} Reader instance + */ +export function createProxy(parameters) { + return new Proxy(parameters); +} + /** * Create a [Link-Reader]{@link @ui5/fs/readers/Link} where all requests are prefixed with * /resources/<namespace>. From ec99c96d0591ad6d7a43feb4e5ada088f9853981 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Mon, 8 Dec 2025 10:53:27 +0100 Subject: [PATCH 014/110] refactor(project): API refactoring --- packages/project/lib/build/ProjectBuilder.js | 37 +- packages/project/lib/build/TaskRunner.js | 46 +- .../project/lib/build/cache/BuildTaskCache.js | 58 +- .../project/lib/build/cache/CacheManager.js | 127 ++++- .../lib/build/cache/ProjectBuildCache.js | 519 ++++++++++++------ packages/project/lib/build/cache/utils.js | 16 + .../project/lib/build/helpers/BuildContext.js | 26 +- .../lib/build/helpers/ProjectBuildContext.js | 72 ++- .../build/helpers/calculateBuildSignature.js | 72 +++ .../lib/build/helpers/createBuildManifest.js | 71 +-- .../project/lib/specifications/Project.js | 14 +- .../lib/specifications/extensions/Task.js | 14 + .../lib/specifications/types/Component.js | 10 +- .../project/lib/utils/sanitizeFileName.js | 44 ++ 14 files changed, 759 insertions(+), 367 deletions(-) create mode 100644 packages/project/lib/build/cache/utils.js create mode 100644 packages/project/lib/build/helpers/calculateBuildSignature.js create mode 100644 packages/project/lib/utils/sanitizeFileName.js diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 88e92cd75e4..51bf831aee8 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -5,6 +5,7 @@ import composeProjectList from "./helpers/composeProjectList.js"; import BuildContext from "./helpers/BuildContext.js"; import prettyHrtime from "pretty-hrtime"; import OutputStyleEnum from "./helpers/ProjectBuilderOutputStyle.js"; +import createBuildManifest from "./helpers/createBuildManifest.js"; /** * @public @@ -140,7 +141,6 @@ class ProjectBuilder { destPath, cleanDest = false, includedDependencies = [], excludedDependencies = [], dependencyIncludes, - cacheDir, watch, }) { if (!destPath && !watch) { @@ -179,7 +179,7 @@ class ProjectBuilder { } } - const projectBuildContexts = await this._createRequiredBuildContexts(requestedProjects, cacheDir); + const projectBuildContexts = await this._createRequiredBuildContexts(requestedProjects); const cleanupSigHooks = this._registerCleanupSigHooks(); let fsTarget; if (destPath) { @@ -274,9 +274,13 @@ class ProjectBuilder { pWrites.push(this._writeResults(projectBuildContext, fsTarget)); } - if (cacheDir && !alreadyBuilt.includes(projectName)) { - this.#log.verbose(`Serializing cache...`); - pWrites.push(projectBuildContext.getBuildCache().serializeToDisk()); + if (!alreadyBuilt.includes(projectName)) { + this.#log.verbose(`Saving cache...`); + const metadata = await createBuildManifest( + project, + this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), + projectBuildContext.getBuildSignature()); + pWrites.push(projectBuildContext.getBuildCache().saveToDisk(metadata)); } } await Promise.all(pWrites); @@ -294,7 +298,7 @@ class ProjectBuilder { return projectBuildContext.getProject(); }); const watchHandler = this._buildContext.initWatchHandler(relevantProjects, async () => { - await this.#update(projectBuildContexts, requestedProjects, fsTarget, cacheDir); + await this.#update(projectBuildContexts, requestedProjects, fsTarget); }); return watchHandler; @@ -315,7 +319,7 @@ class ProjectBuilder { } } - async #update(projectBuildContexts, requestedProjects, fsTarget, cacheDir) { + async #update(projectBuildContexts, requestedProjects, fsTarget) { const queue = []; await this._graph.traverseDepthFirst(async ({project}) => { const projectName = project.getName(); @@ -362,17 +366,14 @@ class ProjectBuilder { pWrites.push(this._writeResults(projectBuildContext, fsTarget)); } - if (cacheDir) { - this.#log.verbose(`Updating cache...`); - // TODO: Only serialize if cache has changed - // TODO: Serialize lazily, or based on memory pressure - pWrites.push(projectBuildContext.getBuildCache().serializeToDisk()); - } + this.#log.verbose(`Updating cache...`); + // TODO: Serialize lazily, or based on memory pressure + pWrites.push(projectBuildContext.getBuildCache().saveToDisk()); } await Promise.all(pWrites); } - async _createRequiredBuildContexts(requestedProjects, cacheDir) { + async _createRequiredBuildContexts(requestedProjects) { const requiredProjects = new Set(this._graph.getProjectNames().filter((projectName) => { return requestedProjects.includes(projectName); })); @@ -382,8 +383,7 @@ class ProjectBuilder { for (const projectName of requiredProjects) { this.#log.verbose(`Creating build context for project ${projectName}...`); const projectBuildContext = await this._buildContext.createProjectContext({ - project: this._graph.getProject(projectName), - cacheDir, + project: this._graph.getProject(projectName) }); projectBuildContexts.set(projectName, projectBuildContext); @@ -488,12 +488,9 @@ class ProjectBuilder { if (createBuildManifest) { // Create and write a build manifest metadata file - const { - default: createBuildManifest - } = await import("./helpers/createBuildManifest.js"); const metadata = await createBuildManifest( project, this._graph, buildConfig, this._buildContext.getTaskRepository(), - projectBuildContext.getBuildCache()); + projectBuildContext.getBuildSignature()); await target.write(resourceFactory.createResource({ path: `/.ui5/build-manifest.json`, string: JSON.stringify(metadata, null, "\t") diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index 2dbd7c63686..eb3668a2612 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -16,13 +16,14 @@ class TaskRunner { * @param {object} parameters.graph * @param {object} parameters.project * @param {@ui5/logger/loggers/ProjectBuild} parameters.log Logger to use + * @param {@ui5/project/build/cache/ProjectBuildCache} parameters.buildCache Build cache instance * @param {@ui5/project/build/helpers/TaskUtil} parameters.taskUtil TaskUtil instance * @param {@ui5/builder/tasks/taskRepository} parameters.taskRepository Task repository * @param {@ui5/project/build/ProjectBuilder~BuildConfiguration} parameters.buildConfig * Build configuration */ - constructor({graph, project, log, cache, taskUtil, taskRepository, buildConfig}) { - if (!graph || !project || !log || !cache || !taskUtil || !taskRepository || !buildConfig) { + constructor({graph, project, log, buildCache, taskUtil, taskRepository, buildConfig}) { + if (!graph || !project || !log || !buildCache || !taskUtil || !taskRepository || !buildConfig) { throw new Error("TaskRunner: One or more mandatory parameters not provided"); } this._project = project; @@ -31,7 +32,7 @@ class TaskRunner { this._taskRepository = taskRepository; this._buildConfig = buildConfig; this._log = log; - this._cache = cache; + this._buildCache = buildCache; this._directDependencies = new Set(this._taskUtil.getDependencies()); } @@ -192,38 +193,35 @@ class TaskRunner { options.projectNamespace = this._project.getNamespace(); // TODO: Apply cache and stage handling for custom tasks as well - this._project.useStage(taskName); - - // Check whether any of the relevant resources have changed - if (this._cache.hasCacheForTask(taskName)) { - await this._cache.validateChangedProjectResources( - taskName, this._project.getReader(), this._allDependenciesReader); - if (this._cache.hasValidCacheForTask(taskName)) { - this._log.skipTask(taskName); - return; - } + const requiresRun = await this._buildCache.prepareTaskExecution(taskName, this._allDependenciesReader); + if (!requiresRun) { + this._log.skipTask(taskName); + return; } + + const expectedOutput = new Set(); // TODO: Determine expected output properly + this._log.info( `Executing task ${taskName} for project ${this._project.getName()}`); const workspace = createTracker(this._project.getWorkspace()); const params = { workspace, taskUtil: this._taskUtil, - options, - buildCache: { + cacheUtil: { // TODO: Create a proper interface for this hasCache: () => { - return this._cache.hasCacheForTask(taskName); + return this._buildCache.hasTaskCache(taskName); }, getChangedProjectResourcePaths: () => { - return this._cache.getChangedProjectResourcePaths(taskName); + return this._buildCache.getChangedProjectResourcePaths(taskName); }, getChangedDependencyResourcePaths: () => { - return this._cache.getChangedDependencyResourcePaths(taskName); + return this._buildCache.getChangedDependencyResourcePaths(taskName); }, - } + }, + options, }; - // const invalidatedResources = this._cache.getDepsOfInvalidatedResourcesForTask(taskName); + // const invalidatedResources = this._buildCache.getDepsOfInvalidatedResourcesForTask(taskName); // if (invalidatedResources) { // params.invalidatedResources = invalidatedResources; // } @@ -246,7 +244,7 @@ class TaskRunner { `Task ${taskName} finished in ${Math.round((performance.now() - this._taskStart))} ms`); } this._log.endTask(taskName); - await this._cache.updateTaskResult(taskName, workspace, dependencies); + await this._buildCache.recordTaskResult(taskName, expectedOutput, workspace, dependencies); }; } this._tasks[taskName] = { @@ -319,6 +317,8 @@ class TaskRunner { // Tasks can provide an optional callback to tell build process which dependencies they require const requiredDependenciesCallback = await task.getRequiredDependenciesCallback(); + const getBuildSignatureCallback = await task.getBuildSignatureCallback(); + const getExpectedOutputCallback = await task.getExpectedOutputCallback(); const specVersion = task.getSpecVersion(); let requiredDependencies; @@ -390,6 +390,8 @@ class TaskRunner { taskName: newTaskName, taskConfiguration: taskDef.configuration, provideDependenciesReader, + getBuildSignatureCallback, + getExpectedOutputCallback, getDependenciesReader: () => { // Create the dependencies reader on-demand return this._createDependenciesReader(requiredDependencies); @@ -488,7 +490,7 @@ class TaskRunner { * @returns {Promise} Resolves when task has finished */ async _executeTask(taskName, taskFunction, taskParams) { - if (this._cache.hasValidCacheForTask(taskName)) { + if (this._buildCache.isTaskCacheValid(taskName)) { // Immediately skip task if cache is valid // Continue if cache is (potentially) invalid, in which case taskFunction will // validate the cache thoroughly diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index a0aa46f572a..001cf546c4e 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -1,5 +1,6 @@ import micromatch from "micromatch"; import {getLogger} from "@ui5/logger"; +import {createResourceIndex} from "./utils.js"; const log = getLogger("build:cache:BuildTaskCache"); /** @@ -37,23 +38,23 @@ function unionObject(target, obj) { } } -async function createMetadataForResources(resourceMap) { - const metadata = Object.create(null); - await Promise.all(Object.keys(resourceMap).map(async (resourcePath) => { - const resource = resourceMap[resourcePath]; - if (resource.hash) { - // Metadata object - metadata[resourcePath] = resource; - return; - } - // Resource instance - metadata[resourcePath] = { - hash: await resource.getHash(), - lastModified: resource.getStatInfo()?.mtimeMs, - }; - })); - return metadata; -} +// async function createMetadataForResources(resourceMap) { +// const metadata = Object.create(null); +// await Promise.all(Object.keys(resourceMap).map(async (resourcePath) => { +// const resource = resourceMap[resourcePath]; +// if (resource.hash) { +// // Metadata object +// metadata[resourcePath] = resource; +// return; +// } +// // Resource instance +// metadata[resourcePath] = { +// integrity: await resource.getIntegrity(), +// lastModified: resource.getLastModified(), +// }; +// })); +// return metadata; +// } /** * Manages the build cache for a single task @@ -89,7 +90,7 @@ export default class BuildTaskCache { * @param {string} taskName - Name of the task * @param {TaskCacheMetadata} metadata - Task cache metadata */ - constructor(projectName, taskName, {projectRequests, dependencyRequests, resourcesRead, resourcesWritten}) { + constructor(projectName, taskName, {projectRequests, dependencyRequests, input, output}) { this.#projectName = projectName; this.#taskName = taskName; @@ -102,8 +103,8 @@ export default class BuildTaskCache { pathsRead: [], patterns: [], }; - this.#resourcesRead = resourcesRead ?? Object.create(null); - this.#resourcesWritten = resourcesWritten ?? Object.create(null); + this.#resourcesRead = input ?? Object.create(null); + this.#resourcesWritten = output ?? Object.create(null); } // ===== METADATA ACCESS ===== @@ -122,8 +123,8 @@ export default class BuildTaskCache { * * @param {RequestMetadata} projectRequests - Project resource requests * @param {RequestMetadata} [dependencyRequests] - Dependency resource requests - * @param {Object.} resourcesRead - Resources read by task - * @param {Object.} resourcesWritten - Resources written by task + * @param {Object} resourcesRead - Resources read by task + * @param {Object} resourcesWritten - Resources written by task * @returns {void} */ updateMetadata(projectRequests, dependencyRequests, resourcesRead, resourcesWritten) { @@ -144,15 +145,12 @@ export default class BuildTaskCache { * * @returns {Promise} Serialized task cache data */ - async toJSON() { + async createMetadata() { return { - taskName: this.#taskName, - resourceMetadata: { - projectRequests: this.#projectRequests, - dependencyRequests: this.#dependencyRequests, - resourcesRead: await createMetadataForResources(this.#resourcesRead), - resourcesWritten: await createMetadataForResources(this.#resourcesWritten) - } + projectRequests: this.#projectRequests, + dependencyRequests: this.#dependencyRequests, + taskIndex: await createResourceIndex(Object.values(this.#resourcesRead)), + // resourcesWritten: await createMetadataForResources(this.#resourcesWritten) }; } diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index 138b0d8d373..0682c6ac75f 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -1,16 +1,65 @@ import cacache from "cacache"; +import path from "node:path"; +import fs from "graceful-fs"; +import {promisify} from "node:util"; +const mkdir = promisify(fs.mkdir); +const readFile = promisify(fs.readFile); +const writeFile = promisify(fs.writeFile); +import os from "node:os"; +import Configuration from "../../config/Configuration.js"; +import {getPathFromPackageName} from "../../utils/sanitizeFileName.js"; +import {getLogger} from "@ui5/logger"; -export class CacheManager { +const log = getLogger("project:build:cache:CacheManager"); + +const chacheManagerInstances = new Map(); +const CACACHE_OPTIONS = {algorithms: ["sha256"]}; + +/** + * Persistence management for the build cache. Using a file-based index and cacache + * + * cacheDir structure: + * - cas/ -- cacache content addressable storage + * - buildManifests/ -- build manifest files (acting as index, internally referencing cacache entries) + * + */ +export default class CacheManager { constructor(cacheDir) { this._cacheDir = cacheDir; } - async get(cacheKey) { + static async create(cwd) { + // ENV var should take precedence over the dataDir from the configuration. + let ui5DataDir = process.env.UI5_DATA_DIR; + if (!ui5DataDir) { + const config = await Configuration.fromFile(); + ui5DataDir = config.getUi5DataDir(); + } + if (ui5DataDir) { + ui5DataDir = path.resolve(cwd, ui5DataDir); + } else { + ui5DataDir = path.join(os.homedir(), ".ui5"); + } + const cacheDir = path.join(ui5DataDir, "buildCache"); + log.verbose(`Using build cache directory: ${cacheDir}`); + + if (!chacheManagerInstances.has(cacheDir)) { + chacheManagerInstances.set(cacheDir, new CacheManager(cacheDir)); + } + return chacheManagerInstances.get(cacheDir); + } + + #getBuildManifestPath(packageName, buildSignature) { + const pkgDir = getPathFromPackageName(packageName); + return path.join(this._cacheDir, pkgDir, `${buildSignature}.json`); + } + + async readBuildManifest(project, buildSignature) { try { - const result = await cacache.get(this._cacheDir, cacheKey); - return JSON.parse(result.data.toString("utf-8")); + const manifest = await readFile(this.#getBuildManifestPath(project.getId(), buildSignature), "utf8"); + return JSON.parse(manifest); } catch (err) { - if (err.code === "ENOENT" || err.code === "EINTEGRITY") { + if (err.code === "ENOENT") { // Cache miss return null; } @@ -18,11 +67,71 @@ export class CacheManager { } } - async put(cacheKey, data) { - await cacache.put(this._cacheDir, cacheKey, data); + async writeBuildManifest(project, buildSignature, manifest) { + const manifestPath = this.#getBuildManifestPath(project.getId(), buildSignature); + await mkdir(path.dirname(manifestPath), {recursive: true}); + await writeFile(manifestPath, JSON.stringify(manifest, null, 2), "utf8"); + } + + async getResourcePathForStage(buildSignature, stageName, resourcePath, integrity) { + // try { + if (!integrity) { + throw new Error("Integrity hash must be provided to read from cache"); + } + const cacheKey = this.#createKeyForStage(buildSignature, stageName, resourcePath); + const result = await cacache.get.info(this._cacheDir, cacheKey); + if (result.integrity !== integrity) { + log.info(`Integrity mismatch for cache entry ` + + `${cacheKey}: expected ${integrity}, got ${result.integrity}`); + + const res = await cacache.get.byDigest(this._cacheDir, result.integrity); + if (res) { + log.info(`Updating cache entry with expectation...`); + await this.writeStage(buildSignature, stageName, resourcePath, res.data); + return await this.getResourcePathForStage(buildSignature, stageName, resourcePath, integrity); + } + } + if (!result) { + return null; + } + return result.path; + // } catch (err) { + // if (err.code === "ENOENT") { + // // Cache miss + // return null; + // } + // throw err; + // } + } + + async writeStage(buildSignature, stageName, resourcePath, buffer) { + return await cacache.put( + this._cacheDir, + this.#createKeyForStage(buildSignature, stageName, resourcePath), + buffer, + CACACHE_OPTIONS + ); + } + + async writeStageStream(buildSignature, stageName, resourcePath, stream) { + const writable = cacache.put.stream( + this._cacheDir, + this.#createKeyForStage(buildSignature, stageName, resourcePath), + stream, + CACACHE_OPTIONS, + ); + return new Promise((resolve, reject) => { + writable.on("integrity", (digest) => { + resolve(digest); + }); + writable.on("error", (err) => { + reject(err); + }); + stream.pipe(writable); + }); } - async putStream(cacheKey, stream) { - await cacache.put.stream(this._cacheDir, cacheKey, stream); + #createKeyForStage(buildSignature, stageName, resourcePath) { + return `${buildSignature}|${stageName}|${resourcePath}`; } } diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 4d8fe8c2ee0..1a3df9f9cd2 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -1,55 +1,45 @@ -import path from "node:path"; -import {stat} from "node:fs/promises"; -import {createResource, createAdapter} from "@ui5/fs/resourceFactory"; +import {createResource, createProxy} from "@ui5/fs/resourceFactory"; import {getLogger} from "@ui5/logger"; +import fs from "graceful-fs"; +import {promisify} from "node:util"; +const readFile = promisify(fs.readFile); import BuildTaskCache from "./BuildTaskCache.js"; +import {createResourceIndex} from "./utils.js"; const log = getLogger("build:cache:ProjectBuildCache"); -/** - * A project's build cache can have multiple states - * - Initial build without existing build manifest or cache: - * * No build manifest - * * Tasks are unknown - * * Resources are unknown - * * No persistence of workspaces - * - Build of project with build manifest - * * (a valid build manifest implies that the project will not be built initially) - * * Tasks are known - * * Resources required and produced by tasks are known - * * No persistence of workspaces - * * => In case of a rebuild, all tasks need to be executed once to restore the workspaces - * - Build of project with build manifest and cache - * * Tasks are known - * * Resources required and produced by tasks are known - * * Workspaces can be restored from cache - */ - export default class ProjectBuildCache { #taskCache = new Map(); #project; - #cacheKey; - #cacheDir; - #cacheRoot; + #buildSignature; + #cacheManager; + // #cacheDir; #invalidatedTasks = new Map(); #updatedResources = new Set(); - #restoreFailed = false; /** * Creates a new ProjectBuildCache instance * - * @param {object} project - Project instance - * @param {string} cacheKey - Cache key identifying this build configuration - * @param {string} [cacheDir] - Optional cache directory for persistence + * @param {object} project Project instance + * @param {string} buildSignature Build signature for the current build + * @param {CacheManager} cacheManager Cache manager instance + * + * @private - Use ProjectBuildCache.create() instead */ - constructor(project, cacheKey, cacheDir) { + constructor(project, buildSignature, cacheManager) { this.#project = project; - this.#cacheKey = cacheKey; - this.#cacheDir = cacheDir; - this.#cacheRoot = cacheDir && createAdapter({ - fsBasePath: cacheDir, - virBasePath: "/" - }); + this.#buildSignature = buildSignature; + this.#cacheManager = cacheManager; + // this.#cacheRoot = cacheDir && createAdapter({ + // fsBasePath: cacheDir, + // virBasePath: "/" + // }); + } + + static async create(project, buildSignature, cacheManager) { + const cache = new ProjectBuildCache(project, buildSignature, cacheManager); + await cache.#attemptLoadFromDisk(); + return cache; } // ===== TASK MANAGEMENT ===== @@ -62,12 +52,13 @@ export default class ProjectBuildCache { * 2. Detects which resources have actually changed * 3. Invalidates downstream tasks if necessary * - * @param {string} taskName - Name of the executed task - * @param {object} workspaceTracker - Tracker that monitored workspace reads - * @param {object} [dependencyTracker] - Tracker that monitored dependency reads + * @param {string} taskName Name of the executed task + * @param {Set|undefined} expectedOutput Expected output resource paths + * @param {object} workspaceTracker Tracker that monitored workspace reads + * @param {object} [dependencyTracker] Tracker that monitored dependency reads * @returns {Promise} */ - async recordTaskResult(taskName, workspaceTracker, dependencyTracker) { + async recordTaskResult(taskName, expectedOutput, workspaceTracker, dependencyTracker) { const projectTrackingResults = workspaceTracker.getResults(); const dependencyTrackingResults = dependencyTracker?.getResults(); @@ -109,9 +100,9 @@ export default class ProjectBuildCache { } // Check whether other tasks need to be invalidated const allTasks = Array.from(this.#taskCache.keys()); - const taskIndex = allTasks.indexOf(taskName); + const taskIdx = allTasks.indexOf(taskName); const emptySet = new Set(); - for (let i = taskIndex + 1; i < allTasks.length; i++) { + for (let i = taskIdx + 1; i < allTasks.length; i++) { const nextTaskName = allTasks[i]; if (!this.#taskCache.get(nextTaskName).matchesChangedResources(changedPaths, emptySet)) { continue; @@ -258,7 +249,7 @@ export default class ProjectBuildCache { * @param {string} taskName - Name of the task * @returns {Set} Set of changed project resource paths */ - getChangedProjectPaths(taskName) { + getChangedProjectResourcePaths(taskName) { return this.#invalidatedTasks.get(taskName)?.changedProjectResourcePaths ?? new Set(); } @@ -268,7 +259,7 @@ export default class ProjectBuildCache { * @param {string} taskName - Name of the task * @returns {Set} Set of changed dependency resource paths */ - getChangedDependencyPaths(taskName) { + getChangedDependencyResourcePaths(taskName) { return this.#invalidatedTasks.get(taskName)?.changedDependencyResourcePaths ?? new Set(); } @@ -314,22 +305,39 @@ export default class ProjectBuildCache { return !this.hasAnyCache() || this.#invalidatedTasks.size > 0; } - /** - * Gets the current status of the cache for debugging and monitoring - * - * @returns {object} Status information including cache state and statistics - */ - getStatus() { - return { - hasCache: this.hasAnyCache(), - totalTasks: this.#taskCache.size, - invalidatedTasks: this.#invalidatedTasks.size, - modifiedResourceCount: this.#updatedResources.size, - cacheKey: this.#cacheKey, - restoreFailed: this.#restoreFailed - }; + async prepareTaskExecution(taskName, dependencyReader) { + // Check cache exists and ensure it's still valid before using it + if (this.hasTaskCache(taskName)) { + // Check whether any of the relevant resources have changed + await this.validateChangedResources(taskName, this.#project.getReader(), dependencyReader); + + if (this.isTaskCacheValid(taskName)) { + return false; // No need to execute task, cache is valid + } + } + + // Switch project to use cached stage as base layer + const stageName = this.#getStageNameForTask(taskName); + this.#project.useStage(stageName); + return true; // Task needs to be executed } + // /** + // * Gets the current status of the cache for debugging and monitoring + // * + // * @returns {object} Status information including cache state and statistics + // */ + // getStatus() { + // return { + // hasCache: this.hasAnyCache(), + // totalTasks: this.#taskCache.size, + // invalidatedTasks: this.#invalidatedTasks.size, + // modifiedResourceCount: this.#updatedResources.size, + // buildSignature: this.#buildSignature, + // restoreFailed: this.#restoreFailed + // }; + // } + /** * Gets the names of all invalidated tasks * @@ -339,66 +347,126 @@ export default class ProjectBuildCache { return Array.from(this.#invalidatedTasks.keys()); } - async toObject() { - // const globalResourceIndex = Object.create(null); - // function addResourcesToIndex(taskName, resourceMap) { - // for (const resourcePath of Object.keys(resourceMap)) { - // const resource = resourceMap[resourcePath]; - // const resourceKey = `${resourcePath}:${resource.hash}`; - // if (!globalResourceIndex[resourceKey]) { - // globalResourceIndex[resourceKey] = { - // hash: resource.hash, - // lastModified: resource.lastModified, - // tasks: [taskName] - // }; - // } else if (!globalResourceIndex[resourceKey].tasks.includes(taskName)) { - // globalResourceIndex[resourceKey].tasks.push(taskName); - // } - // } - // } - const taskCache = []; - for (const cache of this.#taskCache.values()) { - const cacheObject = await cache.toJSON(); - taskCache.push(cacheObject); - // addResourcesToIndex(taskName, cacheObject.resources.project.resourcesRead); - // addResourcesToIndex(taskName, cacheObject.resources.project.resourcesWritten); - // addResourcesToIndex(taskName, cacheObject.resources.dependencies.resourcesRead); + // async createBuildManifest() { + // // const globalResourceIndex = Object.create(null); + // // function addResourcesToIndex(taskName, resourceMap) { + // // for (const resourcePath of Object.keys(resourceMap)) { + // // const resource = resourceMap[resourcePath]; + // // const resourceKey = `${resourcePath}:${resource.hash}`; + // // if (!globalResourceIndex[resourceKey]) { + // // globalResourceIndex[resourceKey] = { + // // hash: resource.hash, + // // lastModified: resource.lastModified, + // // tasks: [taskName] + // // }; + // // } else if (!globalResourceIndex[resourceKey].tasks.includes(taskName)) { + // // globalResourceIndex[resourceKey].tasks.push(taskName); + // // } + // // } + // // } + // const taskCache = []; + // for (const cache of this.#taskCache.values()) { + // const cacheObject = await cache.toJSON(); + // taskCache.push(cacheObject); + // // addResourcesToIndex(taskName, cacheObject.resources.project.resourcesRead); + // // addResourcesToIndex(taskName, cacheObject.resources.project.resourcesWritten); + // // addResourcesToIndex(taskName, cacheObject.resources.dependencies.resourcesRead); + // } + // // Collect metadata for all relevant source files + // const sourceReader = this.#project.getSourceReader(); + // // const resourceMetadata = await Promise.all(Array.from(relevantSourceFiles).map(async (resourcePath) => { + // const resources = await sourceReader.byGlob("/**/*"); + // const sourceMetadata = Object.create(null); + // await Promise.all(resources.map(async (resource) => { + // sourceMetadata[resource.getOriginalPath()] = { + // lastModified: resource.getStatInfo()?.mtimeMs, + // hash: await resource.getHash(), + // }; + // })); + + // return { + // timestamp: Date.now(), + // cacheKey: this.#cacheKey, + // taskCache, + // sourceMetadata, + // // globalResourceIndex, + // }; + // } + + async #createCacheManifest() { + const cache = Object.create(null); + cache.index = await this.#createIndex(this.#project.getSourceReader(), true); + cache.indexTimestamp = Date.now(); // TODO: This is way too late if the resource' metadata has been cached + + cache.taskMetadata = Object.create(null); + for (const [taskName, taskCache] of this.#taskCache) { + cache.taskMetadata[taskName] = await taskCache.createMetadata(); } - // Collect metadata for all relevant source files - const sourceReader = this.#project.getSourceReader(); - // const resourceMetadata = await Promise.all(Array.from(relevantSourceFiles).map(async (resourcePath) => { - const resources = await sourceReader.byGlob("/**/*"); - const sourceMetadata = Object.create(null); - await Promise.all(resources.map(async (resource) => { - sourceMetadata[resource.getOriginalPath()] = { - lastModified: resource.getStatInfo()?.mtimeMs, - hash: await resource.getHash(), - }; - })); - return { - timestamp: Date.now(), - cacheKey: this.#cacheKey, - taskCache, - sourceMetadata, - // globalResourceIndex, - }; + cache.stages = Object.create(null); + + // const stages = this.#project.getStages(); + return cache; } - async #serializeMetadata() { - const serializedCache = await this.toJSON(); - const cacheContent = JSON.stringify(serializedCache, null, 2); - const res = createResource({ - path: `/cache-info.json`, - string: cacheContent, - }); - await this.#cacheRoot.write(res); + async #createIndex(reader, includeInode = false) { + const resources = await reader.byGlob("/**/*"); + return await createResourceIndex(resources, includeInode); + } + + async #saveBuildManifest(buildManifest) { + buildManifest.cache = await this.#createCacheManifest(); + + await this.#cacheManager.writeBuildManifest( + this.#project, this.#buildSignature, buildManifest); + + // const serializedCache = await this.toJSON(); + // const cacheContent = JSON.stringify(serializedCache, null, 2); + // const res = createResource({ + // path: `/cache-info.json`, + // string: cacheContent, + // }); + // await this.#cacheRoot.write(res); + } + + // async #serializeTaskOutputs() { + // log.info(`Serializing task outputs for project ${this.#project.getName()}`); + // const stageCache = await Promise.all(Array.from(this.#taskCache.keys()).map(async (taskName, idx) => { + // const reader = this.#project.getDeltaReader(taskName); + // if (!reader) { + // log.verbose( + // `Skipping serialization of empty writer for task ${taskName} in project ${this.#project.getName()}` + // ); + // return; + // } + // const resources = await reader.byGlob("/**/*"); + + // const target = createAdapter({ + // fsBasePath: path.join(this.#cacheDir, "taskCache", `${idx}-${taskName}`), + // virBasePath: "/" + // }); + + // for (const res of resources) { + // await target.write(res); + // } + // return { + // reader: target, + // stage: taskName + // }; + // })); + // // Re-import cache as base layer to reduce memory pressure + // this.#project.importCachedStages(stageCache.filter((entry) => entry)); + // } + + async #getStageNameForTask(taskName) { + return `tasks/${taskName}`; } - async #serializeTaskOutputs() { - log.info(`Serializing task outputs for project ${this.#project.getName()}`); + async #saveCachedStages() { + log.info(`Storing task outputs for project ${this.#project.getName()} in cache...`); const stageCache = await Promise.all(Array.from(this.#taskCache.keys()).map(async (taskName, idx) => { - const reader = this.#project.getDeltaReader(taskName); + const stageName = this.#getStageNameForTask(taskName); + const reader = this.#project.getDeltaReader(stageName); if (!reader) { log.verbose( `Skipping serialization of empty writer for task ${taskName} in project ${this.#project.getName()}` @@ -407,13 +475,16 @@ export default class ProjectBuildCache { } const resources = await reader.byGlob("/**/*"); - const target = createAdapter({ - fsBasePath: path.join(this.#cacheDir, "taskCache", `${idx}-${taskName}`), - virBasePath: "/" - }); - for (const res of resources) { - await target.write(res); + // Store resource content in cacache via CacheManager + const integrity = await this.#cacheManager.writeStageStream( + this.#buildSignature, stageName, + res.getOriginalPath(), await res.getStreamAsync() + ); + // const integrity = await this.#cacheManager.writeStage( + // this.#buildSignature, stageName, + // res.getOriginalPath(), await res.getBuffer() + // ); } return { reader: target, @@ -424,34 +495,58 @@ export default class ProjectBuildCache { this.#project.importCachedStages(stageCache.filter((entry) => entry)); } - async #checkSourceChanges(sourceMetadata) { + async #checkForIndexChanges(index, indexTimestamp) { log.verbose(`Checking for source changes for project ${this.#project.getName()}`); const sourceReader = this.#project.getSourceReader(); const resources = await sourceReader.byGlob("/**/*"); const changedResources = new Set(); for (const resource of resources) { + const currentLastModified = resource.getLastModified(); + if (currentLastModified > indexTimestamp) { + // Resource modified after index was created, no need for further checks + log.verbose(`Source file created or modified after index creation: ${resourcePath}`); + changedResources.add(resourcePath); + continue; + } + // Check against index const resourcePath = resource.getOriginalPath(); - const resourceMetadata = sourceMetadata[resourcePath]; - if (!resourceMetadata) { - // New resource - log.verbose(`New resource: ${resourcePath}`); + if (!index.hasOwnProperty(resourcePath)) { + // New resource encountered + log.verbose(`New source file: ${resourcePath}`); + changedResources.add(resourcePath); + continue; + } + const {lastModified, size, inode, integrity} = index[resourcePath]; + + if (resourceMetadata.lastModified !== currentLastModified) { + log.verbose(`Source file modified: ${resourcePath} (timestamp change)`); changedResources.add(resourcePath); continue; } - if (resourceMetadata.lastModified !== resource.getStatInfo()?.mtimeMs) { - log.verbose(`Resource changed: ${resourcePath}`); + + if (resourceMetadata.inode !== resource.getInode()) { + log.verbose(`Source file modified: ${resourcePath} (inode change)`); changedResources.add(resourcePath); + continue; } - // TODO: Hash-based check can be requested by user and per project - // The performance impact can be quite high for large projects - /* - if (someFlag) { - const currentHash = await resource.getHash(); - if (currentHash !== resourceMetadata.hash) { - log.verbose(`Resource changed: ${resourcePath}`); + + if (resourceMetadata.size !== await resource.getSize()) { + log.verbose(`Source file modified: ${resourcePath} (size change)`); + changedResources.add(resourcePath); + continue; + } + + if (currentLastModified === indexTimestamp) { + // If the source modification time is equal to index creation time, + // it's possible for a race condition to have occurred where the file was modified + // during index creation without changing its size. + // In this case, we need to perform an integrity check to determine if the file has changed. + const currentIntegrity = await resource.getIntegrity(); + if (currentIntegrity !== integrity) { + log.verbose(`Resource changed: ${resourcePath} (integrity change)`); changedResources.add(resourcePath); } - }*/ + } } if (changedResources.size) { const invalidatedTasks = this.markResourcesChanged(changedResources, new Set()); @@ -461,41 +556,82 @@ export default class ProjectBuildCache { } } - async #deserializeWriter() { - const cachedStages = await Promise.all(Array.from(this.#taskCache.keys()).map(async (taskName, idx) => { - const fsBasePath = path.join(this.#cacheDir, "taskCache", `${idx}-${taskName}`); - let cacheReader; - if (await exists(fsBasePath)) { - cacheReader = createAdapter({ - name: `Cache reader for task ${taskName} in project ${this.#project.getName()}`, - fsBasePath, - virBasePath: "/", - project: this.#project, + async #createReaderForStageCache(stageName, resourceMetadata) { + const allResourcePaths = Object.keys(resourceMetadata); + return createProxy({ + name: `Cache reader for task ${stageName} in project ${this.#project.getName()}`, + listResourcePaths: () => { + return allResourcePaths; + }, + getResource: async (virPath) => { + if (!allResourcePaths.includes(virPath)) { + return null; + } + const {lastModified, size, integrity} = resourceMetadata[virPath]; + if (size === undefined || lastModified === undefined || + integrity === undefined) { + throw new Error(`Incomplete metadata for resource ${virPath} of task ${stageName} ` + + `in project ${this.#project.getName()}`); + } + // Get path to cached file contend stored in cacache via CacheManager + const cachePath = await this.#cacheManager.getPathForTaskResource( + this.#buildSignature, stageName, virPath, integrity); + if (!cachePath) { + log.warn(`Content of resource ${virPath} of task ${stageName} ` + + `in project ${this.#project.getName()}`); + return null; + } + return createResource({ + path: virPath, + sourceMetadata: { + fsPath: cachePath + }, + createStream: () => { + return fs.createReadStream(cachePath); + }, + createBuffer: async () => { + return await readFile(cachePath); + }, + size, + lastModified, + integrity, }); } + }); + } + async #importCachedStages(stages) { + // const cachedStages = await Promise.all(Array.from(this.#taskCache.keys()).map(async (taskName, idx) => { + // // const fsBasePath = path.join(this.#cacheDir, "taskCache", `${idx}-${taskName}`); + // // let cacheReader; + // // if (await exists(fsBasePath)) { + // // cacheReader = createAdapter({ + // // name: `Cache reader for task ${taskName} in project ${this.#project.getName()}`, + // // fsBasePath, + // // virBasePath: "/", + // // project: this.#project, + // // }); + // // } + + // return { + // stage: taskName, + // reader: cacheReader + // }; + // })); + const cachedStages = await Promise.all(Object.entries(stages).map(async ([stageName, resourceMetadata]) => { + const reader = await this.#createReaderForStageCache(stageName, resourceMetadata); return { - stage: taskName, - reader: cacheReader + stageName, + reader }; })); this.#project.importCachedStages(cachedStages); } - /** - * Saves the cache to disk - * - * @returns {Promise} - * @throws {Error} If cache persistence is not available - */ - async saveToDisk() { - if (!this.#cacheRoot) { - log.error("Cannot save cache to disk: No cache persistence available"); - return; - } + async saveToDisk(buildManifest) { await Promise.all([ - await this.#serializeTaskOutputs(), - await this.#serializeMetadata() + await this.#saveCachedStages(), + await this.#saveBuildManifest(buildManifest) ]); } @@ -508,25 +644,42 @@ export default class ProjectBuildCache { * @returns {Promise} * @throws {Error} If cache restoration fails */ - async loadFromDisk() { - if (this.#restoreFailed || !this.#cacheRoot) { + async #attemptLoadFromDisk() { + const manifest = await this.#cacheManager.readBuildManifest(this.#project, this.#buildSignature); + if (!manifest) { + log.verbose(`No build manifest found for project ${this.#project.getName()} ` + + `with build signature ${this.#buildSignature}`); return; } - const res = await this.#cacheRoot.byPath(`/cache-info.json`); - if (!res) { - this.#restoreFailed = true; - return; - } - const cacheContent = JSON.parse(await res.getString()); + try { - const projectName = this.#project.getName(); - for (const {taskName, resourceMetadata} of cacheContent.taskCache) { - this.#taskCache.set(taskName, new BuildTaskCache(projectName, taskName, resourceMetadata)); + // Check build manifest version + if (manifest.version !== "1.0") { + log.verbose(`Incompatible build manifest version ${manifest.version} found for project ` + + `${this.#project.getName()} with build signature ${this.#buildSignature}. Ignoring cache.`); + return; + } + // TODO: Validate manifest against a schema + + // Validate build signature match + if (this.#buildSignature !== manifest.buildManifest.signature) { + throw new Error( + `Build manifest signature ${manifest.buildManifest.signature} does not match expected ` + + `build signature ${this.#buildSignature} for project ${this.#project.getName()}`); + } + log.info( + `Restoring build cache for project ${this.#project.getName()} from build manifest ` + + `with signature ${this.#buildSignature}`); + + const {cache} = manifest; + for (const [taskName, metadata] of Object.entries(cache.tasksMetadata)) { + this.#taskCache.set(taskName, new BuildTaskCache(this.#project.getName(), taskName, metadata)); } await Promise.all([ - this.#checkSourceChanges(cacheContent.sourceMetadata), - this.#deserializeWriter() + this.#checkForIndexChanges(cache.index, cache.indexTimestamp), + this.#importCachedStages(cache.stages), ]); + // this.#buildManifest = manifest; } catch (err) { throw new Error( `Failed to restore cache from disk for project ${this.#project.getName()}: ${err.message}`, { @@ -536,16 +689,16 @@ export default class ProjectBuildCache { } } -async function exists(filePath) { - try { - await stat(filePath); - return true; - } catch (err) { - // "File or directory does not exist" - if (err.code === "ENOENT") { - return false; - } else { - throw err; - } - } -} +// async function exists(filePath) { +// try { +// await stat(filePath); +// return true; +// } catch (err) { +// // "File or directory does not exist" +// if (err.code === "ENOENT") { +// return false; +// } else { +// throw err; +// } +// } +// } diff --git a/packages/project/lib/build/cache/utils.js b/packages/project/lib/build/cache/utils.js new file mode 100644 index 00000000000..387d69aeada --- /dev/null +++ b/packages/project/lib/build/cache/utils.js @@ -0,0 +1,16 @@ +export async function createResourceIndex(resources, includeInode = false) { + const index = Object.create(null); + await Promise.all(resources.map(async (resource) => { + const resourceMetadata = { + lastModified: resource.getLastModified(), + size: await resource.getSize(), + integrity: await resource.getIntegrity(), + }; + if (includeInode) { + resourceMetadata.inode = resource.getInode(); + } + + index[resource.getOriginalPath()] = resourceMetadata; + })); + return index; +} diff --git a/packages/project/lib/build/helpers/BuildContext.js b/packages/project/lib/build/helpers/BuildContext.js index 063aaf30e21..bab2e2f0282 100644 --- a/packages/project/lib/build/helpers/BuildContext.js +++ b/packages/project/lib/build/helpers/BuildContext.js @@ -1,8 +1,7 @@ -import path from "node:path"; import ProjectBuildContext from "./ProjectBuildContext.js"; import OutputStyleEnum from "./ProjectBuilderOutputStyle.js"; -import {createCacheKey} from "./createBuildManifest.js"; import WatchHandler from "./WatchHandler.js"; +import CacheManager from "../cache/CacheManager.js"; /** * Context of a build process @@ -12,6 +11,7 @@ import WatchHandler from "./WatchHandler.js"; */ class BuildContext { #watchHandler; + #cacheManager; constructor(graph, taskRepository, { // buildConfig selfContained = false, @@ -104,17 +104,8 @@ class BuildContext { return this._graph; } - async createProjectContext({project, cacheDir}) { - const cacheKey = await this.#createCacheKeyForProject(project); - if (cacheDir) { - cacheDir = path.join(cacheDir, cacheKey); - } - const projectBuildContext = new ProjectBuildContext({ - buildContext: this, - project, - cacheKey, - cacheDir, - }); + async createProjectContext({project}) { + const projectBuildContext = await ProjectBuildContext.create(this, project); this._projectBuildContexts.push(projectBuildContext); return projectBuildContext; } @@ -130,9 +121,12 @@ class BuildContext { return this.#watchHandler; } - async #createCacheKeyForProject(project) { - return createCacheKey(project, this._graph, - this.getBuildConfig(), this.getTaskRepository()); + async getCacheManager() { + if (this.#cacheManager) { + return this.#cacheManager; + } + this.#cacheManager = await CacheManager.create(this._graph.getRoot().getRootPath()); + return this.#cacheManager; } getBuildContext(projectName) { diff --git a/packages/project/lib/build/helpers/ProjectBuildContext.js b/packages/project/lib/build/helpers/ProjectBuildContext.js index 20a9e668150..375c95d59b2 100644 --- a/packages/project/lib/build/helpers/ProjectBuildContext.js +++ b/packages/project/lib/build/helpers/ProjectBuildContext.js @@ -2,6 +2,7 @@ import ResourceTagCollection from "@ui5/fs/internal/ResourceTagCollection"; import ProjectBuildLogger from "@ui5/logger/internal/loggers/ProjectBuild"; import TaskUtil from "./TaskUtil.js"; import TaskRunner from "../TaskRunner.js"; +import calculateBuildSignature from "./calculateBuildSignature.js"; import ProjectBuildCache from "../cache/ProjectBuildCache.js"; /** @@ -14,14 +15,13 @@ import ProjectBuildCache from "../cache/ProjectBuildCache.js"; class ProjectBuildContext { /** * - * @param {object} parameters Parameters - * @param {object} parameters.buildContext The build context. - * @param {object} parameters.project The project instance. - * @param {string} parameters.cacheKey The cache key. - * @param {string} parameters.cacheDir The cache directory. + * @param {object} buildContext The build context. + * @param {object} project The project instance. + * @param {string} buildSignature The signature of the build. + * @param {ProjectBuildCache} buildCache * @throws {Error} Throws an error if 'buildContext' or 'project' is missing. */ - constructor({buildContext, project, cacheKey, cacheDir}) { + constructor(buildContext, project, buildSignature, buildCache) { if (!buildContext) { throw new Error(`Missing parameter 'buildContext'`); } @@ -35,8 +35,8 @@ class ProjectBuildContext { projectName: project.getName(), projectType: project.getType() }); - this._cacheKey = cacheKey; - this._cache = new ProjectBuildCache(this._project, cacheKey, cacheDir); + this._buildSignature = buildSignature; + this._buildCache = buildCache; this._queues = { cleanup: [] }; @@ -45,12 +45,26 @@ class ProjectBuildContext { allowedTags: ["ui5:OmitFromBuildResult", "ui5:IsBundle"], allowedNamespaces: ["build"] }); - const buildManifest = this.#getBuildManifest(); - if (buildManifest) { - this._cache.deserialize(buildManifest.buildManifest.cache); - } + // const buildManifest = this.#getBuildManifest(); + // if (buildManifest) { + // this._buildCache.deserialize(buildManifest.buildManifest.cache); + // } + } + + static async create(buildContext, project) { + const buildSignature = await calculateBuildSignature(project, buildContext.getGraph(), + buildContext.getBuildConfig(), buildContext.getTaskRepository()); + const buildCache = await ProjectBuildCache.create( + project, buildSignature, await buildContext.getCacheManager()); + return new ProjectBuildContext( + buildContext, + project, + buildSignature, + buildCache + ); } + isRootProject() { return this._project === this._buildContext.getRootProject(); } @@ -127,7 +141,7 @@ class ProjectBuildContext { this._taskRunner = new TaskRunner({ project: this._project, log: this._log, - cache: this._cache, + buildCache: this._buildCache, taskUtil: this.getTaskUtil(), graph: this._buildContext.getGraph(), taskRepository: this._buildContext.getTaskRepository(), @@ -148,16 +162,16 @@ class ProjectBuildContext { return false; } - if (!this._cache.hasCache()) { - await this._cache.attemptDeserializationFromDisk(); - } + // if (!this._buildCache.hasAnyCache()) { + // await this._buildCache.attemptDeserializationFromDisk(); + // } - return this._cache.requiresBuild(); + return this._buildCache.needsRebuild(); } async runTasks() { await this.getTaskRunner().runTasks(); - const updatedResourcePaths = this._cache.harvestUpdatedResources(); + const updatedResourcePaths = this._buildCache.collectAndClearModifiedPaths(); if (updatedResourcePaths.size === 0) { return; @@ -170,7 +184,7 @@ class ProjectBuildContext { // Propagate changes to all dependents of the project for (const {project: dep} of graph.traverseDependents(this._project.getName())) { const projectBuildContext = this._buildContext.getBuildContext(dep.getName()); - projectBuildContext.getBuildCache().resourceChanged(emptySet, updatedResourcePaths); + projectBuildContext.getBuildCache().this.markResourcesChanged(emptySet, updatedResourcePaths); } } @@ -184,11 +198,11 @@ class ProjectBuildContext { // Manifest version 0.1 and 0.2 are always used without further checks for legacy reasons return manifest; } - if (manifest.buildManifest.manifestVersion === "0.3" && - manifest.buildManifest.cacheKey === this.getCacheKey()) { - // Manifest version 0.3 is used with a matching cache key - return manifest; - } + // if (manifest.buildManifest.manifestVersion === "0.3" && + // manifest.buildManifest.cacheKey === this.getCacheKey()) { + // // Manifest version 0.3 is used with a matching cache key + // return manifest; + // } // Unknown manifest version can't be used return; } @@ -208,11 +222,11 @@ class ProjectBuildContext { } getBuildCache() { - return this._cache; + return this._buildCache; } - getCacheKey() { - return this._cacheKey; + getBuildSignature() { + return this._buildSignature; } // async watchFileChanges() { @@ -229,7 +243,7 @@ class ProjectBuildContext { // // const resourcePath = this._project.getVirtualPath(filePath); // // this._log.info(`File changed: ${resourcePath} (${filePath})`); // // // Inform cache - // // this._cache.fileChanged(resourcePath); + // // this._buildCache.fileChanged(resourcePath); // // // Inform dependents // // for (const dependent of this._buildContext.getGraph().getTransitiveDependents(this._project.getName())) { // // await this._buildContext.getProjectBuildContext(dependent).dependencyFileChanged(resourcePath); @@ -241,7 +255,7 @@ class ProjectBuildContext { // dependencyFileChanged(resourcePath) { // this._log.info(`Dependency file changed: ${resourcePath}`); - // this._cache.fileChanged(resourcePath); + // this._buildCache.fileChanged(resourcePath); // } } diff --git a/packages/project/lib/build/helpers/calculateBuildSignature.js b/packages/project/lib/build/helpers/calculateBuildSignature.js new file mode 100644 index 00000000000..620c3523715 --- /dev/null +++ b/packages/project/lib/build/helpers/calculateBuildSignature.js @@ -0,0 +1,72 @@ +import {createRequire} from "node:module"; +import crypto from "node:crypto"; + +// Using CommonsJS require since JSON module imports are still experimental +const require = createRequire(import.meta.url); + +/** + * The build signature is calculated based on the **build configuration and environment** of a project. + * + * The hash is represented as a hexadecimal string to allow safe usage in file names. + * + * @private + * @param {@ui5/project/lib/Project} project The project to create the cache integrity for + * @param {@ui5/project/lib/graph/ProjectGraph} graph The project graph + * @param {object} buildConfig The build configuration + * @param {@ui5/builder/tasks/taskRepository} taskRepository The task repository (used to determine the effective + * versions of ui5-builder and ui5-fs) + */ +export default async function calculateBuildSignature(project, graph, buildConfig, taskRepository) { + const depInfo = collectDepInfo(graph, project); + const lockfileHash = await getLockfileHash(project); + const {builderVersion, fsVersion: builderFsVersion} = await taskRepository.getVersions(); + const projectVersion = await getVersion("@ui5/project"); + const fsVersion = await getVersion("@ui5/fs"); + + const key = project.getName() + project.getVersion() + + JSON.stringify(buildConfig) + JSON.stringify(depInfo) + + builderVersion + projectVersion + fsVersion + builderFsVersion + + lockfileHash; + + // Create a hash for all metadata + const hash = crypto.createHash("sha256").update(key).digest("hex"); + return hash; +} + +async function getVersion(pkg) { + return require(`${pkg}/package.json`).version; +} + +async function getLockfileHash(project) { + const rootReader = project.getRootReader({useGitIgnore: false}); + const lockfiles = await Promise.all([ + await rootReader.byPath("/package-lock.json"), + await rootReader.byPath("/yarn.lock"), + await rootReader.byPath("/pnpm-lock.yaml"), + ]); + let hash = ""; + for (const lockfile of lockfiles) { + if (lockfile) { + const content = await lockfile.getBuffer(); + hash += crypto.createHash("sha256").update(content).digest("hex"); + } + } + return hash; +} + +function collectDepInfo(graph, project) { + const projects = Object.create(null); + for (const depName of graph.getTransitiveDependencies(project.getName())) { + const dep = graph.getProject(depName); + projects[depName] = { + version: dep.getVersion() + }; + } + const extensions = Object.create(null); + for (const extension of graph.getExtensions()) { + extensions[extension.getName()] = { + version: extension.getVersion() + }; + } + return {projects, extensions}; +} diff --git a/packages/project/lib/build/helpers/createBuildManifest.js b/packages/project/lib/build/helpers/createBuildManifest.js index ba19023d54f..1a80bae840c 100644 --- a/packages/project/lib/build/helpers/createBuildManifest.js +++ b/packages/project/lib/build/helpers/createBuildManifest.js @@ -1,5 +1,4 @@ import {createRequire} from "node:module"; -import crypto from "node:crypto"; // Using CommonsJS require since JSON module imports are still experimental const require = createRequire(import.meta.url); @@ -17,18 +16,7 @@ function getSortedTags(project) { return Object.fromEntries(entities); } -async function collectDepInfo(graph, project) { - const transitiveDependencyInfo = Object.create(null); - for (const depName of graph.getTransitiveDependencies(project.getName())) { - const dep = graph.getProject(depName); - transitiveDependencyInfo[depName] = { - version: dep.getVersion() - }; - } - return transitiveDependencyInfo; -} - -export default async function(project, graph, buildConfig, taskRepository, transitiveDependencyInfo, buildCache) { +export default async function(project, graph, buildConfig, taskRepository, buildSignature, cache) { if (!project) { throw new Error(`Missing parameter 'project'`); } @@ -41,9 +29,7 @@ export default async function(project, graph, buildConfig, taskRepository, trans if (!taskRepository) { throw new Error(`Missing parameter 'taskRepository'`); } - if (!buildCache) { - throw new Error(`Missing parameter 'buildCache'`); - } + const projectName = project.getName(); const type = project.getType(); @@ -62,20 +48,19 @@ export default async function(project, graph, buildConfig, taskRepository, trans `Unable to create archive metadata for project ${project.getName()}: ` + `Project type ${type} is currently not supported`); } - let buildManifest; - if (project.isFrameworkProject()) { - buildManifest = await createFrameworkManifest(project, buildConfig, taskRepository); - } else { - buildManifest = { - manifestVersion: "0.3", - timestamp: new Date().toISOString(), - dependencies: collectDepInfo(graph, project), - version: project.getVersion(), - namespace: project.getNamespace(), - tags: getSortedTags(project), - cacheKey: createCacheKey(project, graph, buildConfig, taskRepository), - }; - } + // let buildManifest; + // if (project.isFrameworkProject()) { + // buildManifest = await createFrameworkManifest(project, buildConfig, taskRepository); + // } else { + // buildManifest = { + // manifestVersion: "0.3", + // timestamp: new Date().toISOString(), + // dependencies: collectDepInfo(graph, project), + // version: project.getVersion(), + // namespace: project.getNamespace(), + // tags: getSortedTags(project), + // }; + // } const metadata = { project: { @@ -90,19 +75,23 @@ export default async function(project, graph, buildConfig, taskRepository, trans } } }, - buildManifest, - buildCache: await buildCache.serialize(), + buildManifest: createBuildManifest(project, buildConfig, taskRepository, buildSignature), }; + if (cache) { + metadata.cache = cache; + } + return metadata; } -async function createFrameworkManifest(project, buildConfig, taskRepository) { +async function createBuildManifest(project, buildConfig, taskRepository, buildSignature) { // Use legacy manifest version for framework libraries to ensure compatibility const {builderVersion, fsVersion: builderFsVersion} = await taskRepository.getVersions(); const buildManifest = { - manifestVersion: "0.2", + manifestVersion: "1.0", timestamp: new Date().toISOString(), + buildSignature, versions: { builderVersion: builderVersion, projectVersion: await getVersion("@ui5/project"), @@ -122,17 +111,3 @@ async function createFrameworkManifest(project, buildConfig, taskRepository) { } return buildManifest; } - -export async function createCacheKey(project, graph, buildConfig, taskRepository) { - const depInfo = collectDepInfo(graph, project); - const {builderVersion, fsVersion: builderFsVersion} = await taskRepository.getVersions(); - const projectVersion = await getVersion("@ui5/project"); - const fsVersion = await getVersion("@ui5/fs"); - - const key = `${builderVersion}-${projectVersion}-${fsVersion}-${builderFsVersion}-` + - `${JSON.stringify(buildConfig)}-${JSON.stringify(depInfo)}`; - const hash = crypto.createHash("sha256").update(key).digest("hex"); - - // Create a hash from the cache key - return `${project.getName()}-${project.getVersion()}-${hash}`; -} diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index 5cdd01e6629..65313c81da1 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -298,6 +298,10 @@ class Project extends Specification { return this._getStyledReader(style); } + getStages() { + return {}; + } + #getWriter() { if (this.#currentWriter) { return this.#currentWriter; @@ -531,14 +535,14 @@ class Project extends Specification { if (!this.#workspaceSealed) { throw new Error(`Unable to import cached stages: Workspace is not sealed`); } - for (const {stage, reader} of stages) { - if (!this.#stages.includes(stage)) { - this.#stages.push(stage); + for (const {stageName, reader} of stages) { + if (!this.#stages.includes(stageName)) { + this.#stages.push(stageName); } if (reader) { - this.#writers.set(stage, [reader]); + this.#writers.set(stageName, [reader]); } else { - this.#writers.set(stage, []); + this.#writers.set(stageName, []); } } this.#currentVersion = 0; diff --git a/packages/project/lib/specifications/extensions/Task.js b/packages/project/lib/specifications/extensions/Task.js index c5aee60b7a0..dfb88fc83ec 100644 --- a/packages/project/lib/specifications/extensions/Task.js +++ b/packages/project/lib/specifications/extensions/Task.js @@ -31,6 +31,20 @@ class Task extends Extension { return (await this._getImplementation()).determineRequiredDependencies; } + /** + * @public + */ + async getBuildSignatureCallback() { + return (await this._getImplementation()).determineBuildSignature; + } + + /** + * @public + */ + async getExpectedOutputCallback() { + return (await this._getImplementation()).determineExpectedOutput; + } + /* === Internals === */ /** * @private diff --git a/packages/project/lib/specifications/types/Component.js b/packages/project/lib/specifications/types/Component.js index 8ca5b94df26..54a19df7f51 100644 --- a/packages/project/lib/specifications/types/Component.js +++ b/packages/project/lib/specifications/types/Component.js @@ -165,13 +165,13 @@ class Component extends ComponentProject { /** * @private * @param {object} config Configuration object - * @param {object} buildDescription Cache metadata object + * @param {object} buildManifest Cache metadata object */ - async _parseConfiguration(config, buildDescription) { - await super._parseConfiguration(config, buildDescription); + async _parseConfiguration(config, buildManifest) { + await super._parseConfiguration(config, buildManifest); - if (buildDescription) { - this._namespace = buildDescription.namespace; + if (buildManifest) { + this._namespace = buildManifest.namespace; return; } this._namespace = await this._getNamespace(); diff --git a/packages/project/lib/utils/sanitizeFileName.js b/packages/project/lib/utils/sanitizeFileName.js new file mode 100644 index 00000000000..8950705de2c --- /dev/null +++ b/packages/project/lib/utils/sanitizeFileName.js @@ -0,0 +1,44 @@ +import path from "node:path"; + +const forbiddenCharsRegex = /[^0-9a-zA-Z\-._]/g; +const windowsReservedNames = /^(con|prn|aux|nul|com[1-9]|lpt[1-9])(\..*)?$/i; + +/** + * Sanitize a file name by replacing any characters not matching the allowed set with a dash. + * Additionally validate that the file name to make sure it is safe to use on various file systems. + * + * @param {string} fileName The file name to validate + * @returns {string} The sanitized file name + * @throws {Error} If the file name is empty, starts with a dot, contains a reserved value, or is too long + */ +export default function sanitizeFileName(fileName) { + if (!fileName) { + throw new Error("Illegal empty file name"); + } + if (fileName.startsWith(".")) { + throw new Error(`Illegal file name starting with a dot: ${fileName}`); + } + fileName = fileName.replaceAll(forbiddenCharsRegex, "-"); + + if (fileName.length > 255) { + throw new Error(`Illegal file name exceeding maximum length of 255 characters: ${fileName}`); + } + + if (windowsReservedNames.test(fileName)) { + throw new Error(`Illegal file name reserved on Windows systems: ${fileName}`); + } + + return fileName; +} + +export function getPathFromPackageName(pkgName) { + // If pkgName starts with a scope, that becomes a folder + if (pkgName.startsWith("@") && pkgName.includes("/")) { + // Split at first slash to get the scope and sanitize it without the "@" + const scope = sanitizeFileName(pkgName.substring(1, pkgName.indexOf("/"))); + // Get the rest of the package name + const pkg = pkgName.substring(pkgName.indexOf("/") + 1); + return path.join(`@${sanitizeFileName(scope)}`, sanitizeFileName(pkg)); + } + return sanitizeFileName(pkgName); +} From 070a31362ec6d42fd036a423bcd8496254ae831a Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 10 Dec 2025 15:24:00 +0100 Subject: [PATCH 015/110] refactor(builder): Rename task param 'buildCache' to 'cacheUtil' --- packages/builder/lib/tasks/minify.js | 7 ++++--- packages/builder/lib/tasks/replaceBuildtime.js | 7 ++++--- packages/builder/lib/tasks/replaceCopyright.js | 7 ++++--- packages/builder/lib/tasks/replaceVersion.js | 7 ++++--- 4 files changed, 16 insertions(+), 12 deletions(-) diff --git a/packages/builder/lib/tasks/minify.js b/packages/builder/lib/tasks/minify.js index f79c3391cd6..f4aa89d2fe0 100644 --- a/packages/builder/lib/tasks/minify.js +++ b/packages/builder/lib/tasks/minify.js @@ -16,6 +16,7 @@ import fsInterface from "@ui5/fs/fsInterface"; * @param {object} parameters Parameters * @param {@ui5/fs/DuplexCollection} parameters.workspace DuplexCollection to read and write files * @param {@ui5/project/build/helpers/TaskUtil|object} [parameters.taskUtil] TaskUtil + * @param {object} [parameters.cacheUtil] Cache utility instance * @param {object} parameters.options Options * @param {string} parameters.options.pattern Pattern to locate the files to be processed * @param {boolean} [parameters.options.omitSourceMapResources=false] Whether source map resources shall @@ -26,12 +27,12 @@ import fsInterface from "@ui5/fs/fsInterface"; * @returns {Promise} Promise resolving with undefined once data has been written */ export default async function({ - workspace, taskUtil, buildCache, + workspace, taskUtil, cacheUtil, options: {pattern, omitSourceMapResources = false, useInputSourceMaps = true} }) { let resources = await workspace.byGlob(pattern); - if (buildCache.hasCache()) { - const changedPaths = buildCache.getChangedProjectResourcePaths(); + if (cacheUtil.hasCache()) { + const changedPaths = cacheUtil.getChangedProjectResourcePaths(); resources = resources.filter((resource) => changedPaths.has(resource.getPath())); } if (resources.length === 0) { diff --git a/packages/builder/lib/tasks/replaceBuildtime.js b/packages/builder/lib/tasks/replaceBuildtime.js index 2a3ff1caf22..19e3c853569 100644 --- a/packages/builder/lib/tasks/replaceBuildtime.js +++ b/packages/builder/lib/tasks/replaceBuildtime.js @@ -28,15 +28,16 @@ function getTimestamp() { * * @param {object} parameters Parameters * @param {@ui5/fs/DuplexCollection} parameters.workspace DuplexCollection to read and write files + * @param {object} [parameters.cacheUtil] Cache utility instance * @param {object} parameters.options Options * @param {string} parameters.options.pattern Pattern to locate the files to be processed * @returns {Promise} Promise resolving with undefined once data has been written */ -export default async function({workspace, buildCache, options: {pattern}}) { +export default async function({workspace, cacheUtil, options: {pattern}}) { let resources = await workspace.byGlob(pattern); - if (buildCache.hasCache()) { - const changedPaths = buildCache.getChangedProjectResourcePaths(); + if (cacheUtil.hasCache()) { + const changedPaths = cacheUtil.getChangedProjectResourcePaths(); resources = resources.filter((resource) => changedPaths.has(resource.getPath())); } const timestamp = getTimestamp(); diff --git a/packages/builder/lib/tasks/replaceCopyright.js b/packages/builder/lib/tasks/replaceCopyright.js index 09cd302d9f0..927cd30c0f2 100644 --- a/packages/builder/lib/tasks/replaceCopyright.js +++ b/packages/builder/lib/tasks/replaceCopyright.js @@ -24,12 +24,13 @@ import stringReplacer from "../processors/stringReplacer.js"; * * @param {object} parameters Parameters * @param {@ui5/fs/DuplexCollection} parameters.workspace DuplexCollection to read and write files + * @param {object} [parameters.cacheUtil] Cache utility instance * @param {object} parameters.options Options * @param {string} parameters.options.copyright Replacement copyright * @param {string} parameters.options.pattern Pattern to locate the files to be processed * @returns {Promise} Promise resolving with undefined once data has been written */ -export default async function({workspace, buildCache, options: {copyright, pattern}}) { +export default async function({workspace, cacheUtil, options: {copyright, pattern}}) { if (!copyright) { return; } @@ -38,8 +39,8 @@ export default async function({workspace, buildCache, options: {copyright, patte copyright = copyright.replace(/(?:\$\{currentYear\})/, new Date().getFullYear()); let resources = await workspace.byGlob(pattern); - if (buildCache.hasCache()) { - const changedPaths = buildCache.getChangedProjectResourcePaths(); + if (cacheUtil.hasCache()) { + const changedPaths = cacheUtil.getChangedProjectResourcePaths(); resources = resources.filter((resource) => changedPaths.has(resource.getPath())); } diff --git a/packages/builder/lib/tasks/replaceVersion.js b/packages/builder/lib/tasks/replaceVersion.js index 7d1a56ffed1..39192b44d03 100644 --- a/packages/builder/lib/tasks/replaceVersion.js +++ b/packages/builder/lib/tasks/replaceVersion.js @@ -14,16 +14,17 @@ import stringReplacer from "../processors/stringReplacer.js"; * * @param {object} parameters Parameters * @param {@ui5/fs/DuplexCollection} parameters.workspace DuplexCollection to read and write files + * @param {object} parameters.cacheUtil Cache utility instance * @param {object} parameters.options Options * @param {string} parameters.options.pattern Pattern to locate the files to be processed * @param {string} parameters.options.version Replacement version * @returns {Promise} Promise resolving with undefined once data has been written */ -export default async function({workspace, buildCache, options: {pattern, version}}) { +export default async function({workspace, cacheUtil, options: {pattern, version}}) { let resources = await workspace.byGlob(pattern); - if (buildCache.hasCache()) { - const changedPaths = buildCache.getChangedProjectResourcePaths(); + if (cacheUtil.hasCache()) { + const changedPaths = cacheUtil.getChangedProjectResourcePaths(); resources = resources.filter((resource) => changedPaths.has(resource.getPath())); } const processedResources = await stringReplacer({ From 2ff58ea9f5dacb42b4c29f8c583600bf4189a6ea Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 10 Dec 2025 16:00:04 +0100 Subject: [PATCH 016/110] refactor(project): Cleanup --- packages/project/lib/build/TaskRunner.js | 4 - .../project/lib/build/cache/BuildTaskCache.js | 22 +-- .../lib/build/cache/ProjectBuildCache.js | 129 +----------------- .../lib/build/helpers/ProjectBuildContext.js | 37 ----- .../lib/build/helpers/createBuildManifest.js | 13 -- 5 files changed, 8 insertions(+), 197 deletions(-) diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index eb3668a2612..9066bb058a1 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -221,10 +221,6 @@ class TaskRunner { }, options, }; - // const invalidatedResources = this._buildCache.getDepsOfInvalidatedResourcesForTask(taskName); - // if (invalidatedResources) { - // params.invalidatedResources = invalidatedResources; - // } let dependencies; if (requiresDependencies) { diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index 001cf546c4e..6de00fe0079 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -19,8 +19,8 @@ const log = getLogger("build:cache:BuildTaskCache"); * @typedef {object} TaskCacheMetadata * @property {RequestMetadata} [projectRequests] - Project resource requests * @property {RequestMetadata} [dependencyRequests] - Dependency resource requests - * @property {Object.} [resourcesRead] - Resources read by task - * @property {Object.} [resourcesWritten] - Resources written by task + * @property {Object} [resourcesRead] - Resources read by task + * @property {Object} [resourcesWritten] - Resources written by task */ function unionArray(arr, items) { @@ -38,24 +38,6 @@ function unionObject(target, obj) { } } -// async function createMetadataForResources(resourceMap) { -// const metadata = Object.create(null); -// await Promise.all(Object.keys(resourceMap).map(async (resourcePath) => { -// const resource = resourceMap[resourcePath]; -// if (resource.hash) { -// // Metadata object -// metadata[resourcePath] = resource; -// return; -// } -// // Resource instance -// metadata[resourcePath] = { -// integrity: await resource.getIntegrity(), -// lastModified: resource.getLastModified(), -// }; -// })); -// return metadata; -// } - /** * Manages the build cache for a single task * diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 1a3df9f9cd2..df5ca440e23 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -12,7 +12,6 @@ export default class ProjectBuildCache { #project; #buildSignature; #cacheManager; - // #cacheDir; #invalidatedTasks = new Map(); #updatedResources = new Set(); @@ -30,10 +29,6 @@ export default class ProjectBuildCache { this.#project = project; this.#buildSignature = buildSignature; this.#cacheManager = cacheManager; - // this.#cacheRoot = cacheDir && createAdapter({ - // fsBasePath: cacheDir, - // virBasePath: "/" - // }); } static async create(project, buildSignature, cacheManager) { @@ -347,52 +342,7 @@ export default class ProjectBuildCache { return Array.from(this.#invalidatedTasks.keys()); } - // async createBuildManifest() { - // // const globalResourceIndex = Object.create(null); - // // function addResourcesToIndex(taskName, resourceMap) { - // // for (const resourcePath of Object.keys(resourceMap)) { - // // const resource = resourceMap[resourcePath]; - // // const resourceKey = `${resourcePath}:${resource.hash}`; - // // if (!globalResourceIndex[resourceKey]) { - // // globalResourceIndex[resourceKey] = { - // // hash: resource.hash, - // // lastModified: resource.lastModified, - // // tasks: [taskName] - // // }; - // // } else if (!globalResourceIndex[resourceKey].tasks.includes(taskName)) { - // // globalResourceIndex[resourceKey].tasks.push(taskName); - // // } - // // } - // // } - // const taskCache = []; - // for (const cache of this.#taskCache.values()) { - // const cacheObject = await cache.toJSON(); - // taskCache.push(cacheObject); - // // addResourcesToIndex(taskName, cacheObject.resources.project.resourcesRead); - // // addResourcesToIndex(taskName, cacheObject.resources.project.resourcesWritten); - // // addResourcesToIndex(taskName, cacheObject.resources.dependencies.resourcesRead); - // } - // // Collect metadata for all relevant source files - // const sourceReader = this.#project.getSourceReader(); - // // const resourceMetadata = await Promise.all(Array.from(relevantSourceFiles).map(async (resourcePath) => { - // const resources = await sourceReader.byGlob("/**/*"); - // const sourceMetadata = Object.create(null); - // await Promise.all(resources.map(async (resource) => { - // sourceMetadata[resource.getOriginalPath()] = { - // lastModified: resource.getStatInfo()?.mtimeMs, - // hash: await resource.getHash(), - // }; - // })); - - // return { - // timestamp: Date.now(), - // cacheKey: this.#cacheKey, - // taskCache, - // sourceMetadata, - // // globalResourceIndex, - // }; - // } - + // ===== SERIALIZATION ===== async #createCacheManifest() { const cache = Object.create(null); cache.index = await this.#createIndex(this.#project.getSourceReader(), true); @@ -419,45 +369,8 @@ export default class ProjectBuildCache { await this.#cacheManager.writeBuildManifest( this.#project, this.#buildSignature, buildManifest); - - // const serializedCache = await this.toJSON(); - // const cacheContent = JSON.stringify(serializedCache, null, 2); - // const res = createResource({ - // path: `/cache-info.json`, - // string: cacheContent, - // }); - // await this.#cacheRoot.write(res); } - // async #serializeTaskOutputs() { - // log.info(`Serializing task outputs for project ${this.#project.getName()}`); - // const stageCache = await Promise.all(Array.from(this.#taskCache.keys()).map(async (taskName, idx) => { - // const reader = this.#project.getDeltaReader(taskName); - // if (!reader) { - // log.verbose( - // `Skipping serialization of empty writer for task ${taskName} in project ${this.#project.getName()}` - // ); - // return; - // } - // const resources = await reader.byGlob("/**/*"); - - // const target = createAdapter({ - // fsBasePath: path.join(this.#cacheDir, "taskCache", `${idx}-${taskName}`), - // virBasePath: "/" - // }); - - // for (const res of resources) { - // await target.write(res); - // } - // return { - // reader: target, - // stage: taskName - // }; - // })); - // // Re-import cache as base layer to reduce memory pressure - // this.#project.importCachedStages(stageCache.filter((entry) => entry)); - // } - async #getStageNameForTask(taskName) { return `tasks/${taskName}`; } @@ -481,6 +394,7 @@ export default class ProjectBuildCache { this.#buildSignature, stageName, res.getOriginalPath(), await res.getStreamAsync() ); + // TODO: Decide whether to use stream or buffer // const integrity = await this.#cacheManager.writeStage( // this.#buildSignature, stageName, // res.getOriginalPath(), await res.getBuffer() @@ -510,7 +424,7 @@ export default class ProjectBuildCache { } // Check against index const resourcePath = resource.getOriginalPath(); - if (!index.hasOwnProperty(resourcePath)) { + if (Object.hasOwn(index, resourcePath)) { // New resource encountered log.verbose(`New source file: ${resourcePath}`); changedResources.add(resourcePath); @@ -518,19 +432,19 @@ export default class ProjectBuildCache { } const {lastModified, size, inode, integrity} = index[resourcePath]; - if (resourceMetadata.lastModified !== currentLastModified) { + if (lastModified !== currentLastModified) { log.verbose(`Source file modified: ${resourcePath} (timestamp change)`); changedResources.add(resourcePath); continue; } - if (resourceMetadata.inode !== resource.getInode()) { + if (inode !== resource.getInode()) { log.verbose(`Source file modified: ${resourcePath} (inode change)`); changedResources.add(resourcePath); continue; } - if (resourceMetadata.size !== await resource.getSize()) { + if (size !== await resource.getSize()) { log.verbose(`Source file modified: ${resourcePath} (size change)`); changedResources.add(resourcePath); continue; @@ -601,23 +515,6 @@ export default class ProjectBuildCache { } async #importCachedStages(stages) { - // const cachedStages = await Promise.all(Array.from(this.#taskCache.keys()).map(async (taskName, idx) => { - // // const fsBasePath = path.join(this.#cacheDir, "taskCache", `${idx}-${taskName}`); - // // let cacheReader; - // // if (await exists(fsBasePath)) { - // // cacheReader = createAdapter({ - // // name: `Cache reader for task ${taskName} in project ${this.#project.getName()}`, - // // fsBasePath, - // // virBasePath: "/", - // // project: this.#project, - // // }); - // // } - - // return { - // stage: taskName, - // reader: cacheReader - // }; - // })); const cachedStages = await Promise.all(Object.entries(stages).map(async ([stageName, resourceMetadata]) => { const reader = await this.#createReaderForStageCache(stageName, resourceMetadata); return { @@ -688,17 +585,3 @@ export default class ProjectBuildCache { } } } - -// async function exists(filePath) { -// try { -// await stat(filePath); -// return true; -// } catch (err) { -// // "File or directory does not exist" -// if (err.code === "ENOENT") { -// return false; -// } else { -// throw err; -// } -// } -// } diff --git a/packages/project/lib/build/helpers/ProjectBuildContext.js b/packages/project/lib/build/helpers/ProjectBuildContext.js index 375c95d59b2..547f85076e5 100644 --- a/packages/project/lib/build/helpers/ProjectBuildContext.js +++ b/packages/project/lib/build/helpers/ProjectBuildContext.js @@ -45,10 +45,6 @@ class ProjectBuildContext { allowedTags: ["ui5:OmitFromBuildResult", "ui5:IsBundle"], allowedNamespaces: ["build"] }); - // const buildManifest = this.#getBuildManifest(); - // if (buildManifest) { - // this._buildCache.deserialize(buildManifest.buildManifest.cache); - // } } static async create(buildContext, project) { @@ -162,10 +158,6 @@ class ProjectBuildContext { return false; } - // if (!this._buildCache.hasAnyCache()) { - // await this._buildCache.attemptDeserializationFromDisk(); - // } - return this._buildCache.needsRebuild(); } @@ -228,35 +220,6 @@ class ProjectBuildContext { getBuildSignature() { return this._buildSignature; } - - // async watchFileChanges() { - // // const paths = this._project.getSourcePaths(); - // // this._log.verbose(`Watching source paths: ${paths.join(", ")}`); - // // const {default: chokidar} = await import("chokidar"); - // // const watcher = chokidar.watch(paths, { - // // ignoreInitial: true, - // // persistent: false, - // // }); - // // watcher.on("add", async (filePath) => { - // // }); - // // watcher.on("change", async (filePath) => { - // // const resourcePath = this._project.getVirtualPath(filePath); - // // this._log.info(`File changed: ${resourcePath} (${filePath})`); - // // // Inform cache - // // this._buildCache.fileChanged(resourcePath); - // // // Inform dependents - // // for (const dependent of this._buildContext.getGraph().getTransitiveDependents(this._project.getName())) { - // // await this._buildContext.getProjectBuildContext(dependent).dependencyFileChanged(resourcePath); - // // } - // // // Inform build context - // // await this._buildContext.fileChanged(this._project.getName(), resourcePath); - // // }); - // } - - // dependencyFileChanged(resourcePath) { - // this._log.info(`Dependency file changed: ${resourcePath}`); - // this._buildCache.fileChanged(resourcePath); - // } } export default ProjectBuildContext; diff --git a/packages/project/lib/build/helpers/createBuildManifest.js b/packages/project/lib/build/helpers/createBuildManifest.js index 1a80bae840c..ba679479690 100644 --- a/packages/project/lib/build/helpers/createBuildManifest.js +++ b/packages/project/lib/build/helpers/createBuildManifest.js @@ -48,19 +48,6 @@ export default async function(project, graph, buildConfig, taskRepository, build `Unable to create archive metadata for project ${project.getName()}: ` + `Project type ${type} is currently not supported`); } - // let buildManifest; - // if (project.isFrameworkProject()) { - // buildManifest = await createFrameworkManifest(project, buildConfig, taskRepository); - // } else { - // buildManifest = { - // manifestVersion: "0.3", - // timestamp: new Date().toISOString(), - // dependencies: collectDepInfo(graph, project), - // version: project.getVersion(), - // namespace: project.getNamespace(), - // tags: getSortedTags(project), - // }; - // } const metadata = { project: { From f90dabff394f4122d2aa5345ac54a4bd127c5a00 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Fri, 12 Dec 2025 14:44:22 +0100 Subject: [PATCH 017/110] refactor(project): Move resource comparison to util --- .../project/lib/build/cache/BuildTaskCache.js | 73 +++---------------- packages/project/lib/build/cache/utils.js | 66 +++++++++++++++++ 2 files changed, 77 insertions(+), 62 deletions(-) diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index 6de00fe0079..cad46294a65 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -1,6 +1,6 @@ import micromatch from "micromatch"; import {getLogger} from "@ui5/logger"; -import {createResourceIndex} from "./utils.js"; +import {createResourceIndex, areResourcesEqual} from "./utils.js"; const log = getLogger("build:cache:BuildTaskCache"); /** @@ -9,12 +9,6 @@ const log = getLogger("build:cache:BuildTaskCache"); * @property {string[]} patterns - Glob patterns used to read resources */ -/** - * @typedef {object} ResourceMetadata - * @property {string} hash - Content hash of the resource - * @property {number} lastModified - Last modified timestamp (mtimeMs) - */ - /** * @typedef {object} TaskCacheMetadata * @property {RequestMetadata} [projectRequests] - Project resource requests @@ -199,11 +193,11 @@ export default class BuildTaskCache { if (!cachedResource) { return false; } - if (cachedResource.hash) { - return this.#isResourceFingerprintEqual(resource, cachedResource); - } else { - return this.#isResourceEqual(resource, cachedResource); - } + // if (cachedResource.integrity) { + // return await matchIntegrity(resource, cachedResource); + // } else { + return await areResourcesEqual(resource, cachedResource); + // } } /** @@ -217,56 +211,11 @@ export default class BuildTaskCache { if (!cachedResource) { return false; } - if (cachedResource.hash) { - return this.#isResourceFingerprintEqual(resource, cachedResource); - } else { - return this.#isResourceEqual(resource, cachedResource); - } - } - - /** - * Compares two resource instances for equality - * - * @param {object} resourceA - First resource to compare - * @param {object} resourceB - Second resource to compare - * @returns {Promise} True if resources are equal - * @throws {Error} If either resource is undefined - */ - async #isResourceEqual(resourceA, resourceB) { - if (!resourceA || !resourceB) { - throw new Error("Cannot compare undefined resources"); - } - if (resourceA === resourceB) { - return true; - } - if (resourceA.getStatInfo()?.mtimeMs !== resourceB.getStatInfo()?.mtimeMs) { - return false; - } - if (await resourceA.getString() === await resourceB.getString()) { - return true; - } - return false; - } - - /** - * Compares a resource instance with cached metadata fingerprint - * - * @param {object} resourceA - Resource instance to compare - * @param {ResourceMetadata} resourceBMetadata - Cached metadata to compare against - * @returns {Promise} True if resource matches the fingerprint - * @throws {Error} If resource or metadata is undefined - */ - async #isResourceFingerprintEqual(resourceA, resourceBMetadata) { - if (!resourceA || !resourceBMetadata) { - throw new Error("Cannot compare undefined resources"); - } - if (resourceA.getStatInfo()?.mtimeMs !== resourceBMetadata.lastModified) { - return false; - } - if (await resourceA.getHash() === resourceBMetadata.hash) { - return true; - } - return false; + // if (cachedResource.integrity) { + // return await matchIntegrity(resource, cachedResource); + // } else { + return await areResourcesEqual(resource, cachedResource); + // } } #isRelevantResourceChange({pathsRead, patterns}, changedResourcePaths) { diff --git a/packages/project/lib/build/cache/utils.js b/packages/project/lib/build/cache/utils.js index 387d69aeada..cd45c9f3444 100644 --- a/packages/project/lib/build/cache/utils.js +++ b/packages/project/lib/build/cache/utils.js @@ -1,3 +1,69 @@ +/** + * @typedef {object} ResourceMetadata + * @property {string} integrity Content integrity of the resource + * @property {number} lastModified Last modified timestamp (mtimeMs) + * @property {number} inode Inode number of the resource + * @property {number} size Size of the resource in bytes + */ + +/** + * Compares two resource instances for equality + * + * @param {object} resourceA - First resource to compare + * @param {object} resourceB - Second resource to compare + * @returns {Promise} True if resources are equal + * @throws {Error} If either resource is undefined + */ +export async function areResourcesEqual(resourceA, resourceB) { + if (!resourceA || !resourceB) { + throw new Error("Cannot compare undefined resources"); + } + if (resourceA === resourceB) { + return true; + } + if (resourceA.getOriginalPath() !== resourceB.getOriginalPath()) { + throw new Error("Cannot compare resources with different original paths"); + } + if (resourceA.getLastModified() !== resourceB.getLastModified()) { + return false; + } + if (await resourceA.getSize() !== resourceB.getSize()) { + return false; + } + // if (await resourceA.getString() === await resourceB.getString()) { + // return true; + // } + return false; +} + +// /** +// * Compares a resource instance with cached metadata fingerprint +// * +// * @param {object} resourceA - Resource instance to compare +// * @param {ResourceMetadata} resourceBMetadata - Cached metadata to compare against +// * @param {number} indexTimestamp - Timestamp of the index creation +// * @returns {Promise} True if resource matches the fingerprint +// * @throws {Error} If resource or metadata is undefined +// */ +// export async function matchResourceMetadata(resourceA, resourceBMetadata, indexTimestamp) { +// if (!resourceA || !resourceBMetadata) { +// throw new Error("Cannot compare undefined resources"); +// } +// if (resourceA.getLastModified() !== resourceBMetadata.lastModified) { +// return false; +// } +// if (await resourceA.getSize() !== resourceBMetadata.size) { +// return false; +// } +// if (resourceBMetadata.inode && resourceA.getInode() !== resourceBMetadata.inode) { +// return false; +// } +// if (await resourceA.getIntegrity() === resourceBMetadata.integrity) { +// return true; +// } +// return false; +// } + export async function createResourceIndex(resources, includeInode = false) { const index = Object.create(null); await Promise.all(resources.map(async (resource) => { From fdc58e49910140c3a3779be28e0f982c4df8bf2d Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 16 Dec 2025 11:29:05 +0100 Subject: [PATCH 018/110] refactor(project): Refactor stage handling --- packages/project/lib/build/TaskRunner.js | 1 + .../lib/build/cache/ProjectBuildCache.js | 195 ++++---- .../lib/specifications/ComponentProject.js | 2 +- .../project/lib/specifications/Project.js | 429 +++++++++++------- .../lib/specifications/types/Module.js | 11 +- .../lib/specifications/types/ThemeLibrary.js | 13 +- 6 files changed, 388 insertions(+), 263 deletions(-) diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index 9066bb058a1..a88f1f69409 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -122,6 +122,7 @@ class TaskRunner { }); this._log.setTasks(allTasks); + this._buildCache.setTasks(allTasks); for (const taskName of allTasks) { const taskFunction = this._tasks[taskName].task; diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index df5ca440e23..779604def3f 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -65,74 +65,77 @@ export default class ProjectBuildCache { } const resourcesWritten = projectTrackingResults.resourcesWritten; - if (this.#taskCache.has(taskName)) { - log.verbose(`Updating build cache with results of task ${taskName} in project ${this.#project.getName()}`); - const taskCache = this.#taskCache.get(taskName); + if (!this.#taskCache.has(taskName)) { + throw new Error(`Cannot record results for unknown task ${taskName} ` + + `in project ${this.#project.getName()}`); + } + log.verbose(`Updating build cache with results of task ${taskName} in project ${this.#project.getName()}`); + const taskCache = this.#taskCache.get(taskName); + + const writtenResourcePaths = Object.keys(resourcesWritten); + if (writtenResourcePaths.length) { + log.verbose(`Task ${taskName} produced ${writtenResourcePaths.length} resources`); + + const changedPaths = new Set((await Promise.all(writtenResourcePaths + .map(async (resourcePath) => { + // Check whether resource content actually changed + if (await taskCache.hasResourceInWriteCache(resourcesWritten[resourcePath])) { + return undefined; + } + return resourcePath; + }))).filter((resourcePath) => resourcePath !== undefined)); - const writtenResourcePaths = Object.keys(resourcesWritten); - if (writtenResourcePaths.length) { - log.verbose(`Task ${taskName} produced ${writtenResourcePaths.length} resources`); - - const changedPaths = new Set((await Promise.all(writtenResourcePaths - .map(async (resourcePath) => { - // Check whether resource content actually changed - if (await taskCache.hasResourceInWriteCache(resourcesWritten[resourcePath])) { - return undefined; - } - return resourcePath; - }))).filter((resourcePath) => resourcePath !== undefined)); - - if (!changedPaths.size) { - log.verbose( - `Resources produced by task ${taskName} match with cache from previous executions. ` + - `This task will not invalidate any other tasks`); - return; - } + if (!changedPaths.size) { log.verbose( - `Task ${taskName} produced ${changedPaths.size} resources that might invalidate other tasks`); - for (const resourcePath of changedPaths) { - this.#updatedResources.add(resourcePath); + `Resources produced by task ${taskName} match with cache from previous executions. ` + + `This task will not invalidate any other tasks`); + return; + } + log.verbose( + `Task ${taskName} produced ${changedPaths.size} resources that might invalidate other tasks`); + for (const resourcePath of changedPaths) { + this.#updatedResources.add(resourcePath); + } + // Check whether other tasks need to be invalidated + const allTasks = Array.from(this.#taskCache.keys()); + const taskIdx = allTasks.indexOf(taskName); + const emptySet = new Set(); + for (let i = taskIdx + 1; i < allTasks.length; i++) { + const nextTaskName = allTasks[i]; + if (!this.#taskCache.get(nextTaskName).matchesChangedResources(changedPaths, emptySet)) { + continue; } - // Check whether other tasks need to be invalidated - const allTasks = Array.from(this.#taskCache.keys()); - const taskIdx = allTasks.indexOf(taskName); - const emptySet = new Set(); - for (let i = taskIdx + 1; i < allTasks.length; i++) { - const nextTaskName = allTasks[i]; - if (!this.#taskCache.get(nextTaskName).matchesChangedResources(changedPaths, emptySet)) { - continue; - } - if (this.#invalidatedTasks.has(taskName)) { - const {changedDependencyResourcePaths} = - this.#invalidatedTasks.get(taskName); - for (const resourcePath of changedPaths) { - changedDependencyResourcePaths.add(resourcePath); - } - } else { - this.#invalidatedTasks.set(taskName, { - changedProjectResourcePaths: changedPaths, - changedDependencyResourcePaths: emptySet - }); + if (this.#invalidatedTasks.has(taskName)) { + const {changedDependencyResourcePaths} = + this.#invalidatedTasks.get(taskName); + for (const resourcePath of changedPaths) { + changedDependencyResourcePaths.add(resourcePath); } + } else { + this.#invalidatedTasks.set(taskName, { + changedProjectResourcePaths: changedPaths, + changedDependencyResourcePaths: emptySet + }); } } - taskCache.updateMetadata( - projectTrackingResults.requests, - dependencyTrackingResults?.requests, - resourcesRead, - resourcesWritten - ); - } else { - log.verbose(`Initializing build cache for task ${taskName} in project ${this.#project.getName()}`); - this.#taskCache.set(taskName, - new BuildTaskCache(this.#project.getName(), taskName, { - projectRequests: projectTrackingResults.requests, - dependencyRequests: dependencyTrackingResults?.requests, - resourcesRead, - resourcesWritten - }) - ); } + taskCache.updateMetadata( + projectTrackingResults.requests, + dependencyTrackingResults?.requests, + resourcesRead, + resourcesWritten + ); + // } else { + // log.verbose(`Initializing build cache for task ${taskName} in project ${this.#project.getName()}`); + // this.#taskCache.set(taskName, + // new BuildTaskCache(this.#project.getName(), taskName, { + // projectRequests: projectTrackingResults.requests, + // dependencyRequests: dependencyTrackingResults?.requests, + // resourcesRead, + // resourcesWritten + // }) + // ); + // } if (this.#invalidatedTasks.has(taskName)) { this.#invalidatedTasks.delete(taskName); @@ -300,6 +303,24 @@ export default class ProjectBuildCache { return !this.hasAnyCache() || this.#invalidatedTasks.size > 0; } + async setTasks(taskNames) { + // Ensure task cache entries exist for all tasks + for (const taskName of taskNames) { + if (!this.#taskCache.has(taskName)) { + this.#taskCache.set(taskName, + new BuildTaskCache(this.#project.getName(), taskName, { + projectRequests: [], + dependencyRequests: [], + resourcesRead: {}, + resourcesWritten: {} + }) + ); + } + } + const stageNames = taskNames.map((taskName) => this.#getStageNameForTask(taskName)); + this.#project.ensureStages(stageNames); + } + async prepareTaskExecution(taskName, dependencyReader) { // Check cache exists and ensure it's still valid before using it if (this.hasTaskCache(taskName)) { @@ -372,41 +393,43 @@ export default class ProjectBuildCache { } async #getStageNameForTask(taskName) { - return `tasks/${taskName}`; + return `task/${taskName}`; } async #saveCachedStages() { log.info(`Storing task outputs for project ${this.#project.getName()} in cache...`); - const stageCache = await Promise.all(Array.from(this.#taskCache.keys()).map(async (taskName, idx) => { - const stageName = this.#getStageNameForTask(taskName); - const reader = this.#project.getDeltaReader(stageName); - if (!reader) { - log.verbose( - `Skipping serialization of empty writer for task ${taskName} in project ${this.#project.getName()}` - ); - return; - } + + const stageMetadata = Object.create(null); + await Promise.all(this.#project.getStagesForCache().map(async ({stageId, reader}) => { + // if (!reader) { + // log.verbose( + // `Skipping serialization of empty writer for task ${taskName} in project ${this.#project.getName()}` + // ); + // return; + // } const resources = await reader.byGlob("/**/*"); + const metadata = stageMetadata[stageId]; - for (const res of resources) { + await Promise.all(resources.map(async (res) => { // Store resource content in cacache via CacheManager const integrity = await this.#cacheManager.writeStageStream( - this.#buildSignature, stageName, + this.#buildSignature, stageId, res.getOriginalPath(), await res.getStreamAsync() ); // TODO: Decide whether to use stream or buffer // const integrity = await this.#cacheManager.writeStage( - // this.#buildSignature, stageName, + // this.#buildSignature, stageId, // res.getOriginalPath(), await res.getBuffer() // ); - } - return { - reader: target, - stage: taskName - }; + + metadata[res.getOriginalPath()] = { + size: await res.getSize(), + lastModified: res.getLastModified(), + integrity, + }; + })); })); - // Re-import cache as base layer to reduce memory pressure - this.#project.importCachedStages(stageCache.filter((entry) => entry)); + // Optional TODO: Re-import cache as base layer to reduce memory pressure? } async #checkForIndexChanges(index, indexTimestamp) { @@ -515,14 +538,10 @@ export default class ProjectBuildCache { } async #importCachedStages(stages) { - const cachedStages = await Promise.all(Object.entries(stages).map(async ([stageName, resourceMetadata]) => { - const reader = await this.#createReaderForStageCache(stageName, resourceMetadata); - return { - stageName, - reader - }; + const readers = await Promise.all(Object.entries(stages).map(async ([stageName, resourceMetadata]) => { + return await this.#createReaderForStageCache(stageName, resourceMetadata); })); - this.#project.importCachedStages(cachedStages); + this.#project.setStages(Object.keys(stages), readers); } async saveToDisk(buildManifest) { diff --git a/packages/project/lib/specifications/ComponentProject.js b/packages/project/lib/specifications/ComponentProject.js index 34e1fd852ba..d3d5d7142f7 100644 --- a/packages/project/lib/specifications/ComponentProject.js +++ b/packages/project/lib/specifications/ComponentProject.js @@ -210,7 +210,7 @@ class ComponentProject extends Project { return reader; } - _addWriterToReaders(style, readers, writer) { + _addWriter(style, readers, writer) { let {namespaceWriter, generalWriter} = writer; if (!namespaceWriter || !generalWriter) { // TODO: Too hacky diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index 65313c81da1..9031503583f 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -13,15 +13,13 @@ import {createWorkspace, createReaderCollectionPrioritized} from "@ui5/fs/resour * @hideconstructor */ class Project extends Specification { - #currentWriter; - #currentWorkspace; - #currentReader = new Map(); - #currentStage; - #currentVersion = 0; // Writer version (0 is reserved for a possible imported writer cache) + #stages = []; // Stages in order of creation - #stages = [""]; // Stages in order of creation - #writers = new Map(); // Maps stage to a set of writer versions (possibly sparse array) - #workspaceSealed = true; // Project starts as being sealed. Needs to be unsealed using newVersion() + #currentStageWorkspace; + #currentStageReaders = new Map(); // Initialize an empty map to store the various reader styles + #currentStage; + #currentStageReadIndex = -1; + #currentStageName = ""; constructor(parameters) { super(parameters); @@ -273,20 +271,43 @@ class Project extends Specification { * @returns {@ui5/fs/ReaderCollection} A reader collection instance */ getReader({style = "buildtime"} = {}) { - let reader = this.#currentReader.get(style); + let reader = this.#currentStageReaders.get(style); if (reader) { // Use cached reader return reader; } // const readers = []; - // this._addWriterToReaders(style, readers, this.getWriter()); + // this._addWriter(style, readers, this.getWriter()); // readers.push(this._getStyledReader(style)); // reader = createReaderCollectionPrioritized({ // name: `Reader collection for project ${this.getName()}`, // readers // }); - reader = this.#getReader(this.#currentStage, this.#currentVersion, style); - this.#currentReader.set(style, reader); + // reader = this.#getReader(this.#currentStage, style); + + const readers = []; + + // Add writers for previous stages as readers + const stageReadIdx = this.#currentStageReadIndex; + + // Collect writers from all relevant stages + for (let i = stageReadIdx; i >= 0; i--) { + const stageReaders = this.#getReaderForStage(this.#stages[i], style); + if (stageReaders) { + readers.push(); + } + } + + + // Always add source reader + readers.push(this._getStyledReader(style)); + + reader = createReaderCollectionPrioritized({ + name: `Reader collection for stage '${this.#currentStageName}' of project ${this.getName()}`, + readers: readers + }); + + this.#currentStageReaders.set(style, reader); return reader; } @@ -298,34 +319,9 @@ class Project extends Specification { return this._getStyledReader(style); } - getStages() { - return {}; - } - - #getWriter() { - if (this.#currentWriter) { - return this.#currentWriter; - } - - const stage = this.#currentStage; - const currentVersion = this.#currentVersion; - - if (!this.#writers.has(stage)) { - this.#writers.set(stage, []); - } - const versions = this.#writers.get(stage); - let writer; - if (versions[currentVersion]) { - writer = versions[currentVersion]; - } else { - // Create new writer - writer = this._createWriter(); - versions[currentVersion] = writer; - } - - this.#currentWriter = writer; - return writer; - } + // #getWriter() { + // return this.#currentStage.getWriter(); + // } // #createNewWriterStage(stageId) { // const writer = this._createWriter(); @@ -350,16 +346,17 @@ class Project extends Specification { * @returns {@ui5/fs/DuplexCollection} DuplexCollection */ getWorkspace() { - if (this.#workspaceSealed) { + if (!this.#currentStage) { throw new Error( - `Workspace of project ${this.getName()} has been sealed. This indicates that the project already ` + - `finished building and its content must not be modified further. ` + + `Workspace of project ${this.getName()} is currently not available. ` + + `This might indicate that the project has already finished building ` + + `and its content can not be modified further. ` + `Use method 'getReader' for read-only access`); } - if (this.#currentWorkspace) { - return this.#currentWorkspace; + if (this.#currentStageWorkspace) { + return this.#currentStageWorkspace; } - const writer = this.#getWriter(); + const writer = this.#currentStage.getWriter(); // if (this.#stageCacheReaders.has(this.getCurrentStage())) { // reader = createReaderCollectionPrioritized({ @@ -370,11 +367,12 @@ class Project extends Specification { // ] // }); // } - this.#currentWorkspace = createWorkspace({ + const workspace = createWorkspace({ reader: this.getReader(), writer: writer.collection || writer }); - return this.#currentWorkspace; + this.#currentStageWorkspace = workspace; + return workspace; } // getWorkspaceForVersion(version) { @@ -384,129 +382,154 @@ class Project extends Specification { // }); // } - sealWorkspace() { - this.#workspaceSealed = true; - this.useFinalStage(); - } - - newVersion() { - this.#workspaceSealed = false; - this.#currentVersion++; - this.useInitialStage(); - } - revertToLastVersion() { - if (this.#currentVersion === 0) { - throw new Error(`Unable to revert to previous version: No previous version available`); - } - this.#currentVersion--; - this.useInitialStage(); + // newVersion() { + // this.#workspaceSealed = false; + // this.#currentVersion++; + // this.useInitialStage(); + // } - // Remove writer version from all stages - for (const writerVersions of this.#writers.values()) { - if (writerVersions[this.#currentVersion]) { - delete writerVersions[this.#currentVersion]; - } - } - } + // revertToLastVersion() { + // if (this.#currentVersion === 0) { + // throw new Error(`Unable to revert to previous version: No previous version available`); + // } + // this.#currentVersion--; + // this.useInitialStage(); - #getReader(stage, version, style = "buildtime") { - const readers = []; + // // Remove writer version from all stages + // for (const writerVersions of this.#writers.values()) { + // if (writerVersions[this.#currentVersion]) { + // delete writerVersions[this.#currentVersion]; + // } + // } + // } - // Add writers for previous stages as readers - const stageIdx = this.#stages.indexOf(stage); - if (stageIdx > 0) { // Stage 0 has no previous stage - // Collect writers from all preceding stages - for (let i = stageIdx - 1; i >= 0; i--) { - const stageWriters = this.#getWriters(this.#stages[i], version, style); - if (stageWriters) { - readers.push(stageWriters); - } - } - } + // #getReader(style = "buildtime") { + // const readers = []; + + // // Add writers for previous stages as readers + // const stageIdx = this.#stages.findIndex((s) => s.getName() === stageId); + // if (stageIdx > 0) { // Stage 0 has no previous stage + // // Collect writers from all preceding stages + // for (let i = stageIdx - 1; i >= 0; i--) { + // const stageWriters = this.#getWriters(this.#stages[i], version, style); + // if (stageWriters) { + // readers.push(stageWriters); + // } + // } + // } - // Always add source reader - readers.push(this._getStyledReader(style)); + // // Always add source reader + // readers.push(this._getStyledReader(style)); - return createReaderCollectionPrioritized({ - name: `Reader collection for stage '${stage}' of project ${this.getName()}`, - readers: readers - }); - } + // return createReaderCollectionPrioritized({ + // name: `Reader collection for stage '${stage}' of project ${this.getName()}`, + // readers: readers + // }); + // } - useStage(stageId, newWriter = false) { + useStage(stageId) { // if (newWriter && this.#writers.has(stageId)) { // this.#writers.delete(stageId); // } - if (stageId === this.#currentStage) { + if (stageId === this.#currentStage.getId()) { + // Already using requested stage return; } - if (!this.#stages.includes(stageId)) { - // Add new stage - this.#stages.push(stageId); + + const stageIdx = this.#stages.findIndex((s) => s.getId() === stageId); + + if (stageIdx === -1) { + throw new Error(`Stage '${stageId}' does not exist in project ${this.getName()}`); } - this.#currentStage = stageId; + const stage = this.#stages[stageIdx]; + stage.newVersion(this._createWriter()); + this.#currentStage = stage; + this.#currentStageName = stageId; + this.#currentStageReadIndex = stageIdx - 1; // Read from all previous stages - // Unset "current" reader/writer - this.#currentReader = new Map(); - this.#currentWriter = null; - this.#currentWorkspace = null; + // Unset "current" reader/writer. They will be recreated on demand + this.#currentStageReaders = new Map(); + this.#currentStageWorkspace = null; } - useInitialStage() { - this.useStage(""); - } + /** + * Seal the workspace of the project, preventing further modifications. + * This is typically called once the project has finished building. Resources from all stages will be used. + * + * A project can be unsealed by calling useStage() again. + * + */ + sealWorkspace() { + this.#currentStage = null; // Unset stage - This blocks further getWorkspace() calls + this.#currentStageName = ""; + this.#currentStageReadIndex = this.#stages.length - 1; // Read from all stages - useFinalStage() { - this.useStage(""); + // Unset "current" reader/writer. They will be recreated on demand + this.#currentStageReaders = new Map(); + this.#currentStageWorkspace = null; } - #getWriters(stage, version, style = "buildtime") { + #getReaderForStage(stage, style = "buildtime", includeCache = true) { + const writers = stage.getAllWriters(includeCache); const readers = []; - const stageWriters = this.#writers.get(stage); - if (!stageWriters?.length) { - return null; - } - for (let i = version; i >= 0; i--) { - if (!stageWriters[i]) { - // Writers is a sparse array, some stages might skip a version - continue; - } - this._addWriterToReaders(style, readers, stageWriters[i]); + for (const writer of writers) { + // Apply project specific handling for using writers as readers, depending on the requested style + this._addWriter("buildtime", readers, writer); } return createReaderCollectionPrioritized({ - name: `Collection of all writers for stage '${stage}', version ${version} of project ${this.getName()}`, + name: `Reader collection for stage '${stage.getId()}' of project ${this.getName()}`, readers }); } - getDeltaReader(stage) { - const readers = []; - const stageWriters = this.#writers.get(stage); - if (!stageWriters?.length) { - return null; - } - const version = this.#currentVersion; - for (let i = version; i >= 1; i--) { // Skip version 0 (possibly containing cached writers) - if (!stageWriters[i]) { - // Writers is a sparse array, some stages might skip a version - continue; - } - this._addWriterToReaders("buildtime", readers, stageWriters[i]); - } + // #getWriters(stage, version, style = "buildtime") { + // const readers = []; + // const stageWriters = this.#writers.get(stage); + // if (!stageWriters?.length) { + // return null; + // } + // for (let i = version; i >= 0; i--) { + // if (!stageWriters[i]) { + // // Writers is a sparse array, some stages might skip a version + // continue; + // } + // this._addWriter(style, readers, stageWriters[i]); + // } - const reader = createReaderCollectionPrioritized({ - name: `Collection of new writers for stage '${stage}', version ${version} of project ${this.getName()}`, - readers - }); + // return createReaderCollectionPrioritized({ + // name: `Collection of all writers for stage '${stage}', version ${version} of project ${this.getName()}`, + // readers + // }); + // } + // getDeltaReader(stage) { + // const readers = []; + // const stageWriters = this.#writers.get(stage); + // if (!stageWriters?.length) { + // return null; + // } + // const version = this.#currentVersion; + // for (let i = version; i >= 1; i--) { // Skip version 0 (possibly containing cached writers) + // if (!stageWriters[i]) { + // // Writers is a sparse array, some stages might skip a version + // continue; + // } + // this._addWriter("buildtime", readers, stageWriters[i]); + // } - // Condense writer versions (TODO: this step is optional but might improve memory consumption) - // this.#condenseVersions(reader); - return reader; - } + // const reader = createReaderCollectionPrioritized({ + // name: `Collection of new writers for stage '${stage}', version ${version} of project ${this.getName()}`, + // readers + // }); + + + // // Condense writer versions (TODO: this step is optional but might improve memory consumption) + // // this.#condenseVersions(reader); + // return reader; + // } // #condenseVersions(reader) { // for (const stage of this.#stages) { @@ -531,30 +554,92 @@ class Project extends Specification { // } // } - importCachedStages(stages) { - if (!this.#workspaceSealed) { - throw new Error(`Unable to import cached stages: Workspace is not sealed`); - } - for (const {stageName, reader} of stages) { - if (!this.#stages.includes(stageName)) { - this.#stages.push(stageName); + getStagesForCache() { + return this.#stages.map((stage) => { + const reader = this.#getReaderForStage(stage, "buildtime", false); + return { + stageId: stage.getId(), + reader + }; + }); + } + + setStages(stageIds, cacheReaders) { + if (this.#stages.length > 0) { + // Stages have already been set. Compare existing stages with new ones and throw on mismatch + for (let i = 0; i < stageIds.length; i++) { + const stageId = stageIds[i]; + if (this.#stages[i].getId() !== stageId) { + throw new Error( + `Unable to set stages for project ${this.getName()}: Stage mismatch at position ${i} ` + + `(existing: ${this.#stages[i].getId()}, new: ${stageId})`); + } } - if (reader) { - this.#writers.set(stageName, [reader]); - } else { - this.#writers.set(stageName, []); + if (cacheReaders.length) { + throw new Error( + `Unable to set stages for project ${this.getName()}: Cache readers can only be set ` + + `when stages are created for the first time`); } + return; + } + for (let i = 0; i < stageIds.length; i++) { + const stageId = stageIds[i]; + const newStage = new Stage(stageId, cacheReaders?.[i]); + this.#stages.push(newStage); } - this.#currentVersion = 0; - this.useFinalStage(); - } - getCurrentStage() { - return this.#currentStage; + // let lastIdx; + // for (let i = 0; i < stageIds.length; i++) { + // const stageId = stageIds[i]; + // const idx = this.#stages.findIndex((s) => { + // return s.getName() === stageId; + // }); + // if (idx !== -1) { + // // Stage already exists, remember its position for later use + // lastIdx = idx; + // continue; + // } + // const newStage = new Stage(stageId, cacheReaders?.[i]); + // if (lastIdx !== undefined) { + // // Insert new stage after the last existing one to maintain order + // this.#stages.splice(lastIdx + 1, 0, newStage); + // lastIdx++; + // } else { + // // Append new stage + // this.#stages.push(newStage); + // } + // } } + // /** + // * Import cached stages into the project + // * + // * @param {Array<{stageName: string, reader: import("@ui5/fs").Reader}>} stages Stages to import + // */ + // importCachedStages(stages) { + // if (!this.#workspaceSealed) { + // throw new Error(`Unable to import cached stages: Workspace is not sealed`); + // } + // for (const {stageName, reader} of stages) { + // if (!this.#stages.includes(stageName)) { + // this.#stages.push(stageName); + // } + // if (reader) { + // this.#writers.set(stageName, [reader]); + // } else { + // this.#writers.set(stageName, []); + // } + // } + // this.#currentVersion = 0; + // this.useFinalStage(); + // } + + // getCurrentStage() { + // return this.#currentStage; + // } + /* Overwritten in ComponentProject subclass */ - _addWriterToReaders(style, readers, writer) { + _addWriter(style, readers, writer) { readers.push(writer); } @@ -583,4 +668,34 @@ class Project extends Specification { async _parseConfiguration(config) {} } +class Stage { + #id; + #writerVersions = []; + #cacheReader; + + constructor(id, cacheReader) { + this.#id = id; + this.#cacheReader = cacheReader; + } + + getId() { + return this.#id; + } + + newVersion(writer) { + this.#writerVersions.push(writer); + } + + getWriter() { + return this.#writerVersions[this.#writerVersions.length - 1]; + } + + getAllWriters(includeCache = true) { + if (includeCache && this.#cacheReader) { + return [this.#cacheReader, ...this.#writerVersions]; + } + return this.#writerVersions; + } +} + export default Project; diff --git a/packages/project/lib/specifications/types/Module.js b/packages/project/lib/specifications/types/Module.js index dcd3a9a2176..201dccfe130 100644 --- a/packages/project/lib/specifications/types/Module.js +++ b/packages/project/lib/specifications/types/Module.js @@ -16,7 +16,6 @@ class Module extends Project { super(parameters); this._paths = null; - this._writer = null; } /* === Attributes === */ @@ -83,13 +82,9 @@ class Module extends Project { } _createWriter() { - if (!this._writer) { - this._writer = resourceFactory.createAdapter({ - virBasePath: "/" - }); - } - - return this._writer; + return resourceFactory.createAdapter({ + virBasePath: "/" + }); } /* === Internals === */ diff --git a/packages/project/lib/specifications/types/ThemeLibrary.js b/packages/project/lib/specifications/types/ThemeLibrary.js index 9412975721e..b9f352f0a6c 100644 --- a/packages/project/lib/specifications/types/ThemeLibrary.js +++ b/packages/project/lib/specifications/types/ThemeLibrary.js @@ -18,7 +18,6 @@ class ThemeLibrary extends Project { this._srcPath = "src"; this._testPath = "test"; this._testPathExists = false; - this._writer = null; } /* === Attributes === */ @@ -113,14 +112,10 @@ class ThemeLibrary extends Project { } _createWriter() { - if (!this._writer) { - this._writer = resourceFactory.createAdapter({ - virBasePath: "/", - project: this - }); - } - - return this._writer; + return resourceFactory.createAdapter({ + virBasePath: "/", + project: this + }); } /* === Internals === */ From 6033cd6472d073690fddd929f0a3992c95ea85a6 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 16 Dec 2025 13:23:52 +0100 Subject: [PATCH 019/110] refactor(project): Fix cache handling --- packages/project/lib/build/ProjectBuilder.js | 24 +-- .../project/lib/build/cache/BuildTaskCache.js | 2 +- .../project/lib/build/cache/CacheManager.js | 38 ++--- .../lib/build/cache/ProjectBuildCache.js | 143 ++++++++++-------- .../lib/build/helpers/createBuildManifest.js | 12 +- .../lib/specifications/ComponentProject.js | 6 +- .../project/lib/specifications/Project.js | 15 +- 7 files changed, 133 insertions(+), 107 deletions(-) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 51bf831aee8..3ccb171faf0 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -135,6 +135,7 @@ class ProjectBuilder { * Alternative to the includedDependencies and excludedDependencies parameters. * Allows for a more sophisticated configuration for defining which dependencies should be * part of the build result. If this is provided, the other mentioned parameters are ignored. + * @param parameters.watch * @returns {Promise} Promise resolving once the build has finished */ async build({ @@ -258,13 +259,12 @@ class ProjectBuilder { this.#log.skipProjectBuild(projectName, projectType); } else { this.#log.startProjectBuild(projectName, projectType); - project.newVersion(); await projectBuildContext.getTaskRunner().runTasks(); - project.sealWorkspace(); this.#log.endProjectBuild(projectName, projectType); } - if (!requestedProjects.includes(projectName) || !!process.env.UI5_BUILD_NO_WRITE_DEST) { - // Project has not been requested or writing is disabled + project.sealWorkspace(); + if (!requestedProjects.includes(projectName)) { + // Project has not been requested // => Its resources shall not be part of the build result continue; } @@ -276,11 +276,11 @@ class ProjectBuilder { if (!alreadyBuilt.includes(projectName)) { this.#log.verbose(`Saving cache...`); - const metadata = await createBuildManifest( + const buildManifest = await createBuildManifest( project, this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), projectBuildContext.getBuildSignature()); - pWrites.push(projectBuildContext.getBuildCache().saveToDisk(metadata)); + pWrites.push(projectBuildContext.getBuildCache().saveToDisk(buildManifest)); } } await Promise.all(pWrites); @@ -351,7 +351,6 @@ class ProjectBuilder { } this.#log.startProjectBuild(projectName, projectType); - project.newVersion(); await projectBuildContext.runTasks(); project.sealWorkspace(); this.#log.endProjectBuild(projectName, projectType); @@ -367,8 +366,11 @@ class ProjectBuilder { } this.#log.verbose(`Updating cache...`); - // TODO: Serialize lazily, or based on memory pressure - pWrites.push(projectBuildContext.getBuildCache().saveToDisk()); + const buildManifest = await createBuildManifest( + project, + this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), + projectBuildContext.getBuildSignature()); + pWrites.push(projectBuildContext.getBuildCache().saveToDisk(buildManifest)); } await Promise.all(pWrites); } @@ -488,12 +490,12 @@ class ProjectBuilder { if (createBuildManifest) { // Create and write a build manifest metadata file - const metadata = await createBuildManifest( + const buildManifest = await createBuildManifest( project, this._graph, buildConfig, this._buildContext.getTaskRepository(), projectBuildContext.getBuildSignature()); await target.write(resourceFactory.createResource({ path: `/.ui5/build-manifest.json`, - string: JSON.stringify(metadata, null, "\t") + string: JSON.stringify(buildManifest, null, "\t") })); } diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index cad46294a65..c5ad3785a87 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -66,7 +66,7 @@ export default class BuildTaskCache { * @param {string} taskName - Name of the task * @param {TaskCacheMetadata} metadata - Task cache metadata */ - constructor(projectName, taskName, {projectRequests, dependencyRequests, input, output}) { + constructor(projectName, taskName, {projectRequests, dependencyRequests, input, output} = {}) { this.#projectName = projectName; this.#taskName = taskName; diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index 0682c6ac75f..06fef6322bf 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -10,7 +10,7 @@ import Configuration from "../../config/Configuration.js"; import {getPathFromPackageName} from "../../utils/sanitizeFileName.js"; import {getLogger} from "@ui5/logger"; -const log = getLogger("project:build:cache:CacheManager"); +const log = getLogger("build:cache:CacheManager"); const chacheManagerInstances = new Map(); const CACACHE_OPTIONS = {algorithms: ["sha256"]}; @@ -24,8 +24,12 @@ const CACACHE_OPTIONS = {algorithms: ["sha256"]}; * */ export default class CacheManager { + #casDir; + #manifestDir; + constructor(cacheDir) { - this._cacheDir = cacheDir; + this.#casDir = path.join(cacheDir, "cas"); + this.#manifestDir = path.join(cacheDir, "buildManifests"); } static async create(cwd) { @@ -51,7 +55,7 @@ export default class CacheManager { #getBuildManifestPath(packageName, buildSignature) { const pkgDir = getPathFromPackageName(packageName); - return path.join(this._cacheDir, pkgDir, `${buildSignature}.json`); + return path.join(this.#manifestDir, pkgDir, `${buildSignature}.json`); } async readBuildManifest(project, buildSignature) { @@ -73,22 +77,22 @@ export default class CacheManager { await writeFile(manifestPath, JSON.stringify(manifest, null, 2), "utf8"); } - async getResourcePathForStage(buildSignature, stageName, resourcePath, integrity) { + async getResourcePathForStage(buildSignature, stageId, resourcePath, integrity) { // try { if (!integrity) { throw new Error("Integrity hash must be provided to read from cache"); } - const cacheKey = this.#createKeyForStage(buildSignature, stageName, resourcePath); - const result = await cacache.get.info(this._cacheDir, cacheKey); + const cacheKey = this.#createKeyForStage(buildSignature, stageId, resourcePath); + const result = await cacache.get.info(this.#casDir, cacheKey); if (result.integrity !== integrity) { log.info(`Integrity mismatch for cache entry ` + `${cacheKey}: expected ${integrity}, got ${result.integrity}`); - const res = await cacache.get.byDigest(this._cacheDir, result.integrity); + const res = await cacache.get.byDigest(this.#casDir, result.integrity); if (res) { log.info(`Updating cache entry with expectation...`); - await this.writeStage(buildSignature, stageName, resourcePath, res.data); - return await this.getResourcePathForStage(buildSignature, stageName, resourcePath, integrity); + await this.writeStage(buildSignature, stageId, resourcePath, res.data); + return await this.getResourcePathForStage(buildSignature, stageId, resourcePath, integrity); } } if (!result) { @@ -104,19 +108,19 @@ export default class CacheManager { // } } - async writeStage(buildSignature, stageName, resourcePath, buffer) { + async writeStage(buildSignature, stageId, resourcePath, buffer) { return await cacache.put( - this._cacheDir, - this.#createKeyForStage(buildSignature, stageName, resourcePath), + this.#casDir, + this.#createKeyForStage(buildSignature, stageId, resourcePath), buffer, CACACHE_OPTIONS ); } - async writeStageStream(buildSignature, stageName, resourcePath, stream) { + async writeStageStream(buildSignature, stageId, resourcePath, stream) { const writable = cacache.put.stream( - this._cacheDir, - this.#createKeyForStage(buildSignature, stageName, resourcePath), + this.#casDir, + this.#createKeyForStage(buildSignature, stageId, resourcePath), stream, CACACHE_OPTIONS, ); @@ -131,7 +135,7 @@ export default class CacheManager { }); } - #createKeyForStage(buildSignature, stageName, resourcePath) { - return `${buildSignature}|${stageName}|${resourcePath}`; + #createKeyForStage(buildSignature, stageId, resourcePath) { + return `${buildSignature}|${stageId}|${resourcePath}`; } } diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 779604def3f..42a76251679 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -66,8 +66,10 @@ export default class ProjectBuildCache { const resourcesWritten = projectTrackingResults.resourcesWritten; if (!this.#taskCache.has(taskName)) { - throw new Error(`Cannot record results for unknown task ${taskName} ` + - `in project ${this.#project.getName()}`); + // Initialize task cache + this.#taskCache.set(taskName, new BuildTaskCache(this.#project.getName(), taskName)); + // throw new Error(`Cannot record results for unknown task ${taskName} ` + + // `in project ${this.#project.getName()}`); } log.verbose(`Updating build cache with results of task ${taskName} in project ${this.#project.getName()}`); const taskCache = this.#taskCache.get(taskName); @@ -171,7 +173,7 @@ export default class ProjectBuildCache { resourceChanged(projectResourcePaths, dependencyResourcePaths) { let taskInvalidated = false; for (const [taskName, taskCache] of this.#taskCache) { - if (!taskCache.checkPossiblyInvalidatesTask(projectResourcePaths, dependencyResourcePaths)) { + if (!taskCache.matchesChangedResources(projectResourcePaths, dependencyResourcePaths)) { continue; } taskInvalidated = true; @@ -304,21 +306,37 @@ export default class ProjectBuildCache { } async setTasks(taskNames) { - // Ensure task cache entries exist for all tasks - for (const taskName of taskNames) { - if (!this.#taskCache.has(taskName)) { - this.#taskCache.set(taskName, - new BuildTaskCache(this.#project.getName(), taskName, { - projectRequests: [], - dependencyRequests: [], - resourcesRead: {}, - resourcesWritten: {} - }) - ); - } - } + // if (this.#taskCache.size) { + // // If task cache entries already exist, validate they match the provided task names + // const existingTaskNames = Array.from(this.#taskCache.keys()); + // if (existingTaskNames.length !== taskNames.length || + // !existingTaskNames.every((taskName, idx) => taskName === taskNames[idx])) { + // throw new Error( + // `Cannot set tasks for project ${this.#project.getName()}: ` + + // `Existing cached tasks ${existingTaskNames.join(", ")} do not match ` + + // `provided task names ${taskNames.join(", ")}`); + // } + // return; + // } + // // Create task cache entries for all tasks and initialize stages + // for (const taskName of taskNames) { + // if (!this.#taskCache.has(taskName)) { + // this.#taskCache.set(taskName, + // new BuildTaskCache(this.#project.getName(), taskName, { + // projectRequests: [], + // dependencyRequests: [], + // resourcesRead: {}, + // resourcesWritten: {} + // }) + // ); + // this.#invalidatedTasks.set(taskName, { + // changedProjectResourcePaths: new Set(), + // changedDependencyResourcePaths: new Set(), + // }); + // } + // } const stageNames = taskNames.map((taskName) => this.#getStageNameForTask(taskName)); - this.#project.ensureStages(stageNames); + this.#project.setStages(stageNames); } async prepareTaskExecution(taskName, dependencyReader) { @@ -333,8 +351,7 @@ export default class ProjectBuildCache { } // Switch project to use cached stage as base layer - const stageName = this.#getStageNameForTask(taskName); - this.#project.useStage(stageName); + this.#project.useStage(this.#getStageNameForTask(taskName)); return true; // Task needs to be executed } @@ -374,9 +391,7 @@ export default class ProjectBuildCache { cache.taskMetadata[taskName] = await taskCache.createMetadata(); } - cache.stages = Object.create(null); - - // const stages = this.#project.getStages(); + cache.stages = await this.#saveCachedStages(); return cache; } @@ -392,15 +407,14 @@ export default class ProjectBuildCache { this.#project, this.#buildSignature, buildManifest); } - async #getStageNameForTask(taskName) { + #getStageNameForTask(taskName) { return `task/${taskName}`; } async #saveCachedStages() { log.info(`Storing task outputs for project ${this.#project.getName()} in cache...`); - const stageMetadata = Object.create(null); - await Promise.all(this.#project.getStagesForCache().map(async ({stageId, reader}) => { + return await Promise.all(this.#project.getStagesForCache().map(async ({stageId, reader}) => { // if (!reader) { // log.verbose( // `Skipping serialization of empty writer for task ${taskName} in project ${this.#project.getName()}` @@ -408,26 +422,26 @@ export default class ProjectBuildCache { // return; // } const resources = await reader.byGlob("/**/*"); - const metadata = stageMetadata[stageId]; - + const resourceMetadata = Object.create(null); await Promise.all(resources.map(async (res) => { // Store resource content in cacache via CacheManager - const integrity = await this.#cacheManager.writeStageStream( - this.#buildSignature, stageId, - res.getOriginalPath(), await res.getStreamAsync() - ); - // TODO: Decide whether to use stream or buffer - // const integrity = await this.#cacheManager.writeStage( + // const integrity = await this.#cacheManager.writeStageStream( // this.#buildSignature, stageId, - // res.getOriginalPath(), await res.getBuffer() + // res.getOriginalPath(), await res.getStreamAsync() // ); + // TODO: Decide whether to use stream or buffer + const integrity = await this.#cacheManager.writeStage( + this.#buildSignature, stageId, + res.getOriginalPath(), await res.getBuffer() + ); - metadata[res.getOriginalPath()] = { + resourceMetadata[res.getOriginalPath()] = { size: await res.getSize(), lastModified: res.getLastModified(), integrity, }; })); + return [stageId, resourceMetadata]; })); // Optional TODO: Re-import cache as base layer to reduce memory pressure? } @@ -439,6 +453,7 @@ export default class ProjectBuildCache { const changedResources = new Set(); for (const resource of resources) { const currentLastModified = resource.getLastModified(); + const resourcePath = resource.getOriginalPath(); if (currentLastModified > indexTimestamp) { // Resource modified after index was created, no need for further checks log.verbose(`Source file created or modified after index creation: ${resourcePath}`); @@ -446,8 +461,7 @@ export default class ProjectBuildCache { continue; } // Check against index - const resourcePath = resource.getOriginalPath(); - if (Object.hasOwn(index, resourcePath)) { + if (!Object.hasOwn(index, resourcePath)) { // New resource encountered log.verbose(`New source file: ${resourcePath}`); changedResources.add(resourcePath); @@ -486,17 +500,17 @@ export default class ProjectBuildCache { } } if (changedResources.size) { - const invalidatedTasks = this.markResourcesChanged(changedResources, new Set()); - if (invalidatedTasks.length > 0) { + const invalidatedTasks = this.resourceChanged(changedResources, new Set()); + if (invalidatedTasks) { log.info(`Invalidating tasks due to changed resources for project ${this.#project.getName()}`); } } } - async #createReaderForStageCache(stageName, resourceMetadata) { + async #createReaderForStageCache(stageId, resourceMetadata) { const allResourcePaths = Object.keys(resourceMetadata); return createProxy({ - name: `Cache reader for task ${stageName} in project ${this.#project.getName()}`, + name: `Cache reader for task ${stageId} in project ${this.#project.getName()}`, listResourcePaths: () => { return allResourcePaths; }, @@ -507,14 +521,14 @@ export default class ProjectBuildCache { const {lastModified, size, integrity} = resourceMetadata[virPath]; if (size === undefined || lastModified === undefined || integrity === undefined) { - throw new Error(`Incomplete metadata for resource ${virPath} of task ${stageName} ` + + throw new Error(`Incomplete metadata for resource ${virPath} of task ${stageId} ` + `in project ${this.#project.getName()}`); } // Get path to cached file contend stored in cacache via CacheManager - const cachePath = await this.#cacheManager.getPathForTaskResource( - this.#buildSignature, stageName, virPath, integrity); + const cachePath = await this.#cacheManager.getResourcePathForStage( + this.#buildSignature, stageId, virPath, integrity); if (!cachePath) { - log.warn(`Content of resource ${virPath} of task ${stageName} ` + + log.warn(`Content of resource ${virPath} of task ${stageId} ` + `in project ${this.#project.getName()}`); return null; } @@ -537,18 +551,25 @@ export default class ProjectBuildCache { }); } + async #importCachedTasks(taskMetadata) { + for (const [taskName, metadata] of Object.entries(taskMetadata)) { + this.#taskCache.set(taskName, + new BuildTaskCache(this.#project.getName(), taskName, metadata)); + } + } + async #importCachedStages(stages) { - const readers = await Promise.all(Object.entries(stages).map(async ([stageName, resourceMetadata]) => { - return await this.#createReaderForStageCache(stageName, resourceMetadata); + const readers = await Promise.all(stages.map(async ([stageId, resourceMetadata]) => { + return await this.#createReaderForStageCache(stageId, resourceMetadata); })); - this.#project.setStages(Object.keys(stages), readers); + this.#project.setStages(stages.map(([id]) => id), readers); } async saveToDisk(buildManifest) { - await Promise.all([ - await this.#saveCachedStages(), - await this.#saveBuildManifest(buildManifest) - ]); + await this.#saveBuildManifest(buildManifest); + // await Promise.all([ + // await this.#saveCachedStages(); + // ]); } /** @@ -570,7 +591,8 @@ export default class ProjectBuildCache { try { // Check build manifest version - if (manifest.version !== "1.0") { + const {buildManifest, cache} = manifest; + if (buildManifest.manifestVersion !== "1.0") { log.verbose(`Incompatible build manifest version ${manifest.version} found for project ` + `${this.#project.getName()} with build signature ${this.#buildSignature}. Ignoring cache.`); return; @@ -587,15 +609,18 @@ export default class ProjectBuildCache { `Restoring build cache for project ${this.#project.getName()} from build manifest ` + `with signature ${this.#buildSignature}`); - const {cache} = manifest; - for (const [taskName, metadata] of Object.entries(cache.tasksMetadata)) { - this.#taskCache.set(taskName, new BuildTaskCache(this.#project.getName(), taskName, metadata)); - } + // for (const [taskName, metadata] of Object.entries(cache.taskMetadata)) { + // this.#taskCache.set(taskName, new BuildTaskCache(this.#project.getName(), taskName, metadata)); + // } + + // Import task- and stage metadata first and in parallel await Promise.all([ - this.#checkForIndexChanges(cache.index, cache.indexTimestamp), + this.#importCachedTasks(cache.taskMetadata), this.#importCachedStages(cache.stages), ]); - // this.#buildManifest = manifest; + + // After tasks have been imported, check for source changes (and potentially invalidate tasks) + await this.#checkForIndexChanges(cache.index, cache.indexTimestamp); } catch (err) { throw new Error( `Failed to restore cache from disk for project ${this.#project.getName()}: ${err.message}`, { diff --git a/packages/project/lib/build/helpers/createBuildManifest.js b/packages/project/lib/build/helpers/createBuildManifest.js index ba679479690..2f95b6fa363 100644 --- a/packages/project/lib/build/helpers/createBuildManifest.js +++ b/packages/project/lib/build/helpers/createBuildManifest.js @@ -16,7 +16,7 @@ function getSortedTags(project) { return Object.fromEntries(entities); } -export default async function(project, graph, buildConfig, taskRepository, buildSignature, cache) { +export default async function(project, graph, buildConfig, taskRepository, signature) { if (!project) { throw new Error(`Missing parameter 'project'`); } @@ -62,23 +62,19 @@ export default async function(project, graph, buildConfig, taskRepository, build } } }, - buildManifest: createBuildManifest(project, buildConfig, taskRepository, buildSignature), + buildManifest: await createBuildManifest(project, buildConfig, taskRepository, signature), }; - if (cache) { - metadata.cache = cache; - } - return metadata; } -async function createBuildManifest(project, buildConfig, taskRepository, buildSignature) { +async function createBuildManifest(project, buildConfig, taskRepository, signature) { // Use legacy manifest version for framework libraries to ensure compatibility const {builderVersion, fsVersion: builderFsVersion} = await taskRepository.getVersions(); const buildManifest = { manifestVersion: "1.0", timestamp: new Date().toISOString(), - buildSignature, + signature, versions: { builderVersion: builderVersion, projectVersion: await getVersion("@ui5/project"), diff --git a/packages/project/lib/specifications/ComponentProject.js b/packages/project/lib/specifications/ComponentProject.js index d3d5d7142f7..e78047d1f5e 100644 --- a/packages/project/lib/specifications/ComponentProject.js +++ b/packages/project/lib/specifications/ComponentProject.js @@ -171,19 +171,19 @@ class ComponentProject extends Project { _createWriter() { // writer is always of style "buildtime" const namespaceWriter = resourceFactory.createAdapter({ - name: `Namespace writer for project ${this.getName()} (${this.getCurrentStage()} stage)`, + name: `Namespace writer for project ${this.getName()}`, virBasePath: "/", project: this }); const generalWriter = resourceFactory.createAdapter({ - name: `General writer for project ${this.getName()} (${this.getCurrentStage()} stage)`, + name: `General writer for project ${this.getName()}`, virBasePath: "/", project: this }); const collection = resourceFactory.createWriterCollection({ - name: `Writers for project ${this.getName()} (${this.getCurrentStage()} stage)`, + name: `Writers for project ${this.getName()}`, writerMapping: { [`/resources/${this._namespace}/`]: namespaceWriter, [`/test-resources/${this._namespace}/`]: namespaceWriter, diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index 9031503583f..8543e2294ce 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -292,13 +292,12 @@ class Project extends Specification { // Collect writers from all relevant stages for (let i = stageReadIdx; i >= 0; i--) { - const stageReaders = this.#getReaderForStage(this.#stages[i], style); - if (stageReaders) { - readers.push(); + const stageReader = this.#getReaderForStage(this.#stages[i], style); + if (stageReader) { + readers.push(stageReader); } } - // Always add source reader readers.push(this._getStyledReader(style)); @@ -432,7 +431,7 @@ class Project extends Specification { // if (newWriter && this.#writers.has(stageId)) { // this.#writers.delete(stageId); // } - if (stageId === this.#currentStage.getId()) { + if (stageId === this.#currentStage?.getId()) { // Already using requested stage return; } @@ -476,7 +475,7 @@ class Project extends Specification { const readers = []; for (const writer of writers) { // Apply project specific handling for using writers as readers, depending on the requested style - this._addWriter("buildtime", readers, writer); + this._addWriter(style, readers, writer); } return createReaderCollectionPrioritized({ @@ -575,12 +574,12 @@ class Project extends Specification { `(existing: ${this.#stages[i].getId()}, new: ${stageId})`); } } - if (cacheReaders.length) { + if (cacheReaders?.length) { throw new Error( `Unable to set stages for project ${this.getName()}: Cache readers can only be set ` + `when stages are created for the first time`); } - return; + return; // Stages already set and matching, no further processing needed } for (let i = 0; i < stageIds.length; i++) { const stageId = stageIds[i]; From 037edd643452b6124d929b9dede745468c5578e8 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 16 Dec 2025 15:52:15 +0100 Subject: [PATCH 020/110] refactor(fs): Remove contentAccess mutex timeout from Resource --- packages/fs/lib/Resource.js | 35 +++++++++++++++++++---------------- 1 file changed, 19 insertions(+), 16 deletions(-) diff --git a/packages/fs/lib/Resource.js b/packages/fs/lib/Resource.js index 228f365c86b..6cdc3a7531f 100644 --- a/packages/fs/lib/Resource.js +++ b/packages/fs/lib/Resource.js @@ -4,7 +4,7 @@ import ssri from "ssri"; import clone from "clone"; import posixPath from "node:path/posix"; import {setTimeout} from "node:timers/promises"; -import {withTimeout, Mutex} from "async-mutex"; +import {Mutex} from "async-mutex"; import {getLogger} from "@ui5/logger"; const log = getLogger("fs:Resource"); @@ -52,8 +52,8 @@ class Resource { /* States */ #isModified = false; - // Mutex to prevent access/modification while content is being transformed. 100 ms timeout - #contentMutex = withTimeout(new Mutex(), 100, new Error("Timeout waiting for resource content access")); + // Mutex to prevent access/modification while content is being transformed + #contentMutex = new Mutex(); // Tracing #collections = []; @@ -404,20 +404,23 @@ class Resource { } // Then make sure no other operation is currently modifying the content and then lock it const release = await this.#contentMutex.acquire(); - const newContent = await callback(this.#getStream()); - - // New content is either buffer or stream - if (Buffer.isBuffer(newContent)) { - this.#content = newContent; - this.#contentType = CONTENT_TYPES.BUFFER; - } else if (typeof newContent === "object" && typeof newContent.pipe === "function") { - this.#content = newContent; - this.#contentType = CONTENT_TYPES.STREAM; - } else { - throw new Error("Unable to set new content: Content must be either a Buffer or a Readable Stream"); + try { + const newContent = await callback(this.#getStream()); + + // New content is either buffer or stream + if (Buffer.isBuffer(newContent)) { + this.#content = newContent; + this.#contentType = CONTENT_TYPES.BUFFER; + } else if (typeof newContent === "object" && typeof newContent.pipe === "function") { + this.#content = newContent; + this.#contentType = CONTENT_TYPES.STREAM; + } else { + throw new Error("Unable to set new content: Content must be either a Buffer or a Readable Stream"); + } + this.#contendModified(); + } finally { + release(); } - this.#contendModified(); - release(); } /** From cb193f4ccfcebd650a4a783d23bdf2e323bdcb02 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 16 Dec 2025 16:07:55 +0100 Subject: [PATCH 021/110] refactor(project): Cleanup obsolete code/comments --- packages/project/lib/build/ProjectBuilder.js | 19 +- .../project/lib/build/cache/CacheManager.js | 8 - .../lib/build/cache/ProjectBuildCache.js | 58 ----- .../project/lib/specifications/Project.js | 209 ------------------ 4 files changed, 1 insertion(+), 293 deletions(-) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 3ccb171faf0..b7ae8ad59d8 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -135,7 +135,7 @@ class ProjectBuilder { * Alternative to the includedDependencies and excludedDependencies parameters. * Allows for a more sophisticated configuration for defining which dependencies should be * part of the build result. If this is provided, the other mentioned parameters are ignored. - * @param parameters.watch + * @param {boolean} [parameters.watch] Whether to watch for file changes and re-execute the build automatically * @returns {Promise} Promise resolving once the build has finished */ async build({ @@ -301,21 +301,6 @@ class ProjectBuilder { await this.#update(projectBuildContexts, requestedProjects, fsTarget); }); return watchHandler; - - // Register change handler - // this._buildContext.onSourceFileChange(async (event) => { - // await this.#update(projectBuildContexts, requestedProjects, - // fsTarget, - // targetWriterProject, targetWriterDependencies); - // updateOnChange(event); - // }, (err) => { - // updateOnChange(err); - // }); - - // // Start watching - // for (const projectBuildContext of queue) { - // await projectBuildContext.watchFileChanges(); - // } } } @@ -328,9 +313,7 @@ class ProjectBuilder { // Build context exists // => This project needs to be built or, in case it has already // been built, it's build result needs to be written out (if requested) - // if (await projectBuildContext.requiresBuild()) { queue.push(projectBuildContext); - // } } }); diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index 06fef6322bf..963a92489e6 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -78,7 +78,6 @@ export default class CacheManager { } async getResourcePathForStage(buildSignature, stageId, resourcePath, integrity) { - // try { if (!integrity) { throw new Error("Integrity hash must be provided to read from cache"); } @@ -99,13 +98,6 @@ export default class CacheManager { return null; } return result.path; - // } catch (err) { - // if (err.code === "ENOENT") { - // // Cache miss - // return null; - // } - // throw err; - // } } async writeStage(buildSignature, stageId, resourcePath, buffer) { diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 42a76251679..7a8db0cef2f 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -127,17 +127,6 @@ export default class ProjectBuildCache { resourcesRead, resourcesWritten ); - // } else { - // log.verbose(`Initializing build cache for task ${taskName} in project ${this.#project.getName()}`); - // this.#taskCache.set(taskName, - // new BuildTaskCache(this.#project.getName(), taskName, { - // projectRequests: projectTrackingResults.requests, - // dependencyRequests: dependencyTrackingResults?.requests, - // resourcesRead, - // resourcesWritten - // }) - // ); - // } if (this.#invalidatedTasks.has(taskName)) { this.#invalidatedTasks.delete(taskName); @@ -306,35 +295,6 @@ export default class ProjectBuildCache { } async setTasks(taskNames) { - // if (this.#taskCache.size) { - // // If task cache entries already exist, validate they match the provided task names - // const existingTaskNames = Array.from(this.#taskCache.keys()); - // if (existingTaskNames.length !== taskNames.length || - // !existingTaskNames.every((taskName, idx) => taskName === taskNames[idx])) { - // throw new Error( - // `Cannot set tasks for project ${this.#project.getName()}: ` + - // `Existing cached tasks ${existingTaskNames.join(", ")} do not match ` + - // `provided task names ${taskNames.join(", ")}`); - // } - // return; - // } - // // Create task cache entries for all tasks and initialize stages - // for (const taskName of taskNames) { - // if (!this.#taskCache.has(taskName)) { - // this.#taskCache.set(taskName, - // new BuildTaskCache(this.#project.getName(), taskName, { - // projectRequests: [], - // dependencyRequests: [], - // resourcesRead: {}, - // resourcesWritten: {} - // }) - // ); - // this.#invalidatedTasks.set(taskName, { - // changedProjectResourcePaths: new Set(), - // changedDependencyResourcePaths: new Set(), - // }); - // } - // } const stageNames = taskNames.map((taskName) => this.#getStageNameForTask(taskName)); this.#project.setStages(stageNames); } @@ -415,21 +375,10 @@ export default class ProjectBuildCache { log.info(`Storing task outputs for project ${this.#project.getName()} in cache...`); return await Promise.all(this.#project.getStagesForCache().map(async ({stageId, reader}) => { - // if (!reader) { - // log.verbose( - // `Skipping serialization of empty writer for task ${taskName} in project ${this.#project.getName()}` - // ); - // return; - // } const resources = await reader.byGlob("/**/*"); const resourceMetadata = Object.create(null); await Promise.all(resources.map(async (res) => { // Store resource content in cacache via CacheManager - // const integrity = await this.#cacheManager.writeStageStream( - // this.#buildSignature, stageId, - // res.getOriginalPath(), await res.getStreamAsync() - // ); - // TODO: Decide whether to use stream or buffer const integrity = await this.#cacheManager.writeStage( this.#buildSignature, stageId, res.getOriginalPath(), await res.getBuffer() @@ -567,9 +516,6 @@ export default class ProjectBuildCache { async saveToDisk(buildManifest) { await this.#saveBuildManifest(buildManifest); - // await Promise.all([ - // await this.#saveCachedStages(); - // ]); } /** @@ -609,10 +555,6 @@ export default class ProjectBuildCache { `Restoring build cache for project ${this.#project.getName()} from build manifest ` + `with signature ${this.#buildSignature}`); - // for (const [taskName, metadata] of Object.entries(cache.taskMetadata)) { - // this.#taskCache.set(taskName, new BuildTaskCache(this.#project.getName(), taskName, metadata)); - // } - // Import task- and stage metadata first and in parallel await Promise.all([ this.#importCachedTasks(cache.taskMetadata), diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index 8543e2294ce..90add986ec4 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -276,14 +276,6 @@ class Project extends Specification { // Use cached reader return reader; } - // const readers = []; - // this._addWriter(style, readers, this.getWriter()); - // readers.push(this._getStyledReader(style)); - // reader = createReaderCollectionPrioritized({ - // name: `Reader collection for project ${this.getName()}`, - // readers - // }); - // reader = this.#getReader(this.#currentStage, style); const readers = []; @@ -310,30 +302,10 @@ class Project extends Specification { return reader; } - // getCacheReader({style = "buildtime"} = {}) { - // return this.#getReader(this.#currentStage, style, true); - // } - getSourceReader(style = "buildtime") { return this._getStyledReader(style); } - // #getWriter() { - // return this.#currentStage.getWriter(); - // } - - // #createNewWriterStage(stageId) { - // const writer = this._createWriter(); - // this.#writers.set(stageId, writer); - // this.#currentWriter = writer; - - // // Invalidate dependents - // this.#currentWorkspace = null; - // this.#currentReader = new Map(); - - // return writer; - // } - /** * Get a [DuplexCollection]{@link @ui5/fs/DuplexCollection} for accessing and modifying a * project's resources. This is always of style buildtime. @@ -356,16 +328,6 @@ class Project extends Specification { return this.#currentStageWorkspace; } const writer = this.#currentStage.getWriter(); - - // if (this.#stageCacheReaders.has(this.getCurrentStage())) { - // reader = createReaderCollectionPrioritized({ - // name: `Reader collection for project ${this.getName()} stage ${this.getCurrentStage()}`, - // readers: [ - // this.#stageCacheReaders.get(this.getCurrentStage()), - // reader, - // ] - // }); - // } const workspace = createWorkspace({ reader: this.getReader(), writer: writer.collection || writer @@ -374,59 +336,6 @@ class Project extends Specification { return workspace; } - // getWorkspaceForVersion(version) { - // return createWorkspace({ - // reader: this.#getReader(version), - // writer: this.#writerVersions[version].collection || this.#writerVersions[version] - // }); - // } - - - // newVersion() { - // this.#workspaceSealed = false; - // this.#currentVersion++; - // this.useInitialStage(); - // } - - // revertToLastVersion() { - // if (this.#currentVersion === 0) { - // throw new Error(`Unable to revert to previous version: No previous version available`); - // } - // this.#currentVersion--; - // this.useInitialStage(); - - // // Remove writer version from all stages - // for (const writerVersions of this.#writers.values()) { - // if (writerVersions[this.#currentVersion]) { - // delete writerVersions[this.#currentVersion]; - // } - // } - // } - - // #getReader(style = "buildtime") { - // const readers = []; - - // // Add writers for previous stages as readers - // const stageIdx = this.#stages.findIndex((s) => s.getName() === stageId); - // if (stageIdx > 0) { // Stage 0 has no previous stage - // // Collect writers from all preceding stages - // for (let i = stageIdx - 1; i >= 0; i--) { - // const stageWriters = this.#getWriters(this.#stages[i], version, style); - // if (stageWriters) { - // readers.push(stageWriters); - // } - // } - // } - - // // Always add source reader - // readers.push(this._getStyledReader(style)); - - // return createReaderCollectionPrioritized({ - // name: `Reader collection for stage '${stage}' of project ${this.getName()}`, - // readers: readers - // }); - // } - useStage(stageId) { // if (newWriter && this.#writers.has(stageId)) { // this.#writers.delete(stageId); @@ -484,75 +393,6 @@ class Project extends Specification { }); } - // #getWriters(stage, version, style = "buildtime") { - // const readers = []; - // const stageWriters = this.#writers.get(stage); - // if (!stageWriters?.length) { - // return null; - // } - // for (let i = version; i >= 0; i--) { - // if (!stageWriters[i]) { - // // Writers is a sparse array, some stages might skip a version - // continue; - // } - // this._addWriter(style, readers, stageWriters[i]); - // } - - // return createReaderCollectionPrioritized({ - // name: `Collection of all writers for stage '${stage}', version ${version} of project ${this.getName()}`, - // readers - // }); - // } - - // getDeltaReader(stage) { - // const readers = []; - // const stageWriters = this.#writers.get(stage); - // if (!stageWriters?.length) { - // return null; - // } - // const version = this.#currentVersion; - // for (let i = version; i >= 1; i--) { // Skip version 0 (possibly containing cached writers) - // if (!stageWriters[i]) { - // // Writers is a sparse array, some stages might skip a version - // continue; - // } - // this._addWriter("buildtime", readers, stageWriters[i]); - // } - - // const reader = createReaderCollectionPrioritized({ - // name: `Collection of new writers for stage '${stage}', version ${version} of project ${this.getName()}`, - // readers - // }); - - - // // Condense writer versions (TODO: this step is optional but might improve memory consumption) - // // this.#condenseVersions(reader); - // return reader; - // } - - // #condenseVersions(reader) { - // for (const stage of this.#stages) { - // const stageWriters = this.#writers.get(stage); - // if (!stageWriters) { - // continue; - // } - // const condensedWriter = this._createWriter(); - - // for (let i = 1; i < stageWriters.length; i++) { - // if (stageWriters[i]) { - - // } - // } - - // // eslint-disable-next-line no-sparse-arrays - // const newWriters = [, condensedWriter]; - // if (stageWriters[0]) { - // newWriters[0] = stageWriters[0]; - // } - // this.#writers.set(stage, newWriters); - // } - // } - getStagesForCache() { return this.#stages.map((stage) => { const reader = this.#getReaderForStage(stage, "buildtime", false); @@ -586,57 +426,8 @@ class Project extends Specification { const newStage = new Stage(stageId, cacheReaders?.[i]); this.#stages.push(newStage); } - - // let lastIdx; - // for (let i = 0; i < stageIds.length; i++) { - // const stageId = stageIds[i]; - // const idx = this.#stages.findIndex((s) => { - // return s.getName() === stageId; - // }); - // if (idx !== -1) { - // // Stage already exists, remember its position for later use - // lastIdx = idx; - // continue; - // } - // const newStage = new Stage(stageId, cacheReaders?.[i]); - // if (lastIdx !== undefined) { - // // Insert new stage after the last existing one to maintain order - // this.#stages.splice(lastIdx + 1, 0, newStage); - // lastIdx++; - // } else { - // // Append new stage - // this.#stages.push(newStage); - // } - // } } - // /** - // * Import cached stages into the project - // * - // * @param {Array<{stageName: string, reader: import("@ui5/fs").Reader}>} stages Stages to import - // */ - // importCachedStages(stages) { - // if (!this.#workspaceSealed) { - // throw new Error(`Unable to import cached stages: Workspace is not sealed`); - // } - // for (const {stageName, reader} of stages) { - // if (!this.#stages.includes(stageName)) { - // this.#stages.push(stageName); - // } - // if (reader) { - // this.#writers.set(stageName, [reader]); - // } else { - // this.#writers.set(stageName, []); - // } - // } - // this.#currentVersion = 0; - // this.useFinalStage(); - // } - - // getCurrentStage() { - // return this.#currentStage; - // } - /* Overwritten in ComponentProject subclass */ _addWriter(style, readers, writer) { readers.push(writer); From 056650c68b7f48b3ed55d6bbe27c14ed2ff7c6db Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 16 Dec 2025 16:09:04 +0100 Subject: [PATCH 022/110] refactor(server): Cleanup obsolete code --- packages/server/lib/server.js | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/packages/server/lib/server.js b/packages/server/lib/server.js index ea9c544019d..a1e761dea73 100644 --- a/packages/server/lib/server.js +++ b/packages/server/lib/server.js @@ -2,7 +2,7 @@ import express from "express"; import portscanner from "portscanner"; import path from "node:path/posix"; import MiddlewareManager from "./middleware/MiddlewareManager.js"; -import {createAdapter, createReaderCollection} from "@ui5/fs/resourceFactory"; +import {createReaderCollection} from "@ui5/fs/resourceFactory"; import ReaderCollectionPrioritized from "@ui5/fs/ReaderCollectionPrioritized"; import {getLogger} from "@ui5/logger"; @@ -137,16 +137,8 @@ export async function serve(graph, { port: requestedPort, changePortIfInUse = false, h2 = false, key, cert, acceptRemoteConnections = false, sendSAPTargetCSP = false, simpleIndex = false, serveCSPReports = false }) { - // const rootReader = createAdapter({ - // virBasePath: "/", - // }); - // const dependencies = createAdapter({ - // virBasePath: "/", - // }); - const rootProject = graph.getRoot(); const watchHandler = await graph.build({ - cacheDir: path.join(rootProject.getRootPath(), ".ui5-cache"), includedDependencies: ["*"], watch: true, }); @@ -182,7 +174,7 @@ export async function serve(graph, { const resources = await createReaders(); - watchHandler.on("buildUpdated", async () => { + watchHandler.on("projectResourcesUpdated", async () => { const newResources = await createReaders(); // Patch resources resources.rootProject = newResources.rootProject; From 69dacc7348b96bb43d6316920fe7adb0fae125d5 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 16 Dec 2025 16:13:38 +0100 Subject: [PATCH 023/110] refactor(project): Rename watch handler events --- packages/project/lib/build/helpers/WatchHandler.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/project/lib/build/helpers/WatchHandler.js b/packages/project/lib/build/helpers/WatchHandler.js index 0a5510a7eba..251b67a77fd 100644 --- a/packages/project/lib/build/helpers/WatchHandler.js +++ b/packages/project/lib/build/helpers/WatchHandler.js @@ -125,9 +125,9 @@ class WatchHandler extends EventEmitter { }); if (someProjectTasksInvalidated) { - this.emit("projectInvalidated"); + this.emit("projectResourcesInvalidated"); await this.#updateBuildResult(); - this.emit("buildUpdated"); + this.emit("projectResourcesUpdated"); } } } From 4f270f4cb2d8b51def0de5cb11b79dfffe0a22ba Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Wed, 17 Dec 2025 09:06:43 +0100 Subject: [PATCH 024/110] refactor: Fix linting issues --- packages/builder/lib/tasks/escapeNonAsciiCharacters.js | 1 + packages/project/lib/graph/ProjectGraph.js | 5 ++++- packages/project/test/lib/build/TaskRunner.js | 3 ++- packages/server/lib/server.js | 1 - 4 files changed, 7 insertions(+), 3 deletions(-) diff --git a/packages/builder/lib/tasks/escapeNonAsciiCharacters.js b/packages/builder/lib/tasks/escapeNonAsciiCharacters.js index 73943c04a34..81d967c4012 100644 --- a/packages/builder/lib/tasks/escapeNonAsciiCharacters.js +++ b/packages/builder/lib/tasks/escapeNonAsciiCharacters.js @@ -14,6 +14,7 @@ import nonAsciiEscaper from "../processors/nonAsciiEscaper.js"; * * @param {object} parameters Parameters * @param {@ui5/fs/DuplexCollection} parameters.workspace DuplexCollection to read and write files + * @param {Array} parameters.invalidatedResources List of invalidated resource paths * @param {object} parameters.options Options * @param {string} parameters.options.pattern Glob pattern to locate the files to be processed * @param {string} parameters.options.encoding source file encoding either "UTF-8" or "ISO-8859-1" diff --git a/packages/project/lib/graph/ProjectGraph.js b/packages/project/lib/graph/ProjectGraph.js index 0d15174e3b3..c673734d1de 100644 --- a/packages/project/lib/graph/ProjectGraph.js +++ b/packages/project/lib/graph/ProjectGraph.js @@ -632,6 +632,8 @@ class ProjectGraph { * @param {Array.} [parameters.excludedTasks=[]] List of tasks to be excluded. * @param {module:@ui5/project/build/ProjectBuilderOutputStyle} [parameters.outputStyle=Default] * Processes build results into a specific directory structure. + * @param {string} [parameters.cacheDir] Path to the cache directory + * @param {boolean} [parameters.watch] Whether to watch for file changes and re-execute the build automatically * @returns {Promise} Promise resolving to undefined once build has finished */ async build({ @@ -666,7 +668,8 @@ class ProjectGraph { destPath, cleanDest, includedDependencies, excludedDependencies, dependencyIncludes, - cacheDir, watch, + // cacheDir, // FIXME/TODO: Not implemented yet + watch, }); } diff --git a/packages/project/test/lib/build/TaskRunner.js b/packages/project/test/lib/build/TaskRunner.js index a93b1eebc02..0db7a9514b5 100644 --- a/packages/project/test/lib/build/TaskRunner.js +++ b/packages/project/test/lib/build/TaskRunner.js @@ -296,7 +296,8 @@ test("_initTasks: Project of type 'library' (framework project)", async (t) => { test("_initTasks: Project of type 'theme-library'", async (t) => { const {graph, taskUtil, taskRepository, TaskRunner, projectBuildLogger, cache} = t.context; const taskRunner = new TaskRunner({ - project: getMockProject("theme-library"), graph, taskUtil, taskRepository, log: projectBuildLogger, cache, buildConfig + project: getMockProject("theme-library"), graph, taskUtil, taskRepository, + log: projectBuildLogger, cache, buildConfig }); await taskRunner._initTasks(); diff --git a/packages/server/lib/server.js b/packages/server/lib/server.js index a1e761dea73..1934fe77565 100644 --- a/packages/server/lib/server.js +++ b/packages/server/lib/server.js @@ -1,6 +1,5 @@ import express from "express"; import portscanner from "portscanner"; -import path from "node:path/posix"; import MiddlewareManager from "./middleware/MiddlewareManager.js"; import {createReaderCollection} from "@ui5/fs/resourceFactory"; import ReaderCollectionPrioritized from "@ui5/fs/ReaderCollectionPrioritized"; From 7fdb9a850759a0fb24d628f6c8d149877fcee427 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Wed, 17 Dec 2025 09:33:03 +0100 Subject: [PATCH 025/110] test(fs): Adjust getIntegrity tests --- packages/fs/lib/Resource.js | 2 +- packages/fs/lib/ResourceFacade.js | 8 +- packages/fs/test/lib/Resource.js | 260 +++++++++++++++++++++--------- 3 files changed, 189 insertions(+), 81 deletions(-) diff --git a/packages/fs/lib/Resource.js b/packages/fs/lib/Resource.js index 6cdc3a7531f..a60d8ca8970 100644 --- a/packages/fs/lib/Resource.js +++ b/packages/fs/lib/Resource.js @@ -539,7 +539,7 @@ class Resource { return this.#integrity; } if (this.isDirectory()) { - throw new Error(`Unable to calculate hash for directory resource: ${this.#path}`); + throw new Error(`Unable to calculate integrity for directory resource: ${this.#path}`); } // First wait for new content if the current content is flagged as drained diff --git a/packages/fs/lib/ResourceFacade.js b/packages/fs/lib/ResourceFacade.js index d9f8f41b5b1..fe549e7ac3c 100644 --- a/packages/fs/lib/ResourceFacade.js +++ b/packages/fs/lib/ResourceFacade.js @@ -190,8 +190,12 @@ class ResourceFacade { return this.#resource.setStream(stream); } - getHash() { - return this.#resource.getHash(); + getIntegrity() { + return this.#resource.getIntegrity(); + } + + getInode() { + return this.#resource.getInode(); } /** diff --git a/packages/fs/test/lib/Resource.js b/packages/fs/test/lib/Resource.js index 97f5d95cb44..d48b2828330 100644 --- a/packages/fs/test/lib/Resource.js +++ b/packages/fs/test/lib/Resource.js @@ -4,6 +4,7 @@ import {Stream, Transform} from "node:stream"; import {statSync, createReadStream} from "node:fs"; import {stat, readFile} from "node:fs/promises"; import path from "node:path"; +import ssri from "ssri"; import Resource from "../../lib/Resource.js"; function createBasicResource() { @@ -1571,35 +1572,42 @@ test("getSize", async (t) => { t.is(await resourceNoSize.getSize(), 91); }); -/* Hash Glossary +/* Integrity Glossary "Content" = "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" "New content" = "sha256-EvQbHDId8MgpzlgZllZv3lKvbK/h0qDHRmzeU+bxPMo=" */ -test("getHash: Throws error for directory resource", async (t) => { +test("getIntegrity: Throws error for directory resource", async (t) => { const resource = new Resource({ path: "/my/directory", isDirectory: true }); - await t.throwsAsync(resource.getHash(), { - message: "Unable to calculate hash for directory resource: /my/directory" + await t.throwsAsync(resource.getIntegrity(), { + message: "Unable to calculate integrity for directory resource: /my/directory" }); }); -test("getHash: Returns hash for buffer content", async (t) => { +test("getIntegrity: Returns integrity for buffer content", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", buffer: Buffer.from("Content") }); - const hash = await resource.getHash(); - t.is(typeof hash, "string", "Hash is a string"); - t.true(hash.startsWith("sha256-"), "Hash starts with sha256-"); - t.is(hash, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash for content"); + const integrity = await resource.getIntegrity(); + t.deepEqual(integrity, ssri.parse({ + sha256: [ + { + algorithm: "sha256", + digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + options: [], + source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" + } + ] + }), "Correct integrity for content"); }); -test("getHash: Returns hash for stream content", async (t) => { +test("getIntegrity: Returns integrity for stream content", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", stream: new Stream.Readable({ @@ -1610,13 +1618,20 @@ test("getHash: Returns hash for stream content", async (t) => { }), }); - const hash = await resource.getHash(); - t.is(typeof hash, "string", "Hash is a string"); - t.true(hash.startsWith("sha256-"), "Hash starts with sha256-"); - t.is(hash, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash for content"); + const integrity = await resource.getIntegrity(); + t.deepEqual(integrity, ssri.parse({ + sha256: [ + { + algorithm: "sha256", + digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + options: [], + source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" + } + ] + }), "Correct integrity for content"); }); -test("getHash: Returns hash for factory content", async (t) => { +test("getIntegrity: Returns integrity for factory content", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", createStream: () => { @@ -1629,23 +1644,30 @@ test("getHash: Returns hash for factory content", async (t) => { } }); - const hash = await resource.getHash(); - t.is(typeof hash, "string", "Hash is a string"); - t.true(hash.startsWith("sha256-"), "Hash starts with sha256-"); - t.is(hash, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash for content"); + const integrity = await resource.getIntegrity(); + t.deepEqual(integrity, ssri.parse({ + sha256: [ + { + algorithm: "sha256", + digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + options: [], + source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" + } + ] + }), "Correct integrity for content"); }); -test("getHash: Throws error for resource with no content", async (t) => { +test("getIntegrity: Throws error for resource with no content", async (t) => { const resource = new Resource({ path: "/my/path/to/resource" }); - await t.throwsAsync(resource.getHash(), { + await t.throwsAsync(resource.getIntegrity(), { message: "Resource /my/path/to/resource has no content" }); }); -test("getHash: Different content produces different hashes", async (t) => { +test("getIntegrity: Different content produces different integrities", async (t) => { const resource1 = new Resource({ path: "/my/path/to/resource1", string: "Content 1" @@ -1656,13 +1678,13 @@ test("getHash: Different content produces different hashes", async (t) => { string: "Content 2" }); - const hash1 = await resource1.getHash(); - const hash2 = await resource2.getHash(); + const integrity1 = await resource1.getIntegrity(); + const integrity2 = await resource2.getIntegrity(); - t.not(hash1, hash2, "Different content produces different hashes"); + t.notDeepEqual(integrity1, integrity2, "Different content produces different integrities"); }); -test("getHash: Same content produces same hash", async (t) => { +test("getIntegrity: Same content produces same integrity", async (t) => { const resource1 = new Resource({ path: "/my/path/to/resource1", string: "Content" @@ -1683,31 +1705,40 @@ test("getHash: Same content produces same hash", async (t) => { }), }); - const hash1 = await resource1.getHash(); - const hash2 = await resource2.getHash(); - const hash3 = await resource3.getHash(); + const integrity1 = await resource1.getIntegrity(); + const integrity2 = await resource2.getIntegrity(); + const integrity3 = await resource3.getIntegrity(); - t.is(hash1, hash2, "Same content produces same hash for string and buffer content"); - t.is(hash1, hash3, "Same content produces same hash for string and stream"); + t.deepEqual(integrity1, integrity2, "Same content produces same integrity for string and buffer content"); + t.deepEqual(integrity1, integrity3, "Same content produces same integrity for string and stream"); }); -test("getHash: Waits for drained content", async (t) => { +test("getIntegrity: Waits for drained content", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", string: "Initial content" }); // Drain the stream - await resource.getStream(); - const p1 = resource.getHash(); // Start getHash which should wait for new content + await resource.getStreamAsync(); + const p1 = resource.getIntegrity(); // Start getIntegrity which should wait for new content resource.setString("New content"); - const hash = await p1; - t.is(hash, "sha256-EvQbHDId8MgpzlgZllZv3lKvbK/h0qDHRmzeU+bxPMo=", "Correct hash for new content"); + const integrity = await p1; + t.deepEqual(integrity, ssri.parse({ + sha256: [ + { + algorithm: "sha256", + digest: "EvQbHDId8MgpzlgZllZv3lKvbK/h0qDHRmzeU+bxPMo=", + options: [], + source: "sha256-EvQbHDId8MgpzlgZllZv3lKvbK/h0qDHRmzeU+bxPMo=" + } + ] + }), "Correct integrity for new content"); }); -test("getHash: Waits for content transformation to complete", async (t) => { +test("getIntegrity: Waits for content transformation to complete", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", stream: new Stream.Readable({ @@ -1721,31 +1752,50 @@ test("getHash: Waits for content transformation to complete", async (t) => { // Start getBuffer which will transform content const bufferPromise = resource.getBuffer(); - // Immediately call getHash while transformation is in progress - const hashPromise = resource.getHash(); + // Immediately call getIntegrity while transformation is in progress + const integrityPromise = resource.getIntegrity(); // Both should complete successfully await bufferPromise; - const hash = await hashPromise; - t.is(hash, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash after waiting for transformation"); + const integrity = await integrityPromise; + t.deepEqual(integrity, ssri.parse({ + sha256: [ + { + algorithm: "sha256", + digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + options: [], + source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" + } + ] + }), "Correct integrity after waiting for transformation"); }); -test("getHash: Can be called multiple times on buffer content", async (t) => { +test("getIntegrity: Can be called multiple times on buffer content", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", buffer: Buffer.from("Content") }); - const hash1 = await resource.getHash(); - const hash2 = await resource.getHash(); - const hash3 = await resource.getHash(); + const integrity1 = await resource.getIntegrity(); + const integrity2 = await resource.getIntegrity(); + const integrity3 = await resource.getIntegrity(); - t.is(hash1, hash2, "First and second hash are identical"); - t.is(hash2, hash3, "Second and third hash are identical"); - t.is(hash1, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash value"); + t.deepEqual(integrity1, integrity2, "First and second integrity are identical"); + t.deepEqual(integrity2, integrity3, "Second and third integrity are identical"); + + t.deepEqual(integrity1, ssri.parse({ + sha256: [ + { + algorithm: "sha256", + digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + options: [], + source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" + } + ] + }), "Correct integrity for content"); }); -test("getHash: Can be called multiple times on factory content", async (t) => { +test("getIntegrity: Can be called multiple times on factory content", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", createStream: () => { @@ -1758,16 +1808,26 @@ test("getHash: Can be called multiple times on factory content", async (t) => { } }); - const hash1 = await resource.getHash(); - const hash2 = await resource.getHash(); - const hash3 = await resource.getHash(); + const integrity1 = await resource.getIntegrity(); + const integrity2 = await resource.getIntegrity(); + const integrity3 = await resource.getIntegrity(); - t.is(hash1, hash2, "First and second hash are identical"); - t.is(hash2, hash3, "Second and third hash are identical"); - t.is(hash1, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash value"); + t.deepEqual(integrity1, integrity2, "First and second integrity are identical"); + t.deepEqual(integrity2, integrity3, "Second and third integrity are identical"); + + t.deepEqual(integrity1, ssri.parse({ + sha256: [ + { + algorithm: "sha256", + digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + options: [], + source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" + } + ] + }), "Correct integrity for content"); }); -test("getHash: Can only be called once on stream content", async (t) => { +test("getIntegrity: Can be called multiple times on stream content", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", stream: new Stream.Readable({ @@ -1778,52 +1838,96 @@ test("getHash: Can only be called once on stream content", async (t) => { }) }); - const hash1 = await resource.getHash(); - await t.throwsAsync(resource.getHash(), { - message: /Timeout waiting for content of Resource \/my\/path\/to\/resource to become available./ - }, `Threw with expected error message`); + const integrity1 = await resource.getIntegrity(); + const integrity2 = await resource.getIntegrity(); + const integrity3 = await resource.getIntegrity(); + + t.deepEqual(integrity1, integrity2, "First and second integrity are identical"); + t.deepEqual(integrity2, integrity3, "Second and third integrity are identical"); - t.is(hash1, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", "Correct hash value"); + t.deepEqual(integrity1, ssri.parse({ + sha256: [ + { + algorithm: "sha256", + digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + options: [], + source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" + } + ] + }), "Correct integrity for content"); }); -test("getHash: Hash changes after content modification", async (t) => { +test("getIntegrity: Integrity changes after content modification", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", string: "Original content" }); - const hash1 = await resource.getHash(); - t.is(hash1, "sha256-OUni2q0Lopc2NkTnXeaaYPNQJNUATQtbAqMWJvtCVNo=", "Correct hash for original content"); + const integrity1 = await resource.getIntegrity(); + t.deepEqual(integrity1, ssri.parse({ + sha256: [ + { + algorithm: "sha256", + digest: "OUni2q0Lopc2NkTnXeaaYPNQJNUATQtbAqMWJvtCVNo=", + options: [], + source: "sha256-OUni2q0Lopc2NkTnXeaaYPNQJNUATQtbAqMWJvtCVNo=" + } + ] + }), "Correct integrity for original content"); resource.setString("Modified content"); - const hash2 = await resource.getHash(); - t.is(hash2, "sha256-8fba0TDG5CusKMUf/7GVTTxaYjVbRXacQv2lt3RdtT8=", "Hash changes after modification"); - t.not(hash1, hash2, "New hash is different from original"); + const integrity2 = await resource.getIntegrity(); + t.deepEqual(integrity2, ssri.parse({ + sha256: [ + { + algorithm: "sha256", + digest: "8fba0TDG5CusKMUf/7GVTTxaYjVbRXacQv2lt3RdtT8=", + options: [], + source: "sha256-8fba0TDG5CusKMUf/7GVTTxaYjVbRXacQv2lt3RdtT8=" + } + ] + }), "Integrity changes after content modification"); + t.notDeepEqual(integrity1, integrity2, "New integrity is different from original"); }); -test("getHash: Works with empty content", async (t) => { +test("getIntegrity: Works with empty content", async (t) => { const resource = new Resource({ path: "/my/path/to/resource", string: "" }); - const hash = await resource.getHash(); - t.is(typeof hash, "string", "Hash is a string"); - t.true(hash.startsWith("sha256-"), "Hash starts with sha256-"); - t.is(hash, "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=", "Correct hash for empty content"); + const integrity = await resource.getIntegrity(); + + t.deepEqual(integrity, ssri.parse({ + sha256: [ + { + algorithm: "sha256", + digest: "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=", + options: [], + source: "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=" + } + ] + }), "Correct integrity for empty content"); }); -test("getHash: Works with large content", async (t) => { +test("getIntegrity: Works with large content", async (t) => { const largeContent = "x".repeat(1024 * 1024); // 1MB of 'x' const resource = new Resource({ path: "/my/path/to/resource", string: largeContent }); - const hash = await resource.getHash(); - t.is(typeof hash, "string", "Hash is a string"); - t.true(hash.startsWith("sha256-"), "Hash starts with sha256-"); - // Hash of 1MB of 'x' characters - t.is(hash, "sha256-j5kLoLV3tRzwCeoEk2jBa72hsh4bk74HqCR1i7JTw5s=", "Correct hash for large content"); + const integrity = await resource.getIntegrity(); + + t.deepEqual(integrity, ssri.parse({ + sha256: [ + { + algorithm: "sha256", + digest: "j5kLoLV3tRzwCeoEk2jBa72hsh4bk74HqCR1i7JTw5s=", + options: [], + source: "sha256-j5kLoLV3tRzwCeoEk2jBa72hsh4bk74HqCR1i7JTw5s=" + } + ] + }), "Correct integrity for large content"); }); From 3d3bd92ec9af924162b7b851cc9dea8a851ed784 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Wed, 17 Dec 2025 13:21:41 +0100 Subject: [PATCH 026/110] refactor: Integrity handling getIntegrity tests still need to be updated --- packages/fs/lib/Resource.js | 6 +++--- packages/project/lib/build/cache/CacheManager.js | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/fs/lib/Resource.js b/packages/fs/lib/Resource.js index a60d8ca8970..f3642c69e4d 100644 --- a/packages/fs/lib/Resource.js +++ b/packages/fs/lib/Resource.js @@ -554,15 +554,15 @@ class Resource { switch (this.#contentType) { case CONTENT_TYPES.BUFFER: - this.#integrity = ssri.fromData(this.#content, SSRI_OPTIONS); + this.#integrity = ssri.fromData(this.#content, SSRI_OPTIONS).toString(); break; case CONTENT_TYPES.FACTORY: - this.#integrity = await ssri.fromStream(this.#createStreamFactory(), SSRI_OPTIONS); + this.#integrity = (await ssri.fromStream(this.#createStreamFactory(), SSRI_OPTIONS)).toString(); break; case CONTENT_TYPES.STREAM: // To be discussed: Should we read the stream into a buffer here (using #getBufferFromStream) to avoid // draining it? - this.#integrity = ssri.fromData(await this.#getBufferFromStream(this.#content), SSRI_OPTIONS); + this.#integrity = ssri.fromData(await this.#getBufferFromStream(this.#content), SSRI_OPTIONS).toString(); break; case CONTENT_TYPES.DRAINED_STREAM: throw new Error(`Unexpected error: Content of Resource ${this.#path} is flagged as drained.`); diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index 963a92489e6..f39e7ac0541 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -87,10 +87,10 @@ export default class CacheManager { log.info(`Integrity mismatch for cache entry ` + `${cacheKey}: expected ${integrity}, got ${result.integrity}`); - const res = await cacache.get.byDigest(this.#casDir, result.integrity); + const res = await cacache.get.byDigest(this.#casDir, integrity); if (res) { log.info(`Updating cache entry with expectation...`); - await this.writeStage(buildSignature, stageId, resourcePath, res.data); + await this.writeStage(buildSignature, stageId, resourcePath, res); return await this.getResourcePathForStage(buildSignature, stageId, resourcePath, integrity); } } From 7ddd47ca96dffaeb213c0b688688f92f90583712 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Wed, 17 Dec 2025 13:47:30 +0100 Subject: [PATCH 027/110] test(fs): Adjust getIntegrity tests again --- packages/fs/test/lib/Resource.js | 165 +++++++------------------------ 1 file changed, 34 insertions(+), 131 deletions(-) diff --git a/packages/fs/test/lib/Resource.js b/packages/fs/test/lib/Resource.js index d48b2828330..aa0d64fa507 100644 --- a/packages/fs/test/lib/Resource.js +++ b/packages/fs/test/lib/Resource.js @@ -4,7 +4,6 @@ import {Stream, Transform} from "node:stream"; import {statSync, createReadStream} from "node:fs"; import {stat, readFile} from "node:fs/promises"; import path from "node:path"; -import ssri from "ssri"; import Resource from "../../lib/Resource.js"; function createBasicResource() { @@ -1595,16 +1594,8 @@ test("getIntegrity: Returns integrity for buffer content", async (t) => { }); const integrity = await resource.getIntegrity(); - t.deepEqual(integrity, ssri.parse({ - sha256: [ - { - algorithm: "sha256", - digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", - options: [], - source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" - } - ] - }), "Correct integrity for content"); + t.is(integrity, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + "Correct integrity for content"); }); test("getIntegrity: Returns integrity for stream content", async (t) => { @@ -1619,16 +1610,8 @@ test("getIntegrity: Returns integrity for stream content", async (t) => { }); const integrity = await resource.getIntegrity(); - t.deepEqual(integrity, ssri.parse({ - sha256: [ - { - algorithm: "sha256", - digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", - options: [], - source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" - } - ] - }), "Correct integrity for content"); + t.is(integrity, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + "Correct integrity for content"); }); test("getIntegrity: Returns integrity for factory content", async (t) => { @@ -1645,16 +1628,8 @@ test("getIntegrity: Returns integrity for factory content", async (t) => { }); const integrity = await resource.getIntegrity(); - t.deepEqual(integrity, ssri.parse({ - sha256: [ - { - algorithm: "sha256", - digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", - options: [], - source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" - } - ] - }), "Correct integrity for content"); + t.is(integrity, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + "Correct integrity for content"); }); test("getIntegrity: Throws error for resource with no content", async (t) => { @@ -1681,7 +1656,7 @@ test("getIntegrity: Different content produces different integrities", async (t) const integrity1 = await resource1.getIntegrity(); const integrity2 = await resource2.getIntegrity(); - t.notDeepEqual(integrity1, integrity2, "Different content produces different integrities"); + t.not(integrity1, integrity2, "Different content produces different integrities"); }); test("getIntegrity: Same content produces same integrity", async (t) => { @@ -1709,8 +1684,8 @@ test("getIntegrity: Same content produces same integrity", async (t) => { const integrity2 = await resource2.getIntegrity(); const integrity3 = await resource3.getIntegrity(); - t.deepEqual(integrity1, integrity2, "Same content produces same integrity for string and buffer content"); - t.deepEqual(integrity1, integrity3, "Same content produces same integrity for string and stream"); + t.is(integrity1, integrity2, "Same content produces same integrity for string and buffer content"); + t.is(integrity1, integrity3, "Same content produces same integrity for string and stream"); }); test("getIntegrity: Waits for drained content", async (t) => { @@ -1726,16 +1701,8 @@ test("getIntegrity: Waits for drained content", async (t) => { resource.setString("New content"); const integrity = await p1; - t.deepEqual(integrity, ssri.parse({ - sha256: [ - { - algorithm: "sha256", - digest: "EvQbHDId8MgpzlgZllZv3lKvbK/h0qDHRmzeU+bxPMo=", - options: [], - source: "sha256-EvQbHDId8MgpzlgZllZv3lKvbK/h0qDHRmzeU+bxPMo=" - } - ] - }), "Correct integrity for new content"); + t.is(integrity, "sha256-EvQbHDId8MgpzlgZllZv3lKvbK/h0qDHRmzeU+bxPMo=", + "Correct integrity for new content"); }); test("getIntegrity: Waits for content transformation to complete", async (t) => { @@ -1758,16 +1725,8 @@ test("getIntegrity: Waits for content transformation to complete", async (t) => // Both should complete successfully await bufferPromise; const integrity = await integrityPromise; - t.deepEqual(integrity, ssri.parse({ - sha256: [ - { - algorithm: "sha256", - digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", - options: [], - source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" - } - ] - }), "Correct integrity after waiting for transformation"); + t.is(integrity, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + "Correct integrity after waiting for transformation"); }); test("getIntegrity: Can be called multiple times on buffer content", async (t) => { @@ -1780,19 +1739,11 @@ test("getIntegrity: Can be called multiple times on buffer content", async (t) = const integrity2 = await resource.getIntegrity(); const integrity3 = await resource.getIntegrity(); - t.deepEqual(integrity1, integrity2, "First and second integrity are identical"); - t.deepEqual(integrity2, integrity3, "Second and third integrity are identical"); + t.is(integrity1, integrity2, "First and second integrity are identical"); + t.is(integrity2, integrity3, "Second and third integrity are identical"); - t.deepEqual(integrity1, ssri.parse({ - sha256: [ - { - algorithm: "sha256", - digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", - options: [], - source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" - } - ] - }), "Correct integrity for content"); + t.is(integrity1, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + "Correct integrity for content"); }); test("getIntegrity: Can be called multiple times on factory content", async (t) => { @@ -1812,19 +1763,11 @@ test("getIntegrity: Can be called multiple times on factory content", async (t) const integrity2 = await resource.getIntegrity(); const integrity3 = await resource.getIntegrity(); - t.deepEqual(integrity1, integrity2, "First and second integrity are identical"); - t.deepEqual(integrity2, integrity3, "Second and third integrity are identical"); + t.is(integrity1, integrity2, "First and second integrity are identical"); + t.is(integrity2, integrity3, "Second and third integrity are identical"); - t.deepEqual(integrity1, ssri.parse({ - sha256: [ - { - algorithm: "sha256", - digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", - options: [], - source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" - } - ] - }), "Correct integrity for content"); + t.is(integrity1, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + "Correct integrity for content"); }); test("getIntegrity: Can be called multiple times on stream content", async (t) => { @@ -1842,19 +1785,11 @@ test("getIntegrity: Can be called multiple times on stream content", async (t) = const integrity2 = await resource.getIntegrity(); const integrity3 = await resource.getIntegrity(); - t.deepEqual(integrity1, integrity2, "First and second integrity are identical"); - t.deepEqual(integrity2, integrity3, "Second and third integrity are identical"); + t.is(integrity1, integrity2, "First and second integrity are identical"); + t.is(integrity2, integrity3, "Second and third integrity are identical"); - t.deepEqual(integrity1, ssri.parse({ - sha256: [ - { - algorithm: "sha256", - digest: "R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", - options: [], - source: "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=" - } - ] - }), "Correct integrity for content"); + t.is(integrity1, "sha256-R70pB1+LgBnwvuxthr7afJv2eq8FBT3L4LO8tjloUX8=", + "Correct integrity for content"); }); test("getIntegrity: Integrity changes after content modification", async (t) => { @@ -1864,31 +1799,15 @@ test("getIntegrity: Integrity changes after content modification", async (t) => }); const integrity1 = await resource.getIntegrity(); - t.deepEqual(integrity1, ssri.parse({ - sha256: [ - { - algorithm: "sha256", - digest: "OUni2q0Lopc2NkTnXeaaYPNQJNUATQtbAqMWJvtCVNo=", - options: [], - source: "sha256-OUni2q0Lopc2NkTnXeaaYPNQJNUATQtbAqMWJvtCVNo=" - } - ] - }), "Correct integrity for original content"); + t.is(integrity1, "sha256-OUni2q0Lopc2NkTnXeaaYPNQJNUATQtbAqMWJvtCVNo=", + "Correct integrity for original content"); resource.setString("Modified content"); const integrity2 = await resource.getIntegrity(); - t.deepEqual(integrity2, ssri.parse({ - sha256: [ - { - algorithm: "sha256", - digest: "8fba0TDG5CusKMUf/7GVTTxaYjVbRXacQv2lt3RdtT8=", - options: [], - source: "sha256-8fba0TDG5CusKMUf/7GVTTxaYjVbRXacQv2lt3RdtT8=" - } - ] - }), "Integrity changes after content modification"); - t.notDeepEqual(integrity1, integrity2, "New integrity is different from original"); + t.is(integrity2, "sha256-8fba0TDG5CusKMUf/7GVTTxaYjVbRXacQv2lt3RdtT8=", + "Integrity changes after content modification"); + t.not(integrity1, integrity2, "New integrity is different from original"); }); test("getIntegrity: Works with empty content", async (t) => { @@ -1899,16 +1818,8 @@ test("getIntegrity: Works with empty content", async (t) => { const integrity = await resource.getIntegrity(); - t.deepEqual(integrity, ssri.parse({ - sha256: [ - { - algorithm: "sha256", - digest: "47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=", - options: [], - source: "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=" - } - ] - }), "Correct integrity for empty content"); + t.is(integrity, "sha256-47DEQpj8HBSa+/TImW+5JCeuQeRkm5NMpJWZG3hSuFU=", + "Correct integrity for empty content"); }); test("getIntegrity: Works with large content", async (t) => { @@ -1920,14 +1831,6 @@ test("getIntegrity: Works with large content", async (t) => { const integrity = await resource.getIntegrity(); - t.deepEqual(integrity, ssri.parse({ - sha256: [ - { - algorithm: "sha256", - digest: "j5kLoLV3tRzwCeoEk2jBa72hsh4bk74HqCR1i7JTw5s=", - options: [], - source: "sha256-j5kLoLV3tRzwCeoEk2jBa72hsh4bk74HqCR1i7JTw5s=" - } - ] - }), "Correct integrity for large content"); + t.is(integrity, "sha256-j5kLoLV3tRzwCeoEk2jBa72hsh4bk74HqCR1i7JTw5s=", + "Correct integrity for large content"); }); From e44888a7d3b10838c69961cb049808ec3b2b70c8 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Wed, 17 Dec 2025 13:53:56 +0100 Subject: [PATCH 028/110] refactor: Consider npm-shrinkwrap.json --- packages/project/lib/build/helpers/calculateBuildSignature.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/project/lib/build/helpers/calculateBuildSignature.js b/packages/project/lib/build/helpers/calculateBuildSignature.js index 620c3523715..a64e05e842a 100644 --- a/packages/project/lib/build/helpers/calculateBuildSignature.js +++ b/packages/project/lib/build/helpers/calculateBuildSignature.js @@ -40,8 +40,12 @@ async function getVersion(pkg) { async function getLockfileHash(project) { const rootReader = project.getRootReader({useGitIgnore: false}); const lockfiles = await Promise.all([ + // npm await rootReader.byPath("/package-lock.json"), + await rootReader.byPath("/npm-shrinkwrap.json"), + // Yarn await rootReader.byPath("/yarn.lock"), + // pnpm await rootReader.byPath("/pnpm-lock.yaml"), ]); let hash = ""; From 8956372e0aa67a4ed7d7c0584beabdda68d04cda Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 17 Dec 2025 13:51:11 +0100 Subject: [PATCH 029/110] refactor: Rename Tracker => MonitoredReader --- packages/fs/lib/{Tracker.js => MonitoredReader.js} | 2 +- .../lib/{DuplexTracker.js => MonitoredReaderWriter.js} | 4 +--- packages/fs/lib/resourceFactory.js | 10 +++++----- packages/project/lib/build/TaskRunner.js | 6 +++--- packages/project/lib/build/cache/ProjectBuildCache.js | 10 +++++----- 5 files changed, 15 insertions(+), 17 deletions(-) rename packages/fs/lib/{Tracker.js => MonitoredReader.js} (96%) rename packages/fs/lib/{DuplexTracker.js => MonitoredReaderWriter.js} (95%) diff --git a/packages/fs/lib/Tracker.js b/packages/fs/lib/MonitoredReader.js similarity index 96% rename from packages/fs/lib/Tracker.js rename to packages/fs/lib/MonitoredReader.js index ed19019e364..db2acaf4c8d 100644 --- a/packages/fs/lib/Tracker.js +++ b/packages/fs/lib/MonitoredReader.js @@ -1,6 +1,6 @@ import AbstractReader from "./AbstractReader.js"; -export default class Trace extends AbstractReader { +export default class MonitoredReader extends AbstractReader { #reader; #sealed = false; #pathsRead = []; diff --git a/packages/fs/lib/DuplexTracker.js b/packages/fs/lib/MonitoredReaderWriter.js similarity index 95% rename from packages/fs/lib/DuplexTracker.js rename to packages/fs/lib/MonitoredReaderWriter.js index 2ccdb56b1a4..22b46c12b79 100644 --- a/packages/fs/lib/DuplexTracker.js +++ b/packages/fs/lib/MonitoredReaderWriter.js @@ -1,8 +1,6 @@ import AbstractReaderWriter from "./AbstractReaderWriter.js"; -// TODO: Alternative name: Inspector/Interceptor/... - -export default class Trace extends AbstractReaderWriter { +export default class MonitoredReaderWriter extends AbstractReaderWriter { #readerWriter; #sealed = false; #pathsRead = []; diff --git a/packages/fs/lib/resourceFactory.js b/packages/fs/lib/resourceFactory.js index cffc34f36ba..4309d8f096d 100644 --- a/packages/fs/lib/resourceFactory.js +++ b/packages/fs/lib/resourceFactory.js @@ -10,8 +10,8 @@ import WriterCollection from "./WriterCollection.js"; import Filter from "./readers/Filter.js"; import Link from "./readers/Link.js"; import Proxy from "./readers/Proxy.js"; -import Tracker from "./Tracker.js"; -import DuplexTracker from "./DuplexTracker.js"; +import MonitoredReader from "./MonitoredReader.js"; +import MonitoredReaderWriter from "./MonitoredReaderWriter.js"; import {getLogger} from "@ui5/logger"; const log = getLogger("resources:resourceFactory"); @@ -277,11 +277,11 @@ export function createFlatReader({name, reader, namespace}) { }); } -export function createTracker(readerWriter) { +export function createMonitor(readerWriter) { if (readerWriter instanceof DuplexCollection) { - return new DuplexTracker(readerWriter); + return new MonitoredReaderWriter(readerWriter); } - return new Tracker(readerWriter); + return new MonitoredReader(readerWriter); } /** diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index a88f1f69409..dd874116768 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -1,6 +1,6 @@ import {getLogger} from "@ui5/logger"; import composeTaskList from "./helpers/composeTaskList.js"; -import {createReaderCollection, createTracker} from "@ui5/fs/resourceFactory"; +import {createReaderCollection, createMonitor} from "@ui5/fs/resourceFactory"; /** * TaskRunner @@ -204,7 +204,7 @@ class TaskRunner { this._log.info( `Executing task ${taskName} for project ${this._project.getName()}`); - const workspace = createTracker(this._project.getWorkspace()); + const workspace = createMonitor(this._project.getWorkspace()); const params = { workspace, taskUtil: this._taskUtil, @@ -225,7 +225,7 @@ class TaskRunner { let dependencies; if (requiresDependencies) { - dependencies = createTracker(this._allDependenciesReader); + dependencies = createMonitor(this._allDependenciesReader); params.dependencies = dependencies; } diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 7a8db0cef2f..bda0968d886 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -49,13 +49,13 @@ export default class ProjectBuildCache { * * @param {string} taskName Name of the executed task * @param {Set|undefined} expectedOutput Expected output resource paths - * @param {object} workspaceTracker Tracker that monitored workspace reads - * @param {object} [dependencyTracker] Tracker that monitored dependency reads + * @param {object} workspaceMonitor Tracker that monitored workspace reads + * @param {object} [dependencyMonitor] Tracker that monitored dependency reads * @returns {Promise} */ - async recordTaskResult(taskName, expectedOutput, workspaceTracker, dependencyTracker) { - const projectTrackingResults = workspaceTracker.getResults(); - const dependencyTrackingResults = dependencyTracker?.getResults(); + async recordTaskResult(taskName, expectedOutput, workspaceMonitor, dependencyMonitor) { + const projectTrackingResults = workspaceMonitor.getResults(); + const dependencyTrackingResults = dependencyMonitor?.getResults(); const resourcesRead = projectTrackingResults.resourcesRead; if (dependencyTrackingResults) { From d5e8f91e8b8c634546707012a1e634836900ebbf Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 17 Dec 2025 13:51:49 +0100 Subject: [PATCH 030/110] refactor(project): Use workspace version in stage name --- packages/project/lib/specifications/Project.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index 90add986ec4..5ed61de2a9e 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -20,6 +20,7 @@ class Project extends Specification { #currentStage; #currentStageReadIndex = -1; #currentStageName = ""; + #workspaceVersion = 0; constructor(parameters) { super(parameters); @@ -370,8 +371,9 @@ class Project extends Specification { * */ sealWorkspace() { + this.#workspaceVersion++; this.#currentStage = null; // Unset stage - This blocks further getWorkspace() calls - this.#currentStageName = ""; + this.#currentStageName = ``; this.#currentStageReadIndex = this.#stages.length - 1; // Read from all stages // Unset "current" reader/writer. They will be recreated on demand From e1a4d72a31f469b2fa37611b63f633f469e794a3 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 17 Dec 2025 14:09:29 +0100 Subject: [PATCH 031/110] refactor(project): Fix stage writer order --- packages/project/lib/specifications/Project.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index 5ed61de2a9e..3a50a1382ab 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -462,7 +462,7 @@ class Project extends Specification { class Stage { #id; - #writerVersions = []; + #writerVersions = []; // First element is the latest writer #cacheReader; constructor(id, cacheReader) { @@ -475,16 +475,16 @@ class Stage { } newVersion(writer) { - this.#writerVersions.push(writer); + this.#writerVersions.unshift(writer); } getWriter() { - return this.#writerVersions[this.#writerVersions.length - 1]; + return this.#writerVersions[0]; } getAllWriters(includeCache = true) { if (includeCache && this.#cacheReader) { - return [this.#cacheReader, ...this.#writerVersions]; + return [...this.#writerVersions, this.#cacheReader]; } return this.#writerVersions; } From 208104123913bef35d784547a3d42638471a65b4 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 17 Dec 2025 16:27:18 +0100 Subject: [PATCH 032/110] refactor(fs): Add Switch reader --- packages/fs/lib/readers/Switch.js | 82 ++++++++++++++++++++++++++++++ packages/fs/lib/resourceFactory.js | 14 +++++ 2 files changed, 96 insertions(+) create mode 100644 packages/fs/lib/readers/Switch.js diff --git a/packages/fs/lib/readers/Switch.js b/packages/fs/lib/readers/Switch.js new file mode 100644 index 00000000000..ed2bf2cca83 --- /dev/null +++ b/packages/fs/lib/readers/Switch.js @@ -0,0 +1,82 @@ +import AbstractReader from "../AbstractReader.js"; + +/** + * Reader allowing to switch its underlying reader at runtime. + * If no reader is set, read operations will be halted/paused until a reader is set. + */ +export default class Switch extends AbstractReader { + #reader; + #pendingCalls = []; + + constructor({name, reader}) { + super(name); + this.#reader = reader; + } + + /** + * Sets the underlying reader and processes any pending read operations. + * + * @param {@ui5/fs/AbstractReader} reader The reader to delegate to. + */ + setReader(reader) { + this.#reader = reader; + this._processPendingCalls(); + } + + /** + * Unsets the underlying reader. Future calls will be queued. + */ + unsetReader() { + this.#reader = null; + } + + async _byGlob(virPattern, options, trace) { + if (this.#reader) { + return this.#reader._byGlob(virPattern, options, trace); + } + + // No reader set, so we queue the call and return a pending promise + return this._enqueueCall("_byGlob", [virPattern, options, trace]); + } + + + async _byPath(virPath, options, trace) { + if (this.#reader) { + return this.#reader._byPath(virPath, options, trace); + } + + // No reader set, so we queue the call and return a pending promise + return this._enqueueCall("_byPath", [virPath, options, trace]); + } + + /** + * Queues a method call by returning a promise and storing its resolver. + * + * @param {string} methodName The method name to call later. + * @param {Array} args The arguments to pass to the method. + * @returns {Promise} A promise that will be resolved/rejected when the call is processed. + */ + _enqueueCall(methodName, args) { + return new Promise((resolve, reject) => { + this.#pendingCalls.push({methodName, args, resolve, reject}); + }); + } + + /** + * Processes all pending calls in the queue using the current reader. + * + * @private + */ + _processPendingCalls() { + const callsToProcess = this.#pendingCalls; + this.#pendingCalls = []; // Clear queue immediately to prevent race conditions + + for (const call of callsToProcess) { + const {methodName, args, resolve, reject} = call; + // Execute the pending call with the newly set reader + this.#reader[methodName](...args) + .then(resolve) + .catch(reject); + } + } +} diff --git a/packages/fs/lib/resourceFactory.js b/packages/fs/lib/resourceFactory.js index 4309d8f096d..4943838d1d2 100644 --- a/packages/fs/lib/resourceFactory.js +++ b/packages/fs/lib/resourceFactory.js @@ -10,6 +10,7 @@ import WriterCollection from "./WriterCollection.js"; import Filter from "./readers/Filter.js"; import Link from "./readers/Link.js"; import Proxy from "./readers/Proxy.js"; +import Switch from "./readers/Switch.js"; import MonitoredReader from "./MonitoredReader.js"; import MonitoredReaderWriter from "./MonitoredReaderWriter.js"; import {getLogger} from "@ui5/logger"; @@ -277,6 +278,19 @@ export function createFlatReader({name, reader, namespace}) { }); } +export function createSwitch({name, reader}) { + return new Switch({ + name, + reader: reader, + }); +} + +/** + * Creates a monitored reader or reader-writer depending on the provided instance + * of the given readerWriter. + * + * @param {@ui5/fs/AbstractReader|@ui5/fs/AbstractReaderWriter} readerWriter Reader or ReaderWriter to monitor + */ export function createMonitor(readerWriter) { if (readerWriter instanceof DuplexCollection) { return new MonitoredReaderWriter(readerWriter); From 3b937f2af35a0fe5647d0c14e891986c17d7e67f Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 17 Dec 2025 16:27:50 +0100 Subject: [PATCH 033/110] refactor(project): Cleanup WatchHandler debounce --- .../project/lib/build/helpers/WatchHandler.js | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/project/lib/build/helpers/WatchHandler.js b/packages/project/lib/build/helpers/WatchHandler.js index 251b67a77fd..860256f3b47 100644 --- a/packages/project/lib/build/helpers/WatchHandler.js +++ b/packages/project/lib/build/helpers/WatchHandler.js @@ -65,7 +65,7 @@ class WatchHandler extends EventEmitter { } async #fileChanged(project, filePath) { - // Collect changes (grouped by project), then trigger callbacks (debounced) + // Collect changes (grouped by project), then trigger callbacks const resourcePath = project.getVirtualPath(filePath); if (!this.#sourceChanges.has(project)) { this.#sourceChanges.set(project, new Set()); @@ -73,18 +73,13 @@ class WatchHandler extends EventEmitter { this.#sourceChanges.get(project).add(resourcePath); // Trigger callbacks debounced - if (!this.#fileChangeHandlerTimeout) { - this.#fileChangeHandlerTimeout = setTimeout(async () => { - await this.#handleResourceChanges(); - this.#fileChangeHandlerTimeout = null; - }, 100); - } else { + if (this.#fileChangeHandlerTimeout) { clearTimeout(this.#fileChangeHandlerTimeout); - this.#fileChangeHandlerTimeout = setTimeout(async () => { - await this.#handleResourceChanges(); - this.#fileChangeHandlerTimeout = null; - }, 100); } + this.#fileChangeHandlerTimeout = setTimeout(async () => { + await this.#handleResourceChanges(); + this.#fileChangeHandlerTimeout = null; + }, 100); } async #handleResourceChanges() { From fc8df523c4e7eac2bb1447ba284000bf0ae7f5c1 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 17 Dec 2025 16:28:20 +0100 Subject: [PATCH 034/110] refactor(project): Fix outdated API call --- packages/project/lib/build/helpers/ProjectBuildContext.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/project/lib/build/helpers/ProjectBuildContext.js b/packages/project/lib/build/helpers/ProjectBuildContext.js index 547f85076e5..038f25bc638 100644 --- a/packages/project/lib/build/helpers/ProjectBuildContext.js +++ b/packages/project/lib/build/helpers/ProjectBuildContext.js @@ -176,7 +176,7 @@ class ProjectBuildContext { // Propagate changes to all dependents of the project for (const {project: dep} of graph.traverseDependents(this._project.getName())) { const projectBuildContext = this._buildContext.getBuildContext(dep.getName()); - projectBuildContext.getBuildCache().this.markResourcesChanged(emptySet, updatedResourcePaths); + projectBuildContext.getBuildCache().resourceChanged(emptySet, updatedResourcePaths); } } From 222df46e49ac03fc9649194630a78eda95ca15b2 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 17 Dec 2025 17:18:57 +0100 Subject: [PATCH 035/110] refactor(project): Fix build signature calculation --- .../build/helpers/calculateBuildSignature.js | 42 +++++++++++++++---- 1 file changed, 34 insertions(+), 8 deletions(-) diff --git a/packages/project/lib/build/helpers/calculateBuildSignature.js b/packages/project/lib/build/helpers/calculateBuildSignature.js index a64e05e842a..6ca04986bf0 100644 --- a/packages/project/lib/build/helpers/calculateBuildSignature.js +++ b/packages/project/lib/build/helpers/calculateBuildSignature.js @@ -40,6 +40,7 @@ async function getVersion(pkg) { async function getLockfileHash(project) { const rootReader = project.getRootReader({useGitIgnore: false}); const lockfiles = await Promise.all([ + // TODO: Search upward for lockfiles in parent directories? // npm await rootReader.byPath("/package-lock.json"), await rootReader.byPath("/npm-shrinkwrap.json"), @@ -59,18 +60,43 @@ async function getLockfileHash(project) { } function collectDepInfo(graph, project) { - const projects = Object.create(null); + let projects = []; for (const depName of graph.getTransitiveDependencies(project.getName())) { const dep = graph.getProject(depName); - projects[depName] = { + projects.push({ + name: dep.getName(), version: dep.getVersion() - }; + }); } - const extensions = Object.create(null); - for (const extension of graph.getExtensions()) { - extensions[extension.getName()] = { - version: extension.getVersion() - }; + projects = projects.sort((a, b) => { + return a.name.localeCompare(b.name); + }); + + // Collect relevant extensions + let extensions = []; + if (graph.getRoot() === project) { + // Custom middleware is only relevant for root project + project.getCustomMiddleware().forEach((middlewareDef) => { + const extension = graph.getExtension(middlewareDef.name); + if (extension) { + extensions.push({ + name: extension.getName(), + version: extension.getVersion() + }); + } + }); } + project.getCustomTasks().forEach((taskDef) => { + const extension = graph.getExtension(taskDef.name); + if (extension) { + extensions.push({ + name: extension.getName(), + version: extension.getVersion() + }); + } + }); + extensions = extensions.sort((a, b) => { + return a.name.localeCompare(b.name); + }); return {projects, extensions}; } From 81bd91227aa5ab23d5e0b243335342fdd626d16b Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 17 Dec 2025 21:11:56 +0100 Subject: [PATCH 036/110] refactor(fs): Pass integrity to cloned resource --- packages/fs/lib/Resource.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/fs/lib/Resource.js b/packages/fs/lib/Resource.js index f3642c69e4d..451580d308f 100644 --- a/packages/fs/lib/Resource.js +++ b/packages/fs/lib/Resource.js @@ -786,6 +786,7 @@ class Resource { isDirectory: this.#isDirectory, byteSize: this.#byteSize, lastModified: this.#lastModified, + integrity: this.#integrity, sourceMetadata: clone(this.#sourceMetadata) }; From 02bdfe3619cf982448ec6bd56879f7432a9ad43e Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 17 Dec 2025 21:12:56 +0100 Subject: [PATCH 037/110] refactor(project): Fix pattern matching and resource comparison --- packages/project/lib/build/cache/BuildTaskCache.js | 6 +++--- .../project/lib/build/cache/ProjectBuildCache.js | 4 ++-- packages/project/lib/build/cache/utils.js | 14 +++++++------- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index c5ad3785a87..7f1649e953f 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -188,7 +188,7 @@ export default class BuildTaskCache { * @param {object} resource - Resource instance to check * @returns {Promise} True if resource is in cache with matching content */ - async hasResourceInReadCache(resource) { + async matchResourceInReadCache(resource) { const cachedResource = this.#resourcesRead[resource.getPath()]; if (!cachedResource) { return false; @@ -206,7 +206,7 @@ export default class BuildTaskCache { * @param {object} resource - Resource instance to check * @returns {Promise} True if resource is in cache with matching content */ - async hasResourceInWriteCache(resource) { + async matchResourceInWriteCache(resource) { const cachedResource = this.#resourcesWritten[resource.getPath()]; if (!cachedResource) { return false; @@ -223,7 +223,7 @@ export default class BuildTaskCache { if (pathsRead.includes(resourcePath)) { return true; } - if (patterns.length && micromatch.isMatch(resourcePath, patterns)) { + if (patterns.length && micromatch(resourcePath, patterns).length > 0) { return true; } } diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index bda0968d886..ffcf3f059a4 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -81,7 +81,7 @@ export default class ProjectBuildCache { const changedPaths = new Set((await Promise.all(writtenResourcePaths .map(async (resourcePath) => { // Check whether resource content actually changed - if (await taskCache.hasResourceInWriteCache(resourcesWritten[resourcePath])) { + if (await taskCache.matchResourceInWriteCache(resourcesWritten[resourcePath])) { return undefined; } return resourcePath; @@ -224,7 +224,7 @@ export default class ProjectBuildCache { if (!taskCache) { throw new Error(`Failed to validate changed resources for task ${taskName}: Task cache not found`); } - if (await taskCache.hasResourceInReadCache(resource)) { + if (await taskCache.matchResourceInReadCache(resource)) { log.verbose(`Resource content has not changed for task ${taskName}, ` + `removing ${resourcePath} from set of changed resource paths`); changedResourcePaths.delete(resourcePath); diff --git a/packages/project/lib/build/cache/utils.js b/packages/project/lib/build/cache/utils.js index cd45c9f3444..de32b3f39a7 100644 --- a/packages/project/lib/build/cache/utils.js +++ b/packages/project/lib/build/cache/utils.js @@ -24,15 +24,15 @@ export async function areResourcesEqual(resourceA, resourceB) { if (resourceA.getOriginalPath() !== resourceB.getOriginalPath()) { throw new Error("Cannot compare resources with different original paths"); } - if (resourceA.getLastModified() !== resourceB.getLastModified()) { - return false; + if (resourceA.getLastModified() === resourceB.getLastModified()) { + return true; + } + if (await resourceA.getSize() === await resourceB.getSize()) { + return true; } - if (await resourceA.getSize() !== resourceB.getSize()) { - return false; + if (await resourceA.getIntegrity() === await resourceB.getIntegrity()) { + return true; } - // if (await resourceA.getString() === await resourceB.getString()) { - // return true; - // } return false; } From bf40958bbf73cd923e33b4b1a18d4bd00e9304a2 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Thu, 18 Dec 2025 09:51:42 +0100 Subject: [PATCH 038/110] refactor(project): Import/overwrite stages from cache after saving --- .../lib/build/cache/ProjectBuildCache.js | 4 ++- .../project/lib/specifications/Project.js | 28 ++++++++----------- 2 files changed, 14 insertions(+), 18 deletions(-) diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index ffcf3f059a4..29fce6b459b 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -365,6 +365,9 @@ export default class ProjectBuildCache { await this.#cacheManager.writeBuildManifest( this.#project, this.#buildSignature, buildManifest); + + // Import cached stages back into project to prevent inconsistent state during next build/save + await this.#importCachedStages(buildManifest.cache.stages); } #getStageNameForTask(taskName) { @@ -392,7 +395,6 @@ export default class ProjectBuildCache { })); return [stageId, resourceMetadata]; })); - // Optional TODO: Re-import cache as base layer to reduce memory pressure? } async #checkForIndexChanges(index, indexTimestamp) { diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index 3a50a1382ab..d1035ee02e6 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -381,6 +381,16 @@ class Project extends Specification { this.#currentStageWorkspace = null; } + _resetStages() { + this.#stages = []; + this.#currentStage = null; + this.#currentStageName = ""; + this.#currentStageReadIndex = -1; + this.#currentStageReaders = new Map(); + this.#currentStageWorkspace = null; + this.#workspaceVersion = 0; + } + #getReaderForStage(stage, style = "buildtime", includeCache = true) { const writers = stage.getAllWriters(includeCache); const readers = []; @@ -406,23 +416,7 @@ class Project extends Specification { } setStages(stageIds, cacheReaders) { - if (this.#stages.length > 0) { - // Stages have already been set. Compare existing stages with new ones and throw on mismatch - for (let i = 0; i < stageIds.length; i++) { - const stageId = stageIds[i]; - if (this.#stages[i].getId() !== stageId) { - throw new Error( - `Unable to set stages for project ${this.getName()}: Stage mismatch at position ${i} ` + - `(existing: ${this.#stages[i].getId()}, new: ${stageId})`); - } - } - if (cacheReaders?.length) { - throw new Error( - `Unable to set stages for project ${this.getName()}: Cache readers can only be set ` + - `when stages are created for the first time`); - } - return; // Stages already set and matching, no further processing needed - } + this._resetStages(); // Reset current stages and metadata for (let i = 0; i < stageIds.length; i++) { const stageId = stageIds[i]; const newStage = new Stage(stageId, cacheReaders?.[i]); From 4f70a8f38391bcab58043ffb9581c02e52c4a65b Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Fri, 19 Dec 2025 11:04:16 +0100 Subject: [PATCH 039/110] test(builder): Sort files/folders --- packages/builder/test/utils/fshelper.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/test/utils/fshelper.js b/packages/builder/test/utils/fshelper.js index 25e74974b79..9d069654a92 100644 --- a/packages/builder/test/utils/fshelper.js +++ b/packages/builder/test/utils/fshelper.js @@ -11,8 +11,8 @@ export async function readFileContent(filePath) { } export async function directoryDeepEqual(t, destPath, expectedPath) { - const dest = await readdir(destPath, {recursive: true}); - const expected = await readdir(expectedPath, {recursive: true}); + const dest = (await readdir(destPath, {recursive: true})).sort(); + const expected = (await readdir(expectedPath, {recursive: true})).sort(); t.deepEqual(dest, expected); } From 3fb4d755944518221e5f2e2e7cff3c18e7639e3c Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Fri, 19 Dec 2025 11:05:03 +0100 Subject: [PATCH 040/110] refactor(builder): Prevent duplicate entries on app build from cache --- packages/project/lib/specifications/ComponentProject.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/project/lib/specifications/ComponentProject.js b/packages/project/lib/specifications/ComponentProject.js index e78047d1f5e..3044d0f7d68 100644 --- a/packages/project/lib/specifications/ComponentProject.js +++ b/packages/project/lib/specifications/ComponentProject.js @@ -237,8 +237,10 @@ class ComponentProject extends Project { reader: namespaceWriter, namespace: this._namespace })); - // Add general writer as is - readers.push(generalWriter); + // Add general writer only if it differs to prevent duplicate entries (with and without namespace) + if (namespaceWriter !== generalWriter) { + readers.push(generalWriter); + } break; case "flat": // Rewrite paths from "flat" to "buildtime" From 3fa4d7f3f015cbfc29b3cf2ea50dd9ba0b1bda27 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 23 Dec 2025 21:32:26 +0100 Subject: [PATCH 041/110] refactor(fs): Refactor MonitorReader API --- packages/fs/lib/MonitoredReader.js | 36 ++++------------ packages/fs/lib/MonitoredReaderWriter.js | 52 ++++++++---------------- 2 files changed, 26 insertions(+), 62 deletions(-) diff --git a/packages/fs/lib/MonitoredReader.js b/packages/fs/lib/MonitoredReader.js index db2acaf4c8d..820b75169fe 100644 --- a/packages/fs/lib/MonitoredReader.js +++ b/packages/fs/lib/MonitoredReader.js @@ -3,23 +3,19 @@ import AbstractReader from "./AbstractReader.js"; export default class MonitoredReader extends AbstractReader { #reader; #sealed = false; - #pathsRead = []; + #paths = []; #patterns = []; - #resourcesRead = Object.create(null); constructor(reader) { super(reader.getName()); this.#reader = reader; } - getResults() { + getResourceRequests() { this.#sealed = true; return { - requests: { - pathsRead: this.#pathsRead, - patterns: this.#patterns, - }, - resourcesRead: this.#resourcesRead, + paths: this.#paths, + patterns: this.#patterns, }; } @@ -30,20 +26,10 @@ export default class MonitoredReader extends AbstractReader { if (this.#reader.resolvePattern) { const resolvedPattern = this.#reader.resolvePattern(virPattern); this.#patterns.push(resolvedPattern); - } else if (virPattern instanceof Array) { - for (const pattern of virPattern) { - this.#patterns.push(pattern); - } } else { this.#patterns.push(virPattern); } - const resources = await this.#reader._byGlob(virPattern, options, trace); - for (const resource of resources) { - if (!resource.getStatInfo()?.isDirectory()) { - this.#resourcesRead[resource.getOriginalPath()] = resource; - } - } - return resources; + return await this.#reader._byGlob(virPattern, options, trace); } async _byPath(virPath, options, trace) { @@ -53,17 +39,11 @@ export default class MonitoredReader extends AbstractReader { if (this.#reader.resolvePath) { const resolvedPath = this.#reader.resolvePath(virPath); if (resolvedPath) { - this.#pathsRead.push(resolvedPath); + this.#paths.push(resolvedPath); } } else { - this.#pathsRead.push(virPath); - } - const resource = await this.#reader._byPath(virPath, options, trace); - if (resource) { - if (!resource.getStatInfo()?.isDirectory()) { - this.#resourcesRead[resource.getOriginalPath()] = resource; - } + this.#paths.push(virPath); } - return resource; + return await this.#reader._byPath(virPath, options, trace); } } diff --git a/packages/fs/lib/MonitoredReaderWriter.js b/packages/fs/lib/MonitoredReaderWriter.js index 22b46c12b79..4a42c2980d6 100644 --- a/packages/fs/lib/MonitoredReaderWriter.js +++ b/packages/fs/lib/MonitoredReaderWriter.js @@ -3,49 +3,39 @@ import AbstractReaderWriter from "./AbstractReaderWriter.js"; export default class MonitoredReaderWriter extends AbstractReaderWriter { #readerWriter; #sealed = false; - #pathsRead = []; - #patterns = []; - #resourcesRead = Object.create(null); - #resourcesWritten = Object.create(null); + #paths = new Set(); + #patterns = new Set(); + #pathsWritten = new Set(); constructor(readerWriter) { super(readerWriter.getName()); this.#readerWriter = readerWriter; } - getResults() { + getResourceRequests() { this.#sealed = true; return { - requests: { - pathsRead: this.#pathsRead, - patterns: this.#patterns, - }, - resourcesRead: this.#resourcesRead, - resourcesWritten: this.#resourcesWritten, + paths: this.#paths, + patterns: this.#patterns, }; } + getWrittenResourcePaths() { + this.#sealed = true; + return this.#pathsWritten; + } + async _byGlob(virPattern, options, trace) { if (this.#sealed) { throw new Error(`Unexpected read operation after reader has been sealed`); } if (this.#readerWriter.resolvePattern) { const resolvedPattern = this.#readerWriter.resolvePattern(virPattern); - this.#patterns.push(resolvedPattern); - } else if (virPattern instanceof Array) { - for (const pattern of virPattern) { - this.#patterns.push(pattern); - } + this.#patterns.add(resolvedPattern); } else { - this.#patterns.push(virPattern); + this.#patterns.add(virPattern); } - const resources = await this.#readerWriter._byGlob(virPattern, options, trace); - for (const resource of resources) { - if (!resource.getStatInfo()?.isDirectory()) { - this.#resourcesRead[resource.getOriginalPath()] = resource; - } - } - return resources; + return await this.#readerWriter._byGlob(virPattern, options, trace); } async _byPath(virPath, options, trace) { @@ -55,18 +45,12 @@ export default class MonitoredReaderWriter extends AbstractReaderWriter { if (this.#readerWriter.resolvePath) { const resolvedPath = this.#readerWriter.resolvePath(virPath); if (resolvedPath) { - this.#pathsRead.push(resolvedPath); + this.#paths.add(resolvedPath); } } else { - this.#pathsRead.push(virPath); - } - const resource = await this.#readerWriter._byPath(virPath, options, trace); - if (resource) { - if (!resource.getStatInfo()?.isDirectory()) { - this.#resourcesRead[resource.getOriginalPath()] = resource; - } + this.#paths.add(virPath); } - return resource; + return await this.#readerWriter._byPath(virPath, options, trace); } async _write(resource, options) { @@ -76,7 +60,7 @@ export default class MonitoredReaderWriter extends AbstractReaderWriter { if (!resource) { throw new Error(`Cannot write undefined resource`); } - this.#resourcesWritten[resource.getOriginalPath()] = resource; + this.#pathsWritten.add(resource.getOriginalPath()); return this.#readerWriter.write(resource, options); } } From 4d584ce0849a3fbef15ba2d4e4be0f2bdba4fced Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 24 Dec 2025 10:12:07 +0100 Subject: [PATCH 042/110] refactor(fs): Always calculate integrity on clone Otherwise we might constantly recalculate the integrity of the clones, since it's never cached on the original resource --- packages/fs/lib/Resource.js | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/fs/lib/Resource.js b/packages/fs/lib/Resource.js index 451580d308f..ac873613478 100644 --- a/packages/fs/lib/Resource.js +++ b/packages/fs/lib/Resource.js @@ -557,7 +557,13 @@ class Resource { this.#integrity = ssri.fromData(this.#content, SSRI_OPTIONS).toString(); break; case CONTENT_TYPES.FACTORY: + // TODO: Investigate performance impact of buffer factory vs. stream factory for integrity calculation + // if (this.#createBufferFactory) { + // this.#integrity = ssri.fromData( + // await this.#getBufferFromFactory(this.#createBufferFactory, SSRI_OPTIONS).toString()); + // } else { this.#integrity = (await ssri.fromStream(this.#createStreamFactory(), SSRI_OPTIONS)).toString(); + // } break; case CONTENT_TYPES.STREAM: // To be discussed: Should we read the stream into a buffer here (using #getBufferFromStream) to avoid @@ -784,9 +790,9 @@ class Resource { path: this.#path, statInfo: this.#statInfo, // Will be cloned in constructor isDirectory: this.#isDirectory, - byteSize: this.#byteSize, + byteSize: this.#isDirectory ? undefined : await this.getSize(), lastModified: this.#lastModified, - integrity: this.#integrity, + integrity: this.#isDirectory ? undefined : await this.getIntegrity(), sourceMetadata: clone(this.#sourceMetadata) }; From b6d821d6babef785586412609f221576d23fabb5 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Mon, 29 Dec 2025 19:58:54 +0100 Subject: [PATCH 043/110] refactor(fs): Add getter to WriterCollection --- packages/fs/lib/WriterCollection.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/fs/lib/WriterCollection.js b/packages/fs/lib/WriterCollection.js index 7c01f783f14..21e8200b7f1 100644 --- a/packages/fs/lib/WriterCollection.js +++ b/packages/fs/lib/WriterCollection.js @@ -65,6 +65,10 @@ class WriterCollection extends AbstractReaderWriter { }); } + getMapping() { + return this._writerMapping; + } + /** * Locates resources by glob. * From 39d21dcb7b06f09f0b015a1d1fddd661033b7f2b Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 24 Dec 2025 10:18:35 +0100 Subject: [PATCH 044/110] refactor(builder): Remove cache handling from tasks --- packages/builder/lib/tasks/minify.js | 6 +----- packages/builder/lib/tasks/replaceBuildtime.js | 7 +------ packages/builder/lib/tasks/replaceCopyright.js | 6 +----- packages/builder/lib/tasks/replaceVersion.js | 7 +------ 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/packages/builder/lib/tasks/minify.js b/packages/builder/lib/tasks/minify.js index f4aa89d2fe0..5186f8d262d 100644 --- a/packages/builder/lib/tasks/minify.js +++ b/packages/builder/lib/tasks/minify.js @@ -30,11 +30,7 @@ export default async function({ workspace, taskUtil, cacheUtil, options: {pattern, omitSourceMapResources = false, useInputSourceMaps = true} }) { - let resources = await workspace.byGlob(pattern); - if (cacheUtil.hasCache()) { - const changedPaths = cacheUtil.getChangedProjectResourcePaths(); - resources = resources.filter((resource) => changedPaths.has(resource.getPath())); - } + const resources = await workspace.byGlob(pattern); if (resources.length === 0) { return; } diff --git a/packages/builder/lib/tasks/replaceBuildtime.js b/packages/builder/lib/tasks/replaceBuildtime.js index 19e3c853569..8cbe83b5713 100644 --- a/packages/builder/lib/tasks/replaceBuildtime.js +++ b/packages/builder/lib/tasks/replaceBuildtime.js @@ -34,12 +34,7 @@ function getTimestamp() { * @returns {Promise} Promise resolving with undefined once data has been written */ export default async function({workspace, cacheUtil, options: {pattern}}) { - let resources = await workspace.byGlob(pattern); - - if (cacheUtil.hasCache()) { - const changedPaths = cacheUtil.getChangedProjectResourcePaths(); - resources = resources.filter((resource) => changedPaths.has(resource.getPath())); - } + const resources = await workspace.byGlob(pattern); const timestamp = getTimestamp(); const processedResources = await stringReplacer({ resources, diff --git a/packages/builder/lib/tasks/replaceCopyright.js b/packages/builder/lib/tasks/replaceCopyright.js index 927cd30c0f2..103e43e3003 100644 --- a/packages/builder/lib/tasks/replaceCopyright.js +++ b/packages/builder/lib/tasks/replaceCopyright.js @@ -38,11 +38,7 @@ export default async function({workspace, cacheUtil, options: {copyright, patter // Replace optional placeholder ${currentYear} with the current year copyright = copyright.replace(/(?:\$\{currentYear\})/, new Date().getFullYear()); - let resources = await workspace.byGlob(pattern); - if (cacheUtil.hasCache()) { - const changedPaths = cacheUtil.getChangedProjectResourcePaths(); - resources = resources.filter((resource) => changedPaths.has(resource.getPath())); - } + const resources = await workspace.byGlob(pattern); const processedResources = await stringReplacer({ resources, diff --git a/packages/builder/lib/tasks/replaceVersion.js b/packages/builder/lib/tasks/replaceVersion.js index 39192b44d03..b1cd2eb1d16 100644 --- a/packages/builder/lib/tasks/replaceVersion.js +++ b/packages/builder/lib/tasks/replaceVersion.js @@ -21,12 +21,7 @@ import stringReplacer from "../processors/stringReplacer.js"; * @returns {Promise} Promise resolving with undefined once data has been written */ export default async function({workspace, cacheUtil, options: {pattern, version}}) { - let resources = await workspace.byGlob(pattern); - - if (cacheUtil.hasCache()) { - const changedPaths = cacheUtil.getChangedProjectResourcePaths(); - resources = resources.filter((resource) => changedPaths.has(resource.getPath())); - } + const resources = await workspace.byGlob(pattern); const processedResources = await stringReplacer({ resources, options: { From e2e6aa18018239bf983df30eeb1d5c30f4825612 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 30 Dec 2025 15:26:00 +0100 Subject: [PATCH 045/110] refactor(builder): Add env variable for disabling workers --- packages/builder/lib/tasks/buildThemes.js | 2 +- packages/builder/lib/tasks/minify.js | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/builder/lib/tasks/buildThemes.js b/packages/builder/lib/tasks/buildThemes.js index d407bb97ff7..de9f2e4d6fe 100644 --- a/packages/builder/lib/tasks/buildThemes.js +++ b/packages/builder/lib/tasks/buildThemes.js @@ -192,7 +192,7 @@ export default async function({ } let processedResources; - const useWorkers = !!taskUtil; + const useWorkers = !process.env.UI5_CLI_NO_WORKERS && !!taskUtil; if (useWorkers) { const threadMessageHandler = new FsMainThreadInterface(fsInterface(combo)); diff --git a/packages/builder/lib/tasks/minify.js b/packages/builder/lib/tasks/minify.js index 5186f8d262d..069212db989 100644 --- a/packages/builder/lib/tasks/minify.js +++ b/packages/builder/lib/tasks/minify.js @@ -41,7 +41,7 @@ export default async function({ options: { addSourceMappingUrl: !omitSourceMapResources, readSourceMappingUrl: !!useInputSourceMaps, - useWorkers: !!taskUtil, + useWorkers: !process.env.UI5_CLI_NO_WORKERS && !!taskUtil, } }); From 11ec37bb29bf0c3866b6e9c22aea56cb2b1d85f0 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 23 Dec 2025 21:32:52 +0100 Subject: [PATCH 046/110] refactor(project): Track resource changes using hash trees refactor(project): Project refactoring refactor(project): Cleanup refactor(project): Fix missing invalidation of tasks on stage replace refactor(project): Stages always contain a writer refactor(project): Refactor serialization refactor(project): Cleanup refactor(project): Refactor project stages A stage now either has a single writer or a single reader (from cache) refactor(project): Rename MerkleTree => HashTree refactor(project): Cleanup refactor(project): Improve HashTree resource updates refactor(project): Add resource metadata to HashTree refactor(project): Use Resource instances in HashTree directly refactor(project): Update HashTree usage refactor(project): Refactor refactor(project): Add upsert to HashTree refactor(project): Refactor result stage cache refactor(project): Remove result stage cache refactor(project): Cleanup refactor(project): Update JSDoc refactor(project): Update JSDoc refactor(project): Split HashTree and TreeRegistry tests refactor(project): Add tests refactor(project): Add strict resource comparison refactor(project): Optimize shared tree state refactor(project): Re-add result stage cache test(project): Add cache tests refactor(project): Cleanup --- packages/project/lib/build/ProjectBuilder.js | 6 +- packages/project/lib/build/TaskRunner.js | 10 +- .../project/lib/build/cache/BuildTaskCache.js | 526 +++++--- .../project/lib/build/cache/CacheManager.js | 334 ++++- .../lib/build/cache/ProjectBuildCache.js | 803 +++++++----- .../lib/build/cache/ResourceRequestGraph.js | 628 ++++++++++ .../project/lib/build/cache/StageCache.js | 89 ++ .../project/lib/build/cache/index/HashTree.js | 1103 +++++++++++++++++ .../lib/build/cache/index/ResourceIndex.js | 233 ++++ .../lib/build/cache/index/TreeRegistry.js | 379 ++++++ packages/project/lib/build/cache/utils.js | 174 ++- .../lib/build/helpers/ProjectBuildContext.js | 24 +- .../project/lib/build/helpers/WatchHandler.js | 4 +- .../lib/specifications/ComponentProject.js | 41 +- .../project/lib/specifications/Project.js | 251 ++-- .../test/lib/build/cache/BuildTaskCache.js | 644 ++++++++++ .../test/lib/build/cache/ProjectBuildCache.js | 573 +++++++++ .../lib/build/cache/ResourceRequestGraph.js | 988 +++++++++++++++ .../test/lib/build/cache/index/HashTree.js | 551 ++++++++ .../lib/build/cache/index/TreeRegistry.js | 567 +++++++++ 20 files changed, 7223 insertions(+), 705 deletions(-) create mode 100644 packages/project/lib/build/cache/ResourceRequestGraph.js create mode 100644 packages/project/lib/build/cache/StageCache.js create mode 100644 packages/project/lib/build/cache/index/HashTree.js create mode 100644 packages/project/lib/build/cache/index/ResourceIndex.js create mode 100644 packages/project/lib/build/cache/index/TreeRegistry.js create mode 100644 packages/project/test/lib/build/cache/BuildTaskCache.js create mode 100644 packages/project/test/lib/build/cache/ProjectBuildCache.js create mode 100644 packages/project/test/lib/build/cache/ResourceRequestGraph.js create mode 100644 packages/project/test/lib/build/cache/index/HashTree.js create mode 100644 packages/project/test/lib/build/cache/index/TreeRegistry.js diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index b7ae8ad59d8..8de36819e61 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -262,7 +262,6 @@ class ProjectBuilder { await projectBuildContext.getTaskRunner().runTasks(); this.#log.endProjectBuild(projectName, projectType); } - project.sealWorkspace(); if (!requestedProjects.includes(projectName)) { // Project has not been requested // => Its resources shall not be part of the build result @@ -280,7 +279,7 @@ class ProjectBuilder { project, this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), projectBuildContext.getBuildSignature()); - pWrites.push(projectBuildContext.getBuildCache().saveToDisk(buildManifest)); + pWrites.push(projectBuildContext.getBuildCache().storeCache(buildManifest)); } } await Promise.all(pWrites); @@ -335,7 +334,6 @@ class ProjectBuilder { this.#log.startProjectBuild(projectName, projectType); await projectBuildContext.runTasks(); - project.sealWorkspace(); this.#log.endProjectBuild(projectName, projectType); if (!requestedProjects.includes(projectName)) { // Project has not been requested @@ -353,7 +351,7 @@ class ProjectBuilder { project, this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), projectBuildContext.getBuildSignature()); - pWrites.push(projectBuildContext.getBuildCache().saveToDisk(buildManifest)); + pWrites.push(projectBuildContext.getBuildCache().storeCache(buildManifest)); } await Promise.all(pWrites); } diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index dd874116768..f5c833ede47 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -96,6 +96,7 @@ class TaskRunner { name: `Dependency reader collection of project ${project.getName()}`, readers: depReaders }); + this._buildCache.setDependencyReader(this._allDependenciesReader); } /** @@ -130,6 +131,7 @@ class TaskRunner { await this._executeTask(taskName, taskFunction); } } + this._buildCache.allTasksCompleted(); } /** @@ -192,9 +194,8 @@ class TaskRunner { task = async (log) => { options.projectName = this._project.getName(); options.projectNamespace = this._project.getNamespace(); - // TODO: Apply cache and stage handling for custom tasks as well - const requiresRun = await this._buildCache.prepareTaskExecution(taskName, this._allDependenciesReader); + const requiresRun = await this._buildCache.prepareTaskExecution(taskName, requiresDependencies); if (!requiresRun) { this._log.skipTask(taskName); return; @@ -241,7 +242,10 @@ class TaskRunner { `Task ${taskName} finished in ${Math.round((performance.now() - this._taskStart))} ms`); } this._log.endTask(taskName); - await this._buildCache.recordTaskResult(taskName, expectedOutput, workspace, dependencies); + await this._buildCache.recordTaskResult(taskName, + workspace.getWrittenResourcePaths(), + workspace.getResourceRequests(), + dependencies?.getResourceRequests()); }; } this._tasks[taskName] = { diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index 7f1649e953f..86756dc5b72 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -1,86 +1,68 @@ import micromatch from "micromatch"; -import {getLogger} from "@ui5/logger"; -import {createResourceIndex, areResourcesEqual} from "./utils.js"; -const log = getLogger("build:cache:BuildTaskCache"); +// import {getLogger} from "@ui5/logger"; +import ResourceRequestGraph, {Request} from "./ResourceRequestGraph.js"; +import ResourceIndex from "./index/ResourceIndex.js"; +import TreeRegistry from "./index/TreeRegistry.js"; +// const log = getLogger("build:cache:BuildTaskCache"); /** - * @typedef {object} RequestMetadata - * @property {string[]} pathsRead - Specific resource paths that were read - * @property {string[]} patterns - Glob patterns used to read resources + * @typedef {object} @ui5/project/build/cache/BuildTaskCache~ResourceRequests + * @property {Set} paths - Specific resource paths that were accessed + * @property {Set} patterns - Glob patterns used to access resources */ /** * @typedef {object} TaskCacheMetadata - * @property {RequestMetadata} [projectRequests] - Project resource requests - * @property {RequestMetadata} [dependencyRequests] - Dependency resource requests - * @property {Object} [resourcesRead] - Resources read by task - * @property {Object} [resourcesWritten] - Resources written by task + * @property {object} requestSetGraph - Serialized resource request graph + * @property {Array} requestSetGraph.nodes - Graph nodes representing request sets + * @property {number} requestSetGraph.nextId - Next available node ID */ -function unionArray(arr, items) { - for (const item of items) { - if (!arr.includes(item)) { - arr.push(item); - } - } -} -function unionObject(target, obj) { - for (const key in obj) { - if (Object.prototype.hasOwnProperty.call(obj, key)) { - target[key] = obj[key]; - } - } -} - /** * Manages the build cache for a single task * - * Tracks resource reads/writes and provides methods to validate cache validity - * based on resource changes. + * This class tracks all resources accessed by a task (both project and dependency resources) + * and maintains a graph of resource request sets. Each request set represents a unique + * combination of resource accesses, enabling efficient cache invalidation and reuse. + * + * Key features: + * - Tracks resource reads using paths and glob patterns + * - Maintains resource indices for different request combinations + * - Supports incremental updates when resources change + * - Provides cache invalidation based on changed resources + * - Serializes/deserializes cache metadata for persistence + * + * The request graph allows derived request sets (when a task reads additional resources) + * to reuse existing resource indices, optimizing both memory and computation. */ export default class BuildTaskCache { - #projectName; + // #projectName; #taskName; - // Track which resource paths (and patterns) the task reads - // This is used to check whether a resource change *might* invalidates the task - #projectRequests; - #dependencyRequests; - - // Track metadata for the actual resources the task has read and written - // This is used to check whether a resource has actually changed from the last time the task has been executed (and - // its result has been cached) - // Per resource path, this reflects the last known state of the resource (a task might be executed multiple times, - // i.e. with a small delta of changed resources) - // This map can contain either a resource instance (if the cache has been filled during this session) or an object - // containing the last modified timestamp and an md5 hash of the resource (if the cache has been loaded from disk) - #resourcesRead; - #resourcesWritten; + #resourceRequests; + #treeRegistries = []; // ===== LIFECYCLE ===== /** * Creates a new BuildTaskCache instance * - * @param {string} projectName - Name of the project - * @param {string} taskName - Name of the task - * @param {TaskCacheMetadata} metadata - Task cache metadata + * @param {string} projectName - Name of the project (currently unused but reserved for logging) + * @param {string} taskName - Name of the task this cache manages + * @param {string} buildSignature - Build signature for the current build (currently unused but reserved) + * @param {TaskCacheMetadata} [metadata] - Previously cached metadata to restore from. + * If provided, reconstructs the resource request graph from serialized data. + * If omitted, starts with an empty request graph. */ - constructor(projectName, taskName, {projectRequests, dependencyRequests, input, output} = {}) { - this.#projectName = projectName; + constructor(projectName, taskName, buildSignature, metadata) { + // this.#projectName = projectName; this.#taskName = taskName; - this.#projectRequests = projectRequests ?? { - pathsRead: [], - patterns: [], - }; - - this.#dependencyRequests = dependencyRequests ?? { - pathsRead: [], - patterns: [], - }; - this.#resourcesRead = input ?? Object.create(null); - this.#resourcesWritten = output ?? Object.create(null); + if (metadata) { + this.#resourceRequests = ResourceRequestGraph.fromCacheObject(metadata.requestSetGraph); + } else { + this.#resourceRequests = new ResourceRequestGraph(); + } } // ===== METADATA ACCESS ===== @@ -95,138 +77,386 @@ export default class BuildTaskCache { } /** - * Updates the task cache with new resource metadata + * Gets all possible stage signatures for this task + * + * Returns signatures from all recorded request sets. Each signature represents + * a unique combination of resources that were accessed during task execution. + * Used to look up cached build stages. * - * @param {RequestMetadata} projectRequests - Project resource requests - * @param {RequestMetadata} [dependencyRequests] - Dependency resource requests - * @param {Object} resourcesRead - Resources read by task - * @param {Object} resourcesWritten - Resources written by task - * @returns {void} + * @param {module:@ui5/fs.AbstractReader} [projectReader] - Reader for project resources (currently unused) + * @param {module:@ui5/fs.AbstractReader} [dependencyReader] - Reader for dependency resources (currently unused) + * @returns {Promise} Array of stage signature strings + * @throws {Error} If resource index is missing for any request set */ - updateMetadata(projectRequests, dependencyRequests, resourcesRead, resourcesWritten) { - unionArray(this.#projectRequests.pathsRead, projectRequests.pathsRead); - unionArray(this.#projectRequests.patterns, projectRequests.patterns); + async getPossibleStageSignatures(projectReader, dependencyReader) { + const requestSetIds = this.#resourceRequests.getAllNodeIds(); + const signatures = requestSetIds.map((requestSetId) => { + const {resourceIndex} = this.#resourceRequests.getMetadata(requestSetId); + if (!resourceIndex) { + throw new Error(`Resource index missing for request set ID ${requestSetId}`); + } + return resourceIndex.getSignature(); + }); + return signatures; + } - if (dependencyRequests) { - unionArray(this.#dependencyRequests.pathsRead, dependencyRequests.pathsRead); - unionArray(this.#dependencyRequests.patterns, dependencyRequests.patterns); + /** + * Updates resource indices for request sets affected by changed resources + * + * This method: + * 1. Traverses the request graph to find request sets matching changed resources + * 2. Restores missing resource indices if needed + * 3. Updates or removes resources in affected indices + * 4. Flushes all tree registries to apply batched changes + * + * Changes propagate from parent to child nodes in the request graph, ensuring + * all derived request sets are updated consistently. + * + * @param {Set} changedProjectResourcePaths - Set of changed project resource paths + * @param {Set} changedDepResourcePaths - Set of changed dependency resource paths + * @param {module:@ui5/fs.AbstractReader} projectReader - Reader for accessing project resources + * @param {module:@ui5/fs.AbstractReader} dependencyReader - Reader for accessing dependency resources + * @returns {Promise} + */ + async updateIndices(changedProjectResourcePaths, changedDepResourcePaths, projectReader, dependencyReader) { + // Filter relevant resource changes and update the indices if necessary + const matchingRequestSetIds = []; + const updatesByRequestSetId = new Map(); + const changedProjectResourcePathsArray = Array.from(changedProjectResourcePaths); + const changedDepResourcePathsArray = Array.from(changedDepResourcePaths); + // Process all nodes, parents before children + for (const {nodeId, node, parentId} of this.#resourceRequests.traverseByDepth()) { + const addedRequests = node.getAddedRequests(); // Resource requests added at this level + let relevantUpdates; + if (addedRequests.length) { + relevantUpdates = this.#matchResourcePaths( + addedRequests, changedProjectResourcePathsArray, changedDepResourcePathsArray); + } else { + relevantUpdates = []; + } + if (parentId) { + // Include updates from parent nodes + const parentUpdates = updatesByRequestSetId.get(parentId); + if (parentUpdates && parentUpdates.length) { + relevantUpdates.push(...parentUpdates); + } + } + if (relevantUpdates.length) { + if (!this.#resourceRequests.getMetadata(nodeId).resourceIndex) { + // Restore missing resource index + await this.#restoreResourceIndex(nodeId, projectReader, dependencyReader); + continue; // Index is fresh now, no need to update again + } + updatesByRequestSetId.set(nodeId, relevantUpdates); + matchingRequestSetIds.push(nodeId); + } } - unionObject(this.#resourcesRead, resourcesRead); - unionObject(this.#resourcesWritten, resourcesWritten); + const resourceCache = new Map(); + // Update matching resource indices + for (const requestSetId of matchingRequestSetIds) { + const {resourceIndex} = this.#resourceRequests.getMetadata(requestSetId); + + const resourcePathsToUpdate = updatesByRequestSetId.get(requestSetId); + const resourcesToUpdate = []; + const removedResourcePaths = []; + for (const resourcePath of resourcePathsToUpdate) { + let resource; + if (resourceCache.has(resourcePath)) { + resource = resourceCache.get(resourcePath); + } else { + if (changedDepResourcePaths.has(resourcePath)) { + resource = await dependencyReader.byPath(resourcePath); + } else { + resource = await projectReader.byPath(resourcePath); + } + resourceCache.set(resourcePath, resource); + } + if (resource) { + resourcesToUpdate.push(resource); + } else { + // Resource has been removed + removedResourcePaths.push(resourcePath); + } + } + if (removedResourcePaths.length) { + await resourceIndex.removeResources(removedResourcePaths); + } + if (resourcesToUpdate.length) { + await resourceIndex.upsertResources(resourcesToUpdate); + } + } + return await this.#flushTreeRegistries(); } /** - * Serializes the task cache to a JSON-compatible object + * Restores a missing resource index for a request set + * + * Recursively restores parent indices first, then derives or creates the index + * for the current request set. Uses tree derivation when a parent index exists + * to share common resources efficiently. * - * @returns {Promise} Serialized task cache data + * @private + * @param {number} requestSetId - ID of the request set to restore + * @param {module:@ui5/fs.AbstractReader} projectReader - Reader for project resources + * @param {module:@ui5/fs.AbstractReader} dependencyReader - Reader for dependency resources + * @returns {Promise} The restored resource index */ - async createMetadata() { - return { - projectRequests: this.#projectRequests, - dependencyRequests: this.#dependencyRequests, - taskIndex: await createResourceIndex(Object.values(this.#resourcesRead)), - // resourcesWritten: await createMetadataForResources(this.#resourcesWritten) - }; + async #restoreResourceIndex(requestSetId, projectReader, dependencyReader) { + const node = this.#resourceRequests.getNode(requestSetId); + const addedRequests = node.getAddedRequests(); + const parentId = node.getParentId(); + let resourceIndex; + if (parentId) { + let {resourceIndex: parentResourceIndex} = this.#resourceRequests.getMetadata(parentId); + if (!parentResourceIndex) { + // Restore parent index first + parentResourceIndex = await this.#restoreResourceIndex(parentId, projectReader, dependencyReader); + } + // Add resources from delta to index + const resourcesToAdd = this.#getResourcesForRequests(addedRequests, projectReader, dependencyReader); + resourceIndex = parentResourceIndex.deriveTree(resourcesToAdd); + } else { + const resourcesRead = + await this.#getResourcesForRequests(addedRequests, projectReader, dependencyReader); + resourceIndex = await ResourceIndex.create(resourcesRead, this.#newTreeRegistry()); + } + const metadata = this.#resourceRequests.getMetadata(requestSetId); + metadata.resourceIndex = resourceIndex; + return resourceIndex; } - // ===== VALIDATION ===== - /** - * Checks if changed resources match this task's tracked resources + * Matches changed resources against a set of requests * - * This is a fast check that determines if the task *might* be invalidated - * based on path matching and glob patterns. + * Tests each request against the changed resource paths using exact path matching + * for 'path'/'dep-path' requests and glob pattern matching for 'patterns'/'dep-patterns' requests. * - * @param {Set|string[]} projectResourcePaths - Changed project resource paths - * @param {Set|string[]} dependencyResourcePaths - Changed dependency resource paths - * @returns {boolean} True if any changed resources match this task's tracked resources + * @private + * @param {Request[]} resourceRequests - Array of resource requests to match against + * @param {string[]} projectResourcePaths - Changed project resource paths + * @param {string[]} dependencyResourcePaths - Changed dependency resource paths + * @returns {string[]} Array of matched resource paths + * @throws {Error} If an unknown request type is encountered */ - matchesChangedResources(projectResourcePaths, dependencyResourcePaths) { - if (this.#isRelevantResourceChange(this.#projectRequests, projectResourcePaths)) { - log.verbose( - `Build cache for task ${this.#taskName} of project ${this.#projectName} possibly invalidated ` + - `by changes made to the following resources ${Array.from(projectResourcePaths).join(", ")}`); - return true; + #matchResourcePaths(resourceRequests, projectResourcePaths, dependencyResourcePaths) { + const matchedResources = []; + for (const {type, value} of resourceRequests) { + switch (type) { + case "path": + if (projectResourcePaths.includes(value)) { + matchedResources.push(value); + } + break; + case "patterns": + matchedResources.push(...micromatch(projectResourcePaths, value)); + break; + case "dep-path": + if (dependencyResourcePaths.includes(value)) { + matchedResources.push(value); + } + break; + case "dep-patterns": + matchedResources.push(...micromatch(dependencyResourcePaths, value)); + break; + default: + throw new Error(`Unknown request type: ${type}`); + } } + return matchedResources; + } - if (this.#isRelevantResourceChange(this.#dependencyRequests, dependencyResourcePaths)) { - log.verbose( - `Build cache for task ${this.#taskName} of project ${this.#projectName} possibly invalidated ` + - `by changes made to the following resources: ${Array.from(dependencyResourcePaths).join(", ")}`); - return true; + /** + * Calculates a signature for the task based on accessed resources + * + * This method: + * 1. Converts resource requests to Request objects + * 2. Searches for an exact match in the request graph + * 3. If found, returns the existing index signature + * 4. If not found, creates a new request set and resource index + * 5. Uses tree derivation when possible to reuse parent indices + * + * The signature uniquely identifies the set of resources accessed and their + * content, enabling cache lookup for previously executed task results. + * + * @param {ResourceRequests} projectRequests - Project resource requests (paths and patterns) + * @param {ResourceRequests} [dependencyRequests] - Dependency resource requests (paths and patterns) + * @param {module:@ui5/fs.AbstractReader} projectReader - Reader for accessing project resources + * @param {module:@ui5/fs.AbstractReader} dependencyReader - Reader for accessing dependency resources + * @returns {Promise} Signature hash string of the resource index + */ + async calculateSignature(projectRequests, dependencyRequests, projectReader, dependencyReader) { + const requests = []; + for (const pathRead of projectRequests.paths) { + requests.push(new Request("path", pathRead)); + } + for (const patterns of projectRequests.patterns) { + requests.push(new Request("patterns", patterns)); } + if (dependencyRequests) { + for (const pathRead of dependencyRequests.paths) { + requests.push(new Request("dep-path", pathRead)); + } + for (const patterns of dependencyRequests.patterns) { + requests.push(new Request("dep-patterns", patterns)); + } + } + let setId = this.#resourceRequests.findExactMatch(requests); + let resourceIndex; + if (setId) { + resourceIndex = this.#resourceRequests.getMetadata(setId).resourceIndex; + // await resourceIndex.updateResources(resourcesRead); // Index was already updated before the task executed + } else { + // New request set, check whether we can create a delta + const metadata = {}; // Will populate with resourceIndex below + setId = this.#resourceRequests.addRequestSet(requests, metadata); - return false; - } - // ===== CACHE LOOKUPS ===== + const requestSet = this.#resourceRequests.getNode(setId); + const parentId = requestSet.getParentId(); + if (parentId) { + const {resourceIndex: parentResourceIndex} = this.#resourceRequests.getMetadata(parentId); + // Add resources from delta to index + const addedRequests = requestSet.getAddedRequests(); + const resourcesToAdd = + await this.#getResourcesForRequests(addedRequests, projectReader, dependencyReader); + resourceIndex = await parentResourceIndex.deriveTree(resourcesToAdd); + // await newIndex.add(resourcesToAdd); + } else { + const resourcesRead = + await this.#getResourcesForRequests(requests, projectReader, dependencyReader); + resourceIndex = await ResourceIndex.create(resourcesRead, this.#newTreeRegistry()); + } + metadata.resourceIndex = resourceIndex; + } + return resourceIndex.getSignature(); + } /** - * Gets the cache entry for a resource that was read + * Creates and registers a new tree registry * - * @param {string} searchResourcePath - Path of the resource to look up - * @returns {ResourceMetadata|object|undefined} Cache entry or undefined if not found + * Tree registries enable batched updates across multiple derived trees, + * improving performance when multiple indices share common subtrees. + * + * @private + * @returns {TreeRegistry} New tree registry instance */ - getReadCacheEntry(searchResourcePath) { - return this.#resourcesRead[searchResourcePath]; + #newTreeRegistry() { + const registry = new TreeRegistry(); + this.#treeRegistries.push(registry); + return registry; } /** - * Gets the cache entry for a resource that was written + * Flushes all tree registries to apply batched updates + * + * Commits all pending tree modifications across all registries in parallel. + * Must be called after operations that schedule updates via registries. * - * @param {string} searchResourcePath - Path of the resource to look up - * @returns {ResourceMetadata|object|undefined} Cache entry or undefined if not found + * @private + * @returns {Promise} */ - getWriteCacheEntry(searchResourcePath) { - return this.#resourcesWritten[searchResourcePath]; + async #flushTreeRegistries() { + await Promise.all(this.#treeRegistries.map((registry) => registry.flush())); } /** - * Checks if a resource exists in the read cache and has the same content + * Retrieves resources for a set of resource requests + * + * Processes different request types: + * - 'path': Retrieves single resource by path from project reader + * - 'patterns': Retrieves resources matching glob patterns from project reader + * - 'dep-path': Retrieves single resource by path from dependency reader + * - 'dep-patterns': Retrieves resources matching glob patterns from dependency reader * - * @param {object} resource - Resource instance to check - * @returns {Promise} True if resource is in cache with matching content + * @private + * @param {Request[]|Array<{type: string, value: string|string[]}>} resourceRequests - Resource requests to process + * @param {module:@ui5/fs.AbstractReader} projectReader - Reader for project resources + * @param {module:@ui5/fs.AbstractReader} dependencyReder - Reader for dependency resources + * @returns {Promise>} Iterator of retrieved resources + * @throws {Error} If an unknown request type is encountered */ - async matchResourceInReadCache(resource) { - const cachedResource = this.#resourcesRead[resource.getPath()]; - if (!cachedResource) { - return false; + async #getResourcesForRequests(resourceRequests, projectReader, dependencyReder) { + const resourcesMap = new Map(); + for (const {type, value} of resourceRequests) { + switch (type) { + case "path": { + const resource = await projectReader.byPath(value); + if (resource) { + resourcesMap.set(value, resource); + } + break; + } + case "patterns": { + const matchedResources = await projectReader.byGlob(value); + for (const resource of matchedResources) { + resourcesMap.set(resource.getOriginalPath(), resource); + } + break; + } + case "dep-path": { + const resource = await dependencyReder.byPath(value); + if (resource) { + resourcesMap.set(value, resource); + } + break; + } + case "dep-patterns": { + const matchedResources = await dependencyReder.byGlob(value); + for (const resource of matchedResources) { + resourcesMap.set(resource.getOriginalPath(), resource); + } + break; + } + default: + throw new Error(`Unknown request type: ${type}`); + } } - // if (cachedResource.integrity) { - // return await matchIntegrity(resource, cachedResource); - // } else { - return await areResourcesEqual(resource, cachedResource); - // } + return resourcesMap.values(); } + // ===== VALIDATION ===== + /** - * Checks if a resource exists in the write cache and has the same content + * Checks if changed resources match this task's tracked resources + * + * This is a fast check that determines if the task *might* be invalidated + * based on path matching and glob patterns. * - * @param {object} resource - Resource instance to check - * @returns {Promise} True if resource is in cache with matching content + * @param {string[]} projectResourcePaths - Changed project resource paths + * @param {string[]} dependencyResourcePaths - Changed dependency resource paths + * @returns {boolean} True if any changed resources match this task's tracked resources */ - async matchResourceInWriteCache(resource) { - const cachedResource = this.#resourcesWritten[resource.getPath()]; - if (!cachedResource) { - return false; - } - // if (cachedResource.integrity) { - // return await matchIntegrity(resource, cachedResource); - // } else { - return await areResourcesEqual(resource, cachedResource); - // } - } - - #isRelevantResourceChange({pathsRead, patterns}, changedResourcePaths) { - for (const resourcePath of changedResourcePaths) { - if (pathsRead.includes(resourcePath)) { - return true; + matchesChangedResources(projectResourcePaths, dependencyResourcePaths) { + const resourceRequests = this.#resourceRequests.getAllRequests(); + return resourceRequests.some(({type, value}) => { + if (type === "path") { + return projectResourcePaths.includes(value); } - if (patterns.length && micromatch(resourcePath, patterns).length > 0) { - return true; + if (type === "patterns") { + return micromatch(projectResourcePaths, value).length > 0; } - } - return false; + if (type === "dep-path") { + return dependencyResourcePaths.includes(value); + } + if (type === "dep-patterns") { + return micromatch(dependencyResourcePaths, value).length > 0; + } + throw new Error(`Unknown request type: ${type}`); + }); + } + + /** + * Serializes the task cache to a plain object for persistence + * + * Exports the resource request graph in a format suitable for JSON serialization. + * The serialized data can be passed to the constructor to restore the cache state. + * + * @returns {TaskCacheMetadata} Serialized cache metadata containing the request set graph + */ + toCacheObject() { + return { + requestSetGraph: this.#resourceRequests.toCacheObject() + }; } } diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index f39e7ac0541..61630f2e9a5 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -12,26 +12,71 @@ import {getLogger} from "@ui5/logger"; const log = getLogger("build:cache:CacheManager"); +// Singleton instances mapped by cache directory path const chacheManagerInstances = new Map(); + +// Options for cacache operations (using SHA-256 for integrity checks) const CACACHE_OPTIONS = {algorithms: ["sha256"]}; +// Cache version for compatibility management +const CACHE_VERSION = "v0"; + /** - * Persistence management for the build cache. Using a file-based index and cacache + * Manages persistence for the build cache using file-based storage and cacache + * + * CacheManager provides a hierarchical file-based cache structure: + * - cas/ - Content-addressable storage (cacache) for resource content + * - buildManifests/ - Build manifest files containing metadata about builds + * - stageMetadata/ - Stage-level metadata organized by project, build, and stage + * - index/ - Resource index files for efficient change detection * - * cacheDir structure: - * - cas/ -- cacache content addressable storage - * - buildManifests/ -- build manifest files (acting as index, internally referencing cacache entries) + * The cache is organized by: + * 1. Project ID (sanitized package name) + * 2. Build signature (hash of build configuration) + * 3. Stage ID (e.g., "result" or "task/taskName") + * 4. Stage signature (hash of input resources) * + * Key features: + * - Content-addressable storage with integrity verification + * - Singleton pattern per cache directory + * - Configurable cache location via UI5_DATA_DIR or configuration + * - Efficient resource deduplication through cacache */ export default class CacheManager { #casDir; #manifestDir; + #stageMetadataDir; + #indexDir; + /** + * Creates a new CacheManager instance + * + * Initializes the directory structure for the cache. This constructor is private - + * use CacheManager.create() instead to get a singleton instance. + * + * @private + * @param {string} cacheDir - Base directory for the cache + */ constructor(cacheDir) { + cacheDir = path.join(cacheDir, CACHE_VERSION); this.#casDir = path.join(cacheDir, "cas"); this.#manifestDir = path.join(cacheDir, "buildManifests"); + this.#stageMetadataDir = path.join(cacheDir, "stageMetadata"); + this.#indexDir = path.join(cacheDir, "index"); } + /** + * Factory method to create or retrieve a CacheManager instance + * + * Returns a singleton CacheManager for the determined cache directory. + * The cache directory is resolved in this order: + * 1. UI5_DATA_DIR environment variable (resolved relative to cwd) + * 2. ui5DataDir from UI5 configuration file + * 3. Default: ~/.ui5/ + * + * @param {string} cwd - Current working directory for resolving relative paths + * @returns {Promise} Singleton CacheManager instance for the cache directory + */ static async create(cwd) { // ENV var should take precedence over the dataDir from the configuration. let ui5DataDir = process.env.UI5_DATA_DIR; @@ -53,14 +98,30 @@ export default class CacheManager { return chacheManagerInstances.get(cacheDir); } + /** + * Generates the file path for a build manifest + * + * @private + * @param {string} packageName - Package/project identifier + * @param {string} buildSignature - Build signature hash + * @returns {string} Absolute path to the build manifest file + */ #getBuildManifestPath(packageName, buildSignature) { const pkgDir = getPathFromPackageName(packageName); return path.join(this.#manifestDir, pkgDir, `${buildSignature}.json`); } - async readBuildManifest(project, buildSignature) { + /** + * Reads a build manifest from cache + * + * @param {string} projectId - Project identifier (typically package name) + * @param {string} buildSignature - Build signature hash + * @returns {Promise} Parsed manifest object or null if not found + * @throws {Error} If file read fails for reasons other than file not existing + */ + async readBuildManifest(projectId, buildSignature) { try { - const manifest = await readFile(this.#getBuildManifestPath(project.getId(), buildSignature), "utf8"); + const manifest = await readFile(this.#getBuildManifestPath(projectId, buildSignature), "utf8"); return JSON.parse(manifest); } catch (err) { if (err.code === "ENOENT") { @@ -71,18 +132,164 @@ export default class CacheManager { } } - async writeBuildManifest(project, buildSignature, manifest) { - const manifestPath = this.#getBuildManifestPath(project.getId(), buildSignature); + /** + * Writes a build manifest to cache + * + * Creates parent directories if they don't exist. Manifests are stored as + * formatted JSON (2-space indentation) for readability. + * + * @param {string} projectId - Project identifier (typically package name) + * @param {string} buildSignature - Build signature hash + * @param {object} manifest - Build manifest object to serialize + * @returns {Promise} + */ + async writeBuildManifest(projectId, buildSignature, manifest) { + const manifestPath = this.#getBuildManifestPath(projectId, buildSignature); await mkdir(path.dirname(manifestPath), {recursive: true}); await writeFile(manifestPath, JSON.stringify(manifest, null, 2), "utf8"); } - async getResourcePathForStage(buildSignature, stageId, resourcePath, integrity) { + /** + * Generates the file path for resource index metadata + * + * @private + * @param {string} packageName - Package/project identifier + * @param {string} buildSignature - Build signature hash + * @returns {string} Absolute path to the index metadata file + */ + #getIndexMetadataPath(packageName, buildSignature) { + const pkgDir = getPathFromPackageName(packageName); + return path.join(this.#indexDir, pkgDir, `${buildSignature}.json`); + } + + /** + * Reads resource index cache from storage + * + * The index cache contains the resource tree structure and task metadata, + * enabling efficient change detection and cache validation. + * + * @param {string} projectId - Project identifier (typically package name) + * @param {string} buildSignature - Build signature hash + * @returns {Promise} Parsed index cache object or null if not found + * @throws {Error} If file read fails for reasons other than file not existing + */ + async readIndexCache(projectId, buildSignature) { + try { + const metadata = await readFile(this.#getIndexMetadataPath(projectId, buildSignature), "utf8"); + return JSON.parse(metadata); + } catch (err) { + if (err.code === "ENOENT") { + // Cache miss + return null; + } + throw err; + } + } + + /** + * Writes resource index cache to storage + * + * Persists the resource index and associated task metadata for later retrieval. + * Creates parent directories if needed. + * + * @param {string} projectId - Project identifier (typically package name) + * @param {string} buildSignature - Build signature hash + * @param {object} index - Index object containing resource tree and task metadata + * @returns {Promise} + */ + async writeIndexCache(projectId, buildSignature, index) { + const indexPath = this.#getIndexMetadataPath(projectId, buildSignature); + await mkdir(path.dirname(indexPath), {recursive: true}); + await writeFile(indexPath, JSON.stringify(index, null, 2), "utf8"); + } + + /** + * Generates the file path for stage metadata + * + * @private + * @param {string} packageName - Package/project identifier + * @param {string} buildSignature - Build signature hash + * @param {string} stageId - Stage identifier (e.g., "result" or "task/taskName") + * @param {string} stageSignature - Stage signature hash (based on input resources) + * @returns {string} Absolute path to the stage metadata file + */ + #getStageMetadataPath(packageName, buildSignature, stageId, stageSignature) { + const pkgDir = getPathFromPackageName(packageName); + return path.join(this.#stageMetadataDir, pkgDir, buildSignature, stageId, `${stageSignature}.json`); + } + + /** + * Reads stage metadata from cache + * + * Stage metadata contains information about resources produced by a build stage, + * including resource paths and their metadata. + * + * @param {string} projectId - Project identifier (typically package name) + * @param {string} buildSignature - Build signature hash + * @param {string} stageId - Stage identifier (e.g., "result" or "task/taskName") + * @param {string} stageSignature - Stage signature hash (based on input resources) + * @returns {Promise} Parsed stage metadata or null if not found + * @throws {Error} If file read fails for reasons other than file not existing + */ + async readStageCache(projectId, buildSignature, stageId, stageSignature) { + try { + const metadata = await readFile( + this.#getStageMetadataPath(projectId, buildSignature, stageId, stageSignature + ), "utf8"); + return JSON.parse(metadata); + } catch (err) { + if (err.code === "ENOENT") { + // Cache miss + return null; + } + throw err; + } + } + + /** + * Writes stage metadata to cache + * + * Persists metadata about resources produced by a build stage. + * Creates parent directories if needed. + * + * @param {string} projectId - Project identifier (typically package name) + * @param {string} buildSignature - Build signature hash + * @param {string} stageId - Stage identifier (e.g., "result" or "task/taskName") + * @param {string} stageSignature - Stage signature hash (based on input resources) + * @param {object} metadata - Stage metadata object to serialize + * @returns {Promise} + */ + async writeStageCache(projectId, buildSignature, stageId, stageSignature, metadata) { + const metadataPath = this.#getStageMetadataPath( + projectId, buildSignature, stageId, stageSignature); + await mkdir(path.dirname(metadataPath), {recursive: true}); + await writeFile(metadataPath, JSON.stringify(metadata, null, 2), "utf8"); + } + + /** + * Retrieves the file system path for a cached resource + * + * Looks up a resource in the content-addressable storage using its cache key + * and verifies its integrity. If integrity mismatches, attempts to recover by + * looking up the content by digest and updating the index. + * + * @param {string} buildSignature - Build signature hash + * @param {string} stageId - Stage identifier (e.g., "result" or "task/taskName") + * @param {string} stageSignature - Stage signature hash + * @param {string} resourcePath - Virtual path of the resource + * @param {string} integrity - Expected integrity hash (e.g., "sha256-...") + * @returns {Promise} Absolute path to the cached resource file, or null if not found + * @throws {Error} If integrity is not provided + */ + async getResourcePathForStage(buildSignature, stageId, stageSignature, resourcePath, integrity) { if (!integrity) { throw new Error("Integrity hash must be provided to read from cache"); } - const cacheKey = this.#createKeyForStage(buildSignature, stageId, resourcePath); + const cacheKey = this.#createKeyForStage(buildSignature, stageId, stageSignature, resourcePath); const result = await cacache.get.info(this.#casDir, cacheKey); + if (!result) { + return null; + } if (result.integrity !== integrity) { log.info(`Integrity mismatch for cache entry ` + `${cacheKey}: expected ${integrity}, got ${result.integrity}`); @@ -91,43 +298,90 @@ export default class CacheManager { if (res) { log.info(`Updating cache entry with expectation...`); await this.writeStage(buildSignature, stageId, resourcePath, res); - return await this.getResourcePathForStage(buildSignature, stageId, resourcePath, integrity); + return await this.getResourcePathForStage( + buildSignature, stageId, stageSignature, resourcePath, integrity); } } - if (!result) { - return null; - } return result.path; } - async writeStage(buildSignature, stageId, resourcePath, buffer) { - return await cacache.put( - this.#casDir, - this.#createKeyForStage(buildSignature, stageId, resourcePath), - buffer, - CACACHE_OPTIONS - ); + /** + * Writes a resource to the cache for a specific stage + * + * If the resource content (identified by integrity hash) already exists in the + * content-addressable storage, only updates the index with a new cache key. + * Otherwise, writes the full content to storage. + * + * This enables efficient deduplication when the same resource content appears + * in multiple stages or builds. + * + * @param {string} buildSignature - Build signature hash + * @param {string} stageId - Stage identifier (e.g., "result" or "task/taskName") + * @param {string} stageSignature - Stage signature hash + * @param {module:@ui5/fs.Resource} resource - Resource to cache + * @returns {Promise} + */ + async writeStageResource(buildSignature, stageId, stageSignature, resource) { + // Check if resource has already been written + const integrity = await resource.getIntegrity(); + const hasResource = await cacache.get.hasContent(this.#casDir, integrity); + const cacheKey = this.#createKeyForStage(buildSignature, stageId, stageSignature, resource.getOriginalPath()); + if (!hasResource) { + const buffer = await resource.getBuffer(); + await cacache.put( + this.#casDir, + cacheKey, + buffer, + CACACHE_OPTIONS + ); + } else { + // Update index + await cacache.index.insert(this.#casDir, cacheKey, integrity, CACACHE_OPTIONS); + } } - async writeStageStream(buildSignature, stageId, resourcePath, stream) { - const writable = cacache.put.stream( - this.#casDir, - this.#createKeyForStage(buildSignature, stageId, resourcePath), - stream, - CACACHE_OPTIONS, - ); - return new Promise((resolve, reject) => { - writable.on("integrity", (digest) => { - resolve(digest); - }); - writable.on("error", (err) => { - reject(err); - }); - stream.pipe(writable); - }); - } + // async writeStage(buildSignature, stageId, resourcePath, buffer) { + // return await cacache.put( + // this.#casDir, + // this.#createKeyForStage(buildSignature, stageId, resourcePath), + // buffer, + // CACACHE_OPTIONS + // ); + // } + + // async writeStageStream(buildSignature, stageId, resourcePath, stream) { + // const writable = cacache.put.stream( + // this.#casDir, + // this.#createKeyForStage(buildSignature, stageId, resourcePath), + // stream, + // CACACHE_OPTIONS, + // ); + // return new Promise((resolve, reject) => { + // writable.on("integrity", (digest) => { + // resolve(digest); + // }); + // writable.on("error", (err) => { + // reject(err); + // }); + // stream.pipe(writable); + // }); + // } - #createKeyForStage(buildSignature, stageId, resourcePath) { - return `${buildSignature}|${stageId}|${resourcePath}`; + /** + * Creates a cache key for a resource in a specific stage + * + * The key format is: buildSignature|stageId|stageSignature|resourcePath + * This ensures unique identification of resources across different builds, + * stages, and input combinations. + * + * @private + * @param {string} buildSignature - Build signature hash + * @param {string} stageId - Stage identifier (e.g., "result" or "task/taskName") + * @param {string} stageSignature - Stage signature hash + * @param {string} resourcePath - Virtual path of the resource + * @returns {string} Cache key string + */ + #createKeyForStage(buildSignature, stageId, stageSignature, resourcePath) { + return `${buildSignature}|${stageId}|${stageSignature}|${resourcePath}`; } } diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 29fce6b459b..5fdc8006c2a 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -4,26 +4,44 @@ import fs from "graceful-fs"; import {promisify} from "node:util"; const readFile = promisify(fs.readFile); import BuildTaskCache from "./BuildTaskCache.js"; -import {createResourceIndex} from "./utils.js"; +import StageCache from "./StageCache.js"; +import ResourceIndex from "./index/ResourceIndex.js"; +import {firstTruthy} from "./utils.js"; const log = getLogger("build:cache:ProjectBuildCache"); +/** + * @typedef {object} StageMetadata + * @property {Object} resourceMetadata + */ + +/** + * @typedef {object} StageCacheEntry + * @property {@ui5/fs/AbstractReader} stage - Reader for the cached stage + * @property {Set} writtenResourcePaths - Set of resource paths written by the task + */ + export default class ProjectBuildCache { #taskCache = new Map(); + #stageCache = new StageCache(); + #project; #buildSignature; + #buildManifest; #cacheManager; + #currentProjectReader; + #dependencyReader; + #resourceIndex; + #requiresInitialBuild; #invalidatedTasks = new Map(); - #updatedResources = new Set(); /** * Creates a new ProjectBuildCache instance * - * @param {object} project Project instance - * @param {string} buildSignature Build signature for the current build - * @param {CacheManager} cacheManager Cache manager instance - * * @private - Use ProjectBuildCache.create() instead + * @param {object} project - Project instance + * @param {string} buildSignature - Build signature for the current build + * @param {object} cacheManager - Cache manager instance for reading/writing cache data */ constructor(project, buildSignature, cacheManager) { this.#project = project; @@ -31,106 +49,278 @@ export default class ProjectBuildCache { this.#cacheManager = cacheManager; } + /** + * Factory method to create and initialize a ProjectBuildCache instance + * + * This is the recommended way to create a ProjectBuildCache as it ensures + * proper asynchronous initialization of the resource index and cache loading. + * + * @param {object} project - Project instance + * @param {string} buildSignature - Build signature for the current build + * @param {object} cacheManager - Cache manager instance + * @returns {Promise} Initialized cache instance + */ static async create(project, buildSignature, cacheManager) { const cache = new ProjectBuildCache(project, buildSignature, cacheManager); - await cache.#attemptLoadFromDisk(); + await cache.#init(); return cache; } + /** + * Initializes the cache by loading resource index, build manifest, and checking cache validity + * + * @private + * @returns {Promise} + */ + async #init() { + this.#resourceIndex = await this.#initResourceIndex(); + this.#buildManifest = await this.#loadBuildManifest(); + this.#requiresInitialBuild = !(await this.#loadIndexCache()); + } + + /** + * Initializes the resource index from cache or creates a new one + * + * This method attempts to load a cached resource index. If found, it validates + * the index against current source files and invalidates affected tasks if + * resources have changed. If no cache exists, creates a fresh index. + * + * @private + * @returns {Promise} The initialized resource index + * @throws {Error} If cached index signature doesn't match computed signature + */ + async #initResourceIndex() { + const sourceReader = this.#project.getSourceReader(); + const [resources, indexCache] = await Promise.all([ + await sourceReader.byGlob("/**/*"), + await this.#cacheManager.readIndexCache(this.#project.getId(), this.#buildSignature), + ]); + if (indexCache) { + log.verbose(`Using cached resource index for project ${this.#project.getName()}`); + // Create and diff resource index + const {resourceIndex, changedPaths} = + await ResourceIndex.fromCacheWithDelta(indexCache, resources); + // Import task caches + + for (const [taskName, metadata] of Object.entries(indexCache.taskMetadata)) { + this.#taskCache.set(taskName, + new BuildTaskCache(this.#project.getName(), taskName, this.#buildSignature, metadata)); + } + if (changedPaths.length) { + // Invalidate tasks based on changed resources + // Note: If the changed paths don't affect any task, the index cache still can't be used due to the + // root hash mismatch. + // Since no tasks have been invalidated, a rebuild is still necessary in this case, so that + // each task can find and use its individual stage cache. + // Hence requiresInitialBuild will be set to true in this case (and others. + this.resourceChanged(changedPaths, []); + } else if (indexCache.indexTree.root.hash !== resourceIndex.getSignature()) { + // Validate index signature matches with cached signature + throw new Error( + `Resource index signature mismatch for project ${this.#project.getName()}: ` + + `expected ${indexCache.indexTree.root.hash}, got ${resourceIndex.getSignature()}`); + } + return resourceIndex; + } + // No index cache found, create new index + return await ResourceIndex.create(resources); + } + // ===== TASK MANAGEMENT ===== /** - * Records the result of a task execution and updates the cache + * Prepares a task for execution by switching to its stage and checking for cached results * * This method: - * 1. Stores metadata about resources read/written by the task - * 2. Detects which resources have actually changed - * 3. Invalidates downstream tasks if necessary - * - * @param {string} taskName Name of the executed task - * @param {Set|undefined} expectedOutput Expected output resource paths - * @param {object} workspaceMonitor Tracker that monitored workspace reads - * @param {object} [dependencyMonitor] Tracker that monitored dependency reads - * @returns {Promise} + * 1. Switches the project to the task's stage + * 2. Updates task indices if the task has been invalidated + * 3. Attempts to find a cached stage for the task + * 4. Returns whether the task needs to be executed + * + * @param {string} taskName - Name of the task to prepare + * @param {boolean} requiresDependencies - Whether the task requires dependency reader + * @returns {Promise} True if task needs execution, false if cached result can be used */ - async recordTaskResult(taskName, expectedOutput, workspaceMonitor, dependencyMonitor) { - const projectTrackingResults = workspaceMonitor.getResults(); - const dependencyTrackingResults = dependencyMonitor?.getResults(); - - const resourcesRead = projectTrackingResults.resourcesRead; - if (dependencyTrackingResults) { - for (const [resourcePath, resource] of Object.entries(dependencyTrackingResults.resourcesRead)) { - resourcesRead[resourcePath] = resource; + async prepareTaskExecution(taskName, requiresDependencies) { + const stageName = this.#getStageNameForTask(taskName); + const taskCache = this.#taskCache.get(taskName); + // Switch project to new stage + this.#project.useStage(stageName); + + if (taskCache) { + if (this.#invalidatedTasks.has(taskName)) { + const {changedProjectResourcePaths, changedDependencyResourcePaths} = + this.#invalidatedTasks.get(taskName); + await taskCache.updateIndices( + changedProjectResourcePaths, changedDependencyResourcePaths, + this.#project.getReader(), this.#dependencyReader); + } // else: Index will be created upon task completion + + // After index update, try to find cached stages for the new signatures + const stageCache = await this.#findStageCache(taskCache, stageName); + if (stageCache) { + // TODO: This might cause more changed resources for following tasks + this.#project.setStage(stageName, stageCache.stage); + + // Task can be skipped, use cached stage as project reader + if (this.#invalidatedTasks.has(taskName)) { + this.#invalidatedTasks.delete(taskName); + } + + if (stageCache.writtenResourcePaths.size) { + // Invalidate following tasks + this.#invalidateFollowingTasks(taskName, stageCache.writtenResourcePaths); + } + return false; // No need to execute the task + } + } + // No cached stage found, store current project reader for later use in recordTaskResult + this.#currentProjectReader = this.#project.getReader(); + return true; // Task needs to be executed + } + + /** + * Attempts to find a cached stage for the given task + * + * Checks both in-memory stage cache and persistent cache storage for a matching + * stage signature. Returns the first matching cached stage found. + * + * @private + * @param {BuildTaskCache} taskCache - Task cache containing possible stage signatures + * @param {string} stageName - Name of the stage to find + * @returns {Promise} Cached stage entry or null if not found + */ + async #findStageCache(taskCache, stageName) { + // Check cache exists and ensure it's still valid before using it + const stageSignatures = await taskCache.getPossibleStageSignatures(); + log.verbose(`Looking for cached stage for task ${stageName} in project ${this.#project.getName()} ` + + `with ${stageSignatures.length} possible signatures:\n - ${stageSignatures.join("\n - ")}`); + if (stageSignatures.length) { + for (const stageSignature of stageSignatures) { + const stageCache = this.#stageCache.getCacheForSignature(stageName, stageSignature); + if (stageCache) { + return stageCache; + } } + + const stageCache = await firstTruthy(stageSignatures.map(async (stageSignature) => { + const stageMetadata = await this.#cacheManager.readStageCache( + this.#project.getId(), this.#buildSignature, stageName, stageSignature); + if (stageMetadata) { + const reader = await this.#createReaderForStageCache( + stageName, stageSignature, stageMetadata.resourceMetadata); + return { + stage: reader, + writtenResourcePaths: new Set(Object.keys(stageMetadata.resourceMetadata)), + }; + } + })); + return stageCache; } - const resourcesWritten = projectTrackingResults.resourcesWritten; + } + /** + * Records the result of a task execution and updates the cache + * + * This method: + * 1. Creates a signature for the executed task based on its resource requests + * 2. Stores the resulting stage in the stage cache using that signature + * 3. Invalidates downstream tasks if they depend on written resources + * 4. Removes the task from the invalidated tasks list + * + * @param {string} taskName - Name of the executed task + * @param {Set} writtenResourcePaths - Set of resource paths written by the task + * @param {@ui5/project/build/cache/BuildTaskCache~ResourceRequests} projectResourceRequests + * Resource requests for project resources + * @param {@ui5/project/build/cache/BuildTaskCache~ResourceRequests} dependencyResourceRequests + * Resource requests for dependency resources + * @returns {Promise} + */ + async recordTaskResult(taskName, writtenResourcePaths, projectResourceRequests, dependencyResourceRequests) { if (!this.#taskCache.has(taskName)) { // Initialize task cache - this.#taskCache.set(taskName, new BuildTaskCache(this.#project.getName(), taskName)); - // throw new Error(`Cannot record results for unknown task ${taskName} ` + - // `in project ${this.#project.getName()}`); + this.#taskCache.set(taskName, new BuildTaskCache(this.#project.getName(), taskName, this.#buildSignature)); } log.verbose(`Updating build cache with results of task ${taskName} in project ${this.#project.getName()}`); const taskCache = this.#taskCache.get(taskName); - const writtenResourcePaths = Object.keys(resourcesWritten); - if (writtenResourcePaths.length) { - log.verbose(`Task ${taskName} produced ${writtenResourcePaths.length} resources`); - - const changedPaths = new Set((await Promise.all(writtenResourcePaths - .map(async (resourcePath) => { - // Check whether resource content actually changed - if (await taskCache.matchResourceInWriteCache(resourcesWritten[resourcePath])) { - return undefined; - } - return resourcePath; - }))).filter((resourcePath) => resourcePath !== undefined)); - - if (!changedPaths.size) { - log.verbose( - `Resources produced by task ${taskName} match with cache from previous executions. ` + - `This task will not invalidate any other tasks`); - return; - } - log.verbose( - `Task ${taskName} produced ${changedPaths.size} resources that might invalidate other tasks`); - for (const resourcePath of changedPaths) { - this.#updatedResources.add(resourcePath); - } - // Check whether other tasks need to be invalidated - const allTasks = Array.from(this.#taskCache.keys()); - const taskIdx = allTasks.indexOf(taskName); - const emptySet = new Set(); - for (let i = taskIdx + 1; i < allTasks.length; i++) { - const nextTaskName = allTasks[i]; - if (!this.#taskCache.get(nextTaskName).matchesChangedResources(changedPaths, emptySet)) { - continue; - } - if (this.#invalidatedTasks.has(taskName)) { - const {changedDependencyResourcePaths} = - this.#invalidatedTasks.get(taskName); - for (const resourcePath of changedPaths) { - changedDependencyResourcePaths.add(resourcePath); - } - } else { - this.#invalidatedTasks.set(taskName, { - changedProjectResourcePaths: changedPaths, - changedDependencyResourcePaths: emptySet - }); - } - } - } - taskCache.updateMetadata( - projectTrackingResults.requests, - dependencyTrackingResults?.requests, - resourcesRead, - resourcesWritten + // Calculate signature for executed task + const stageSignature = await taskCache.calculateSignature( + projectResourceRequests, + dependencyResourceRequests, + this.#currentProjectReader, + this.#dependencyReader ); + // TODO: Read written resources from writer instead of relying on monitor? + // const stage = this.#project.getStage(); + // const stageWriter = stage.getWriter(); + // const writer = stageWriter.collection ? stageWriter.collection : stageWriter; + // const writtenResources = await writer.byGlob("/**/*"); + // if (writtenResources.length !== writtenResourcePaths.size) { + // throw new Error( + // `Mismatch between recorded written resources (${writtenResourcePaths.size}) ` + + // `and actual resources in stage (${writtenResources.length}) for task ${taskName} ` + + // `in project ${this.#project.getName()}`); + // } + + log.verbose(`Storing stage for task ${taskName} in project ${this.#project.getName()} ` + + `with signature ${stageSignature}`); + // Store resulting stage in stage cache + // TODO: Check whether signature already exists and avoid invalidating following tasks + this.#stageCache.addSignature( + this.#getStageNameForTask(taskName), stageSignature, this.#project.getStage(), + writtenResourcePaths); + + // Task has been successfully executed, remove from invalidated tasks if (this.#invalidatedTasks.has(taskName)) { this.#invalidatedTasks.delete(taskName); } + + // Update task cache with new metadata + if (writtenResourcePaths.size) { + log.verbose(`Task ${taskName} produced ${writtenResourcePaths.size} resources`); + this.#invalidateFollowingTasks(taskName, writtenResourcePaths); + } + // Reset current project reader + this.#currentProjectReader = null; + } + + /** + * Invalidates tasks that follow the given task if they depend on written resources + * + * Checks all tasks that come after the given task in execution order and + * invalidates those that match the written resource paths. + * + * @private + * @param {string} taskName - Name of the task that wrote resources + * @param {Set} writtenResourcePaths - Paths of resources written by the task + * @returns {void} + */ + #invalidateFollowingTasks(taskName, writtenResourcePaths) { + const writtenPathsArray = Array.from(writtenResourcePaths); + + // Check whether following tasks need to be invalidated + const allTasks = Array.from(this.#taskCache.keys()); + const taskIdx = allTasks.indexOf(taskName); + for (let i = taskIdx + 1; i < allTasks.length; i++) { + const nextTaskName = allTasks[i]; + if (!this.#taskCache.get(nextTaskName).matchesChangedResources(writtenPathsArray, [])) { + continue; + } + if (this.#invalidatedTasks.has(nextTaskName)) { + const {changedProjectResourcePaths} = + this.#invalidatedTasks.get(nextTaskName); + for (const resourcePath of writtenResourcePaths) { + changedProjectResourcePaths.add(resourcePath); + } + } else { + this.#invalidatedTasks.set(nextTaskName, { + changedProjectResourcePaths: new Set(writtenResourcePaths), + changedDependencyResourcePaths: new Set() + }); + } + } } /** @@ -143,22 +333,18 @@ export default class ProjectBuildCache { return this.#taskCache.get(taskName); } - // ===== INVALIDATION ===== /** - * Collects all modified resource paths and clears the internal tracking set + * Handles resource changes and invalidates affected tasks * - * Note: This method has side effects - it clears the internal modified resources set. - * Call this only when you're ready to consume and process all accumulated changes. + * Iterates through all cached tasks and checks if any match the changed resources. + * Matching tasks are marked as invalidated and will need to be re-executed. + * Changed resource paths are accumulated if a task is already invalidated. * - * @returns {Set} Set of resource paths that have been modified + * @param {string[]} projectResourcePaths - Changed project resource paths + * @param {string[]} dependencyResourcePaths - Changed dependency resource paths + * @returns {boolean} True if any task was invalidated, false otherwise */ - collectAndClearModifiedPaths() { - const updatedResources = new Set(this.#updatedResources); - this.#updatedResources.clear(); - return updatedResources; - } - resourceChanged(projectResourcePaths, dependencyResourcePaths) { let taskInvalidated = false; for (const [taskName, taskCache] of this.#taskCache) { @@ -185,53 +371,6 @@ export default class ProjectBuildCache { return taskInvalidated; } - /** - * Validates whether supposedly changed resources have actually changed - * - * Performs fine-grained validation by comparing resource content (hash/mtime) - * and removes false positives from the invalidation set. - * - * @param {string} taskName - Name of the task to validate - * @param {object} workspace - Workspace reader - * @param {object} dependencies - Dependencies reader - * @returns {Promise} - * @throws {Error} If task cache not found for the given taskName - */ - async validateChangedResources(taskName, workspace, dependencies) { - // Check whether the supposedly changed resources for the task have actually changed - if (!this.#invalidatedTasks.has(taskName)) { - return; - } - const {changedProjectResourcePaths, changedDependencyResourcePaths} = this.#invalidatedTasks.get(taskName); - await this._validateChangedResources(taskName, workspace, changedProjectResourcePaths); - await this._validateChangedResources(taskName, dependencies, changedDependencyResourcePaths); - - if (!changedProjectResourcePaths.size && !changedDependencyResourcePaths.size) { - // Task is no longer invalidated - this.#invalidatedTasks.delete(taskName); - } - } - - async _validateChangedResources(taskName, reader, changedResourcePaths) { - for (const resourcePath of changedResourcePaths) { - const resource = await reader.byPath(resourcePath); - if (!resource) { - // Resource was deleted, no need to check further - continue; - } - - const taskCache = this.#taskCache.get(taskName); - if (!taskCache) { - throw new Error(`Failed to validate changed resources for task ${taskName}: Task cache not found`); - } - if (await taskCache.matchResourceInReadCache(resource)) { - log.verbose(`Resource content has not changed for task ${taskName}, ` + - `removing ${resourcePath} from set of changed resource paths`); - changedResourcePaths.delete(resourcePath); - } - } - } - /** * Gets the set of changed project resource paths for a task * @@ -288,177 +427,166 @@ export default class ProjectBuildCache { /** * Determines whether a rebuild is needed * - * @returns {boolean} True if no cache exists or if any tasks have been invalidated + * A rebuild is required if: + * - No task cache exists + * - Any tasks have been invalidated + * - Initial build is required (e.g., cache couldn't be loaded) + * + * @returns {boolean} True if rebuild is needed, false if cache can be fully utilized */ - needsRebuild() { - return !this.hasAnyCache() || this.#invalidatedTasks.size > 0; + requiresBuild() { + return !this.hasAnyCache() || this.#invalidatedTasks.size > 0 || this.#requiresInitialBuild; } + /** + * Initializes project stages for the given tasks + * + * Creates stage names for each task and initializes them in the project. + * This must be called before task execution begins. + * + * @param {string[]} taskNames - Array of task names to initialize stages for + * @returns {Promise} + */ async setTasks(taskNames) { const stageNames = taskNames.map((taskName) => this.#getStageNameForTask(taskName)); - this.#project.setStages(stageNames); - } - - async prepareTaskExecution(taskName, dependencyReader) { - // Check cache exists and ensure it's still valid before using it - if (this.hasTaskCache(taskName)) { - // Check whether any of the relevant resources have changed - await this.validateChangedResources(taskName, this.#project.getReader(), dependencyReader); + this.#project.initStages(stageNames); - if (this.isTaskCacheValid(taskName)) { - return false; // No need to execute task, cache is valid - } - } + // TODO: Rename function? We simply use it to have a point in time right before the project is built + } - // Switch project to use cached stage as base layer - this.#project.useStage(this.#getStageNameForTask(taskName)); - return true; // Task needs to be executed + /** + * Sets the dependency reader for accessing dependency resources + * + * The dependency reader is used by tasks to access resources from project + * dependencies. Must be set before tasks that require dependencies are executed. + * + * @param {@ui5/fs/AbstractReader} dependencyReader - Reader for dependency resources + * @returns {void} + */ + setDependencyReader(dependencyReader) { + this.#dependencyReader = dependencyReader; } - // /** - // * Gets the current status of the cache for debugging and monitoring - // * - // * @returns {object} Status information including cache state and statistics - // */ - // getStatus() { - // return { - // hasCache: this.hasAnyCache(), - // totalTasks: this.#taskCache.size, - // invalidatedTasks: this.#invalidatedTasks.size, - // modifiedResourceCount: this.#updatedResources.size, - // buildSignature: this.#buildSignature, - // restoreFailed: this.#restoreFailed - // }; - // } + /** + * Signals that all tasks have completed and switches to the result stage + * + * This finalizes the build process by switching the project to use the + * final result stage containing all build outputs. + * + * @returns {void} + */ + allTasksCompleted() { + this.#project.useResultStage(); + } /** * Gets the names of all invalidated tasks * + * Invalidated tasks are those that need to be re-executed because their + * input resources have changed. + * * @returns {string[]} Array of task names that have been invalidated */ getInvalidatedTaskNames() { return Array.from(this.#invalidatedTasks.keys()); } - // ===== SERIALIZATION ===== - async #createCacheManifest() { - const cache = Object.create(null); - cache.index = await this.#createIndex(this.#project.getSourceReader(), true); - cache.indexTimestamp = Date.now(); // TODO: This is way too late if the resource' metadata has been cached - - cache.taskMetadata = Object.create(null); - for (const [taskName, taskCache] of this.#taskCache) { - cache.taskMetadata[taskName] = await taskCache.createMetadata(); - } - - cache.stages = await this.#saveCachedStages(); - return cache; - } - - async #createIndex(reader, includeInode = false) { - const resources = await reader.byGlob("/**/*"); - return await createResourceIndex(resources, includeInode); - } - - async #saveBuildManifest(buildManifest) { - buildManifest.cache = await this.#createCacheManifest(); - - await this.#cacheManager.writeBuildManifest( - this.#project, this.#buildSignature, buildManifest); - - // Import cached stages back into project to prevent inconsistent state during next build/save - await this.#importCachedStages(buildManifest.cache.stages); - } - + /** + * Generates the stage name for a given task + * + * @private + * @param {string} taskName - Name of the task + * @returns {string} Stage name in the format "task/{taskName}" + */ #getStageNameForTask(taskName) { return `task/${taskName}`; } - async #saveCachedStages() { - log.info(`Storing task outputs for project ${this.#project.getName()} in cache...`); - - return await Promise.all(this.#project.getStagesForCache().map(async ({stageId, reader}) => { - const resources = await reader.byGlob("/**/*"); - const resourceMetadata = Object.create(null); - await Promise.all(resources.map(async (res) => { - // Store resource content in cacache via CacheManager - const integrity = await this.#cacheManager.writeStage( - this.#buildSignature, stageId, - res.getOriginalPath(), await res.getBuffer() - ); + // ===== SERIALIZATION ===== - resourceMetadata[res.getOriginalPath()] = { - size: await res.getSize(), - lastModified: res.getLastModified(), - integrity, - }; - })); - return [stageId, resourceMetadata]; - })); + /** + * Loads the cached result stage from persistent storage + * + * Attempts to load a cached result stage using the resource index signature. + * If found, creates a reader for the cached stage and sets it as the project's + * result stage. + * + * @private + * @returns {Promise} True if cache was loaded successfully, false otherwise + */ + async #loadIndexCache() { + const stageSignature = this.#resourceIndex.getSignature(); + const stageId = "result"; + log.verbose(`Project ${this.#project.getName()} resource index signature: ${stageSignature}`); + const stageCache = await this.#cacheManager.readStageCache( + this.#project.getId(), this.#buildSignature, stageId, stageSignature); + + if (!stageCache) { + log.verbose( + `No cached stage found for project ${this.#project.getName()} with index signature ${stageSignature}`); + return false; + } + log.verbose( + `Using cached result stage for project ${this.#project.getName()} with index signature ${stageSignature}`); + const reader = await this.#createReaderForStageCache( + stageId, stageSignature, stageCache.resourceMetadata); + this.#project.setResultStage(reader); + this.#project.useResultStage(); + return true; } - async #checkForIndexChanges(index, indexTimestamp) { - log.verbose(`Checking for source changes for project ${this.#project.getName()}`); - const sourceReader = this.#project.getSourceReader(); - const resources = await sourceReader.byGlob("/**/*"); - const changedResources = new Set(); - for (const resource of resources) { - const currentLastModified = resource.getLastModified(); - const resourcePath = resource.getOriginalPath(); - if (currentLastModified > indexTimestamp) { - // Resource modified after index was created, no need for further checks - log.verbose(`Source file created or modified after index creation: ${resourcePath}`); - changedResources.add(resourcePath); - continue; - } - // Check against index - if (!Object.hasOwn(index, resourcePath)) { - // New resource encountered - log.verbose(`New source file: ${resourcePath}`); - changedResources.add(resourcePath); - continue; - } - const {lastModified, size, inode, integrity} = index[resourcePath]; - - if (lastModified !== currentLastModified) { - log.verbose(`Source file modified: ${resourcePath} (timestamp change)`); - changedResources.add(resourcePath); - continue; - } - - if (inode !== resource.getInode()) { - log.verbose(`Source file modified: ${resourcePath} (inode change)`); - changedResources.add(resourcePath); - continue; - } - - if (size !== await resource.getSize()) { - log.verbose(`Source file modified: ${resourcePath} (size change)`); - changedResources.add(resourcePath); - continue; - } + /** + * Writes the result stage to persistent cache storage + * + * Collects all resources from the result stage (excluding source reader), + * stores their content via the cache manager, and writes stage metadata + * including resource information. + * + * @private + * @returns {Promise} + */ + async #writeResultStage() { + const stageSignature = this.#resourceIndex.getSignature(); + const stageId = "result"; + + const deltaReader = this.#project.getReader({excludeSourceReader: true}); + const resources = await deltaReader.byGlob("/**/*"); + const resourceMetadata = Object.create(null); + log.verbose(`Project ${this.#project.getName()} resource index signature: ${stageSignature}`); + log.verbose(`Caching result stage with ${resources.length} resources`); + + await Promise.all(resources.map(async (res) => { + // Store resource content in cacache via CacheManager + await this.#cacheManager.writeStageResource(this.#buildSignature, stageId, stageSignature, res); + + resourceMetadata[res.getOriginalPath()] = { + inode: res.getInode(), + lastModified: res.getLastModified(), + size: await res.getSize(), + integrity: await res.getIntegrity(), + }; + })); - if (currentLastModified === indexTimestamp) { - // If the source modification time is equal to index creation time, - // it's possible for a race condition to have occurred where the file was modified - // during index creation without changing its size. - // In this case, we need to perform an integrity check to determine if the file has changed. - const currentIntegrity = await resource.getIntegrity(); - if (currentIntegrity !== integrity) { - log.verbose(`Resource changed: ${resourcePath} (integrity change)`); - changedResources.add(resourcePath); - } - } - } - if (changedResources.size) { - const invalidatedTasks = this.resourceChanged(changedResources, new Set()); - if (invalidatedTasks) { - log.info(`Invalidating tasks due to changed resources for project ${this.#project.getName()}`); - } - } + const metadata = { + resourceMetadata, + }; + await this.#cacheManager.writeStageCache( + this.#project.getId(), this.#buildSignature, stageId, stageSignature, metadata); } - async #createReaderForStageCache(stageId, resourceMetadata) { + /** + * Creates a proxy reader for accessing cached stage resources + * + * The reader provides virtual access to cached resources by loading them from + * the cache storage on demand. Resource metadata is used to validate cache entries. + * + * @private + * @param {string} stageId - Identifier for the stage (e.g., "result" or "task/{taskName}") + * @param {string} stageSignature - Signature hash of the stage + * @param {Object} resourceMetadata - Metadata for all cached resources + * @returns {Promise<@ui5/fs/AbstractReader>} Proxy reader for cached resources + */ + async #createReaderForStageCache(stageId, stageSignature, resourceMetadata) { const allResourcePaths = Object.keys(resourceMetadata); return createProxy({ name: `Cache reader for task ${stageId} in project ${this.#project.getName()}`, @@ -469,7 +597,7 @@ export default class ProjectBuildCache { if (!allResourcePaths.includes(virPath)) { return null; } - const {lastModified, size, integrity} = resourceMetadata[virPath]; + const {lastModified, size, integrity, inode} = resourceMetadata[virPath]; if (size === undefined || lastModified === undefined || integrity === undefined) { throw new Error(`Incomplete metadata for resource ${virPath} of task ${stageId} ` + @@ -477,11 +605,10 @@ export default class ProjectBuildCache { } // Get path to cached file contend stored in cacache via CacheManager const cachePath = await this.#cacheManager.getResourcePathForStage( - this.#buildSignature, stageId, virPath, integrity); + this.#buildSignature, stageId, stageSignature, virPath, integrity); if (!cachePath) { - log.warn(`Content of resource ${virPath} of task ${stageId} ` + + throw new Error(`Unexpected cache miss for resource ${virPath} of task ${stageId} ` + `in project ${this.#project.getName()}`); - return null; } return createResource({ path: virPath, @@ -497,40 +624,91 @@ export default class ProjectBuildCache { size, lastModified, integrity, + inode, }); } }); } - async #importCachedTasks(taskMetadata) { - for (const [taskName, metadata] of Object.entries(taskMetadata)) { - this.#taskCache.set(taskName, - new BuildTaskCache(this.#project.getName(), taskName, metadata)); + /** + * Stores all cache data to persistent storage + * + * This method: + * 1. Writes the build manifest (if not already written) + * 2. Stores the result stage with all resources + * 3. Writes the resource index and task metadata + * 4. Stores all stage caches from the queue + * + * @param {object} buildManifest - Build manifest containing metadata about the build + * @param {string} buildManifest.manifestVersion - Version of the manifest format + * @param {string} buildManifest.signature - Build signature + * @returns {Promise} + */ + async storeCache(buildManifest) { + log.verbose(`Storing build cache for project ${this.#project.getName()} ` + + `with build signature ${this.#buildSignature}`); + if (!this.#buildManifest) { + this.#buildManifest = buildManifest; + await this.#cacheManager.writeBuildManifest(this.#project.getId(), this.#buildSignature, buildManifest); } - } - async #importCachedStages(stages) { - const readers = await Promise.all(stages.map(async ([stageId, resourceMetadata]) => { - return await this.#createReaderForStageCache(stageId, resourceMetadata); - })); - this.#project.setStages(stages.map(([id]) => id), readers); - } + // Store result stage + await this.#writeResultStage(); - async saveToDisk(buildManifest) { - await this.#saveBuildManifest(buildManifest); + // Store index cache + const indexMetadata = this.#resourceIndex.toCacheObject(); + const taskMetadata = Object.create(null); + for (const [taskName, taskCache] of this.#taskCache) { + taskMetadata[taskName] = taskCache.toCacheObject(); + } + await this.#cacheManager.writeIndexCache(this.#project.getId(), this.#buildSignature, { + ...indexMetadata, + taskMetadata, + }); + + // Store stage caches + const stageQueue = this.#stageCache.flushCacheQueue(); + await Promise.all(stageQueue.map(async ([stageId, stageSignature]) => { + const {stage} = this.#stageCache.getCacheForSignature(stageId, stageSignature); + const writer = stage.getWriter(); + const reader = writer.collection ? writer.collection : writer; + const resources = await reader.byGlob("/**/*"); + const resourceMetadata = Object.create(null); + await Promise.all(resources.map(async (res) => { + // Store resource content in cacache via CacheManager + await this.#cacheManager.writeStageResource(this.#buildSignature, stageId, stageSignature, res); + + resourceMetadata[res.getOriginalPath()] = { + inode: res.getInode(), + lastModified: res.getLastModified(), + size: await res.getSize(), + integrity: await res.getIntegrity(), + }; + })); + + const metadata = { + resourceMetadata, + }; + await this.#cacheManager.writeStageCache( + this.#project.getId(), this.#buildSignature, stageId, stageSignature, metadata); + })); } /** - * Attempts to load the cache from disk + * Loads and validates the build manifest from persistent storage * - * If a cache file exists, it will be loaded and validated. If any source files - * have changed since the cache was created, affected tasks will be invalidated. + * Attempts to load the build manifest and performs validation: + * - Checks manifest version compatibility (must be "1.0") + * - Validates build signature matches the expected signature * - * @returns {Promise} - * @throws {Error} If cache restoration fails + * If validation fails, the cache is considered invalid and will be ignored. + * + * @private + * @returns {Promise} Build manifest object or undefined if not found/invalid + * @throws {Error} If build signature mismatch or cache restoration fails */ - async #attemptLoadFromDisk() { - const manifest = await this.#cacheManager.readBuildManifest(this.#project, this.#buildSignature); + async #loadBuildManifest() { + const manifest = await this.#cacheManager.readBuildManifest(this.#project.getId(), this.#buildSignature); if (!manifest) { log.verbose(`No build manifest found for project ${this.#project.getName()} ` + `with build signature ${this.#buildSignature}`); @@ -539,7 +717,7 @@ export default class ProjectBuildCache { try { // Check build manifest version - const {buildManifest, cache} = manifest; + const {buildManifest} = manifest; if (buildManifest.manifestVersion !== "1.0") { log.verbose(`Incompatible build manifest version ${manifest.version} found for project ` + `${this.#project.getName()} with build signature ${this.#buildSignature}. Ignoring cache.`); @@ -553,18 +731,7 @@ export default class ProjectBuildCache { `Build manifest signature ${manifest.buildManifest.signature} does not match expected ` + `build signature ${this.#buildSignature} for project ${this.#project.getName()}`); } - log.info( - `Restoring build cache for project ${this.#project.getName()} from build manifest ` + - `with signature ${this.#buildSignature}`); - - // Import task- and stage metadata first and in parallel - await Promise.all([ - this.#importCachedTasks(cache.taskMetadata), - this.#importCachedStages(cache.stages), - ]); - - // After tasks have been imported, check for source changes (and potentially invalidate tasks) - await this.#checkForIndexChanges(cache.index, cache.indexTimestamp); + return buildManifest; } catch (err) { throw new Error( `Failed to restore cache from disk for project ${this.#project.getName()}: ${err.message}`, { diff --git a/packages/project/lib/build/cache/ResourceRequestGraph.js b/packages/project/lib/build/cache/ResourceRequestGraph.js new file mode 100644 index 00000000000..aac512d24b7 --- /dev/null +++ b/packages/project/lib/build/cache/ResourceRequestGraph.js @@ -0,0 +1,628 @@ +const ALLOWED_REQUEST_TYPES = new Set(["path", "patterns", "dep-path", "dep-patterns"]); + +/** + * Represents a single request with type and value + */ +export class Request { + /** + * @param {string} type - Either 'path', 'pattern', "dep-path" or "dep-pattern" + * @param {string|string[]} value - The request value (string for path types, array for pattern types) + */ + constructor(type, value) { + if (!ALLOWED_REQUEST_TYPES.has(type)) { + throw new Error(`Invalid request type: ${type}`); + } + + // Validate value type based on request type + if ((type === "path" || type === "dep-path") && typeof value !== "string") { + throw new Error(`Request type '${type}' requires value to be a string`); + } + + this.type = type; + this.value = value; + } + + /** + * Create a canonical string representation for comparison + * + * @returns {string} Canonical key in format "type:value" or "type:[pattern1,pattern2,...]" + */ + toKey() { + if (Array.isArray(this.value)) { + return `${this.type}:${JSON.stringify(this.value)}`; + } + return `${this.type}:${this.value}`; + } + + /** + * Create Request from key string + * + * @param {string} key - Key in format "type:value" or "type:[...]" + * @returns {Request} Request instance + */ + static fromKey(key) { + const colonIndex = key.indexOf(":"); + const type = key.substring(0, colonIndex); + const valueStr = key.substring(colonIndex + 1); + + // Check if value is a JSON array + if (valueStr.startsWith("[")) { + const value = JSON.parse(valueStr); + return new Request(type, value); + } + + return new Request(type, valueStr); + } + + /** + * Check equality with another Request + * + * @param {Request} other - Request to compare with + * @returns {boolean} True if requests are equal + */ + equals(other) { + if (this.type !== other.type) { + return false; + } + + if (Array.isArray(this.value) && Array.isArray(other.value)) { + if (this.value.length !== other.value.length) { + return false; + } + return this.value.every((val, idx) => val === other.value[idx]); + } + + return this.value === other.value; + } +} + +/** + * Node in the request set graph + */ +class RequestSetNode { + /** + * @param {number} id - Unique node identifier + * @param {number|null} parent - Parent node ID or null + * @param {Request[]} addedRequests - Requests added in this node (delta) + * @param {*} metadata - Associated metadata + */ + constructor(id, parent = null, addedRequests = [], metadata = {}) { + this.id = id; + this.parent = parent; // NodeId or null + this.addedRequests = new Set(addedRequests.map((r) => r.toKey())); + this.metadata = metadata; + + // Cached materialized set (lazy computed) + this._fullSetCache = null; + this._cacheValid = false; + } + + /** + * Get the full materialized set of requests for this node + * + * @param {ResourceRequestGraph} graph - The graph containing this node + * @returns {Set} Set of request keys + */ + getMaterializedSet(graph) { + if (this._cacheValid && this._fullSetCache !== null) { + return new Set(this._fullSetCache); + } + + const result = new Set(); + let current = this; + + // Walk up parent chain, collecting all added requests + while (current !== null) { + for (const requestKey of current.addedRequests) { + result.add(requestKey); + } + current = current.parent ? graph.getNode(current.parent) : null; + } + + // Cache the result + this._fullSetCache = result; + this._cacheValid = true; + + return new Set(result); + } + + /** + * Invalidate cache (called when graph structure changes) + */ + invalidateCache() { + this._cacheValid = false; + this._fullSetCache = null; + } + + /** + * Get full set as Request objects + * + * @param {ResourceRequestGraph} graph - The graph containing this node + * @returns {Request[]} Array of Request objects + */ + getMaterializedRequests(graph) { + const keys = this.getMaterializedSet(graph); + return Array.from(keys).map((key) => Request.fromKey(key)); + } + + /** + * Get only the requests added in this node (delta, not including parent requests) + * + * @returns {Request[]} Array of Request objects added in this node + */ + getAddedRequests() { + return Array.from(this.addedRequests).map((key) => Request.fromKey(key)); + } + + getParentId() { + return this.parent; + } +} + +/** + * Graph managing request set nodes with delta encoding + */ +export default class ResourceRequestGraph { + constructor() { + this.nodes = new Map(); // nodeId -> RequestSetNode + this.nextId = 1; + } + + /** + * Get a node by ID + * + * @param {number} nodeId - Node identifier + * @returns {RequestSetNode|undefined} The node or undefined if not found + */ + getNode(nodeId) { + return this.nodes.get(nodeId); + } + + /** + * Get all node IDs + * + * @returns {number[]} Array of all node IDs + */ + getAllNodeIds() { + return Array.from(this.nodes.keys()); + } + + /** + * Find the best parent for a new request set using greedy selection + * + * @param {Request[]} requestSet - Array of Request objects + * @returns {{parentId: number, deltaSize: number}|null} Parent info or null if no suitable parent + */ + findBestParent(requestSet) { + if (this.nodes.size === 0) { + return null; + } + + const requestKeys = new Set(requestSet.map((r) => r.toKey())); + let bestParent = null; + let smallestDelta = Infinity; + + // Compare against all existing nodes + for (const [nodeId, node] of this.nodes) { + const nodeSet = node.getMaterializedSet(this); + + // Calculate how many new requests would need to be added + const delta = this._calculateDelta(requestKeys, nodeSet); + + // We want the parent that minimizes the delta (maximum overlap) + if (delta < smallestDelta) { + smallestDelta = delta; + bestParent = nodeId; + } + } + + return bestParent !== null ? {parentId: bestParent, deltaSize: smallestDelta} : null; + } + + /** + * Calculate the size of the delta (requests in newSet not in existingSet) + * + * @param {Set} newSetKeys - Set of request keys + * @param {Set} existingSetKeys - Set of existing request keys + * @returns {number} Number of requests in newSet not in existingSet + */ + _calculateDelta(newSetKeys, existingSetKeys) { + let deltaCount = 0; + for (const key of newSetKeys) { + if (!existingSetKeys.has(key)) { + deltaCount++; + } + } + return deltaCount; + } + + /** + * Calculate which requests need to be added (delta) + * + * @param {Request[]} newRequestSet - New request set + * @param {Set} parentSet - Parent's materialized set (keys) + * @returns {Request[]} Array of requests to add + */ + _calculateAddedRequests(newRequestSet, parentSet) { + const newKeys = new Set(newRequestSet.map((r) => r.toKey())); + const addedKeys = []; + + for (const key of newKeys) { + if (!parentSet.has(key)) { + addedKeys.push(key); + } + } + + return addedKeys.map((key) => Request.fromKey(key)); + } + + /** + * Add a new request set to the graph + * + * @param {Request[]} requests - Array of Request objects + * @param {*} metadata - Optional metadata to store with this node + * @returns {number} The new node ID + */ + addRequestSet(requests, metadata = null) { + const nodeId = this.nextId++; + + // Find best parent + const parentInfo = this.findBestParent(requests); + + if (parentInfo === null) { + // No existing nodes, or no suitable parent - create root node + const node = new RequestSetNode(nodeId, null, requests, metadata); + this.nodes.set(nodeId, node); + return nodeId; + } + + // Create node with delta from best parent + const parentNode = this.getNode(parentInfo.parentId); + const parentSet = parentNode.getMaterializedSet(this); + const addedRequests = this._calculateAddedRequests(requests, parentSet); + + const node = new RequestSetNode(nodeId, parentInfo.parentId, addedRequests, metadata); + this.nodes.set(nodeId, node); + + return nodeId; + } + + /** + * Find the best matching node for a query request set + * Returns the node ID where the node's set is a subset of the query + * and is maximal (largest subset match) + * + * @param {Request[]} queryRequests - Array of Request objects to match + * @returns {number|null} Node ID of best match, or null if no match found + */ + findBestMatch(queryRequests) { + const queryKeys = new Set(queryRequests.map((r) => r.toKey())); + + let bestMatch = null; + let bestMatchSize = -1; + + for (const [nodeId, node] of this.nodes) { + const nodeSet = node.getMaterializedSet(this); + + // Check if nodeSet is a subset of queryKeys + const isSubset = this._isSubset(nodeSet, queryKeys); + + if (isSubset && nodeSet.size > bestMatchSize) { + bestMatch = nodeId; + bestMatchSize = nodeSet.size; + } + } + + return bestMatch; + } + + /** + * Find a node with an identical request set + * + * @param {Request[]} requests - Array of Request objects + * @returns {number|null} Node ID of exact match, or null if no match found + */ + findExactMatch(requests) { + // Convert to request keys for comparison + const queryKeys = new Set(requests.map((req) => new Request(req.type, req.value).toKey())); + + // Must have same size to be identical + const querySize = queryKeys.size; + + for (const [nodeId, node] of this.nodes) { + const nodeSet = node.getMaterializedSet(this); + + // Quick size check first + if (nodeSet.size !== querySize) { + continue; + } + + // Check if sets are identical (same size + subset = equality) + if (this._isSubset(nodeSet, queryKeys)) { + return nodeId; + } + } + + return null; + } + + /** + * Check if setA is a subset of setB + * + * @param {Set} setA - First set + * @param {Set} setB - Second set + * @returns {boolean} True if setA is a subset of setB + */ + _isSubset(setA, setB) { + for (const item of setA) { + if (!setB.has(item)) { + return false; + } + } + return true; + } + + /** + * Get metadata associated with a node + * + * @param {number} nodeId - Node identifier + * @returns {*} Metadata or null if node not found + */ + getMetadata(nodeId) { + const node = this.getNode(nodeId); + return node ? node.metadata : null; + } + + /** + * Update metadata for a node + * + * @param {number} nodeId - Node identifier + * @param {*} metadata - New metadata value + */ + setMetadata(nodeId, metadata) { + const node = this.getNode(nodeId); + if (node) { + node.metadata = metadata; + } + } + + /** + * Get a set containing all unique requests across all nodes in the graph + * + * @returns {Request[]} Array of all unique Request objects in the graph + */ + getAllRequests() { + const allRequestKeys = new Set(); + + for (const node of this.nodes.values()) { + const nodeSet = node.getMaterializedSet(this); + for (const key of nodeSet) { + allRequestKeys.add(key); + } + } + + return Array.from(allRequestKeys).map((key) => Request.fromKey(key)); + } + + /** + * Get statistics about the graph + */ + getStats() { + let totalRequests = 0; + let totalStoredDeltas = 0; + const depths = []; + + for (const node of this.nodes.values()) { + totalRequests += node.getMaterializedSet(this).size; + totalStoredDeltas += node.addedRequests.size; + + // Calculate depth + let depth = 0; + let current = node; + while (current.parent !== null) { + depth++; + current = this.getNode(current.parent); + } + depths.push(depth); + } + + return { + nodeCount: this.nodes.size, + averageRequestsPerNode: this.nodes.size > 0 ? totalRequests / this.nodes.size : 0, + averageStoredDeltaSize: this.nodes.size > 0 ? totalStoredDeltas / this.nodes.size : 0, + averageDepth: depths.length > 0 ? depths.reduce((a, b) => a + b, 0) / depths.length : 0, + maxDepth: depths.length > 0 ? Math.max(...depths) : 0, + compressionRatio: totalRequests > 0 ? totalStoredDeltas / totalRequests : 1 + }; + } + + /** + * Iterate through nodes in breadth-first order (by depth level). + * Parents are always yielded before their children, allowing efficient traversal + * where you can check parent nodes first and only examine deltas of subtrees as needed. + * + * @yields {{nodeId: number, node: RequestSetNode, depth: number, parentId: number|null}} + * Node information including ID, node instance, depth level, and parent ID + * + * @example + * // Traverse all nodes, checking parents before children + * for (const {nodeId, node, depth, parentId} of graph.traverseByDepth()) { + * const delta = node.getAddedRequests(); + * const fullSet = node.getMaterializedRequests(graph); + * console.log(`Node ${nodeId} at depth ${depth}: +${delta.length} requests`); + * } + * + * @example + * // Early termination: find first matching node without processing children + * for (const {nodeId, node} of graph.traverseByDepth()) { + * if (nodeMatchesQuery(node)) { + * console.log(`Found match at node ${nodeId}`); + * break; // Stop traversal + * } + * } + */ + * traverseByDepth() { + if (this.nodes.size === 0) { + return; + } + + // Build children map for efficient traversal + const childrenMap = new Map(); // parentId -> [childIds] + const rootNodes = []; + + for (const [nodeId, node] of this.nodes) { + if (node.parent === null) { + rootNodes.push(nodeId); + } else { + if (!childrenMap.has(node.parent)) { + childrenMap.set(node.parent, []); + } + childrenMap.get(node.parent).push(nodeId); + } + } + + // Breadth-first traversal using a queue + const queue = rootNodes.map((nodeId) => ({nodeId, depth: 0})); + + while (queue.length > 0) { + const {nodeId, depth} = queue.shift(); + const node = this.getNode(nodeId); + + // Yield current node + yield { + nodeId, + node, + depth, + parentId: node.parent + }; + + // Enqueue children for next depth level + const children = childrenMap.get(nodeId); + if (children) { + for (const childId of children) { + queue.push({nodeId: childId, depth: depth + 1}); + } + } + } + } + + /** + * Iterate through nodes starting from a specific node, traversing its subtree. + * Useful for examining only a portion of the graph. + * + * @param {number} startNodeId - Node ID to start traversal from + * @yields {{nodeId: number, node: RequestSetNode, depth: number, parentId: number|null}} + * Node information including ID, node instance, relative depth from start, and parent ID + * + * @example + * // Traverse only the subtree under a specific node + * const matchNodeId = graph.findBestMatch(query); + * for (const {nodeId, node, depth} of graph.traverseSubtree(matchNodeId)) { + * console.log(`Processing node ${nodeId} at relative depth ${depth}`); + * } + */ + * traverseSubtree(startNodeId) { + const startNode = this.getNode(startNodeId); + if (!startNode) { + return; + } + + // Build children map + const childrenMap = new Map(); + for (const [nodeId, node] of this.nodes) { + if (node.parent !== null) { + if (!childrenMap.has(node.parent)) { + childrenMap.set(node.parent, []); + } + childrenMap.get(node.parent).push(nodeId); + } + } + + // Breadth-first traversal starting from the specified node + const queue = [{nodeId: startNodeId, depth: 0}]; + + while (queue.length > 0) { + const {nodeId, depth} = queue.shift(); + const node = this.getNode(nodeId); + + yield { + nodeId, + node, + depth, + parentId: node.parent + }; + + // Enqueue children + const children = childrenMap.get(nodeId); + if (children) { + for (const childId of children) { + queue.push({nodeId: childId, depth: depth + 1}); + } + } + } + } + + /** + * Get all children node IDs for a given parent node + * + * @param {number} parentId - Parent node identifier + * @returns {number[]} Array of child node IDs + */ + getChildren(parentId) { + const children = []; + for (const [nodeId, node] of this.nodes) { + if (node.parent === parentId) { + children.push(nodeId); + } + } + return children; + } + + /** + * Export graph structure for serialization + * + * @returns {{nodes: Array<{id: number, parent: number|null, addedRequests: string[]}>, nextId: number}} + * Graph structure with metadata + */ + toCacheObject() { + const nodes = []; + + for (const [nodeId, node] of this.nodes) { + nodes.push({ + id: nodeId, + parent: node.parent, + addedRequests: Array.from(node.addedRequests) + }); + } + + return {nodes, nextId: this.nextId}; + } + + /** + * Create a graph from JSON structure (as produced by toCacheObject) + * + * @param {{nodes: Array<{id: number, parent: number|null, addedRequests: string[]}>, nextId: number}} metadata + * JSON representation of the graph + * @returns {ResourceRequestGraph} Reconstructed graph instance + */ + static fromCacheObject(metadata) { + const graph = new ResourceRequestGraph(); + + // Restore nextId + graph.nextId = metadata.nextId; + + // Recreate all nodes + for (const nodeData of metadata.nodes) { + const {id, parent, addedRequests} = nodeData; + + // Convert request keys back to Request instances + const requestInstances = addedRequests.map((key) => Request.fromKey(key)); + + // Create node directly + const node = new RequestSetNode(id, parent, requestInstances); + graph.nodes.set(id, node); + } + + return graph; + } +} diff --git a/packages/project/lib/build/cache/StageCache.js b/packages/project/lib/build/cache/StageCache.js new file mode 100644 index 00000000000..519531720c6 --- /dev/null +++ b/packages/project/lib/build/cache/StageCache.js @@ -0,0 +1,89 @@ +/** + * @typedef {object} StageCacheEntry + * @property {object} stage - The cached stage instance (typically a reader or writer) + * @property {Set} writtenResourcePaths - Set of resource paths written during stage execution + */ + +/** + * In-memory cache for build stage results + * + * Manages cached build stages by their signatures, allowing quick lookup and reuse + * of previously executed build stages. Each stage is identified by a stage ID + * (e.g., "task/taskName") and a signature (content hash of input resources). + * + * The cache maintains a queue of added signatures that need to be persisted, + * enabling batch writes to persistent storage. + * + * Key features: + * - Fast in-memory lookup by stage ID and signature + * - Tracks written resources for cache invalidation + * - Supports batch persistence via flush queue + * - Multiple signatures per stage ID (for different input combinations) + */ +export default class StageCache { + #stageIdToSignatures = new Map(); + #cacheQueue = []; + + /** + * Adds a stage signature to the cache + * + * Stores the stage instance and its written resources under the given stage ID + * and signature. The signature is added to the flush queue for later persistence. + * + * Multiple signatures can exist for the same stage ID, representing different + * input resource combinations that produce different outputs. + * + * @param {string} stageId - Identifier for the stage (e.g., "task/generateBundle") + * @param {string} signature - Content hash signature of the stage's input resources + * @param {object} stageInstance - The stage instance to cache (typically a reader or writer) + * @param {Set} writtenResourcePaths - Set of resource paths written during this stage + * @returns {void} + */ + addSignature(stageId, signature, stageInstance, writtenResourcePaths) { + if (!this.#stageIdToSignatures.has(stageId)) { + this.#stageIdToSignatures.set(stageId, new Map()); + } + const signatureToStageInstance = this.#stageIdToSignatures.get(stageId); + signatureToStageInstance.set(signature, { + stage: stageInstance, + writtenResourcePaths, + }); + this.#cacheQueue.push([stageId, signature]); + } + + /** + * Retrieves cached stage data for a specific signature + * + * Looks up a previously cached stage by its ID and signature. Returns null + * if either the stage ID or signature is not found in the cache. + * + * @param {string} stageId - Identifier for the stage to look up + * @param {string} signature - Signature hash to match + * @returns {StageCacheEntry|null} Cached stage entry with stage instance and written paths, + * or null if not found + */ + getCacheForSignature(stageId, signature) { + if (!this.#stageIdToSignatures.has(stageId)) { + return null; + } + const signatureToStageInstance = this.#stageIdToSignatures.get(stageId); + return signatureToStageInstance.get(signature) || null; + } + + /** + * Retrieves and clears the cache queue + * + * Returns all stage signatures that have been added since the last flush, + * then resets the queue. The returned entries should be persisted to storage. + * + * Each queue entry is a tuple of [stageId, signature] that can be used to + * retrieve the full stage data via getCacheForSignature(). + * + * @returns {Array<[string, string]>} Array of [stageId, signature] tuples that need persistence + */ + flushCacheQueue() { + const queue = this.#cacheQueue; + this.#cacheQueue = []; + return queue; + } +} diff --git a/packages/project/lib/build/cache/index/HashTree.js b/packages/project/lib/build/cache/index/HashTree.js new file mode 100644 index 00000000000..b1678bb41a9 --- /dev/null +++ b/packages/project/lib/build/cache/index/HashTree.js @@ -0,0 +1,1103 @@ +import crypto from "node:crypto"; +import path from "node:path/posix"; +import {matchResourceMetadataStrict} from "../utils.js"; + +/** + * @typedef {object} @ui5/project/build/cache/index/HashTree~ResourceMetadata + * @property {number} size - File size in bytes + * @property {number} lastModified - Last modification timestamp + * @property {number|undefined} inode - File inode identifier + * @property {string} integrity - Content hash + */ + +/** + * Represents a node in the directory-based Merkle tree + */ +class TreeNode { + constructor(name, type, options = {}) { + this.name = name; // resource name or directory name + this.type = type; // 'resource' | 'directory' + this.hash = options.hash || null; // Buffer + + // Resource node properties + this.integrity = options.integrity; // Resource content hash + this.lastModified = options.lastModified; // Last modified timestamp + this.size = options.size; // File size in bytes + this.inode = options.inode; // File system inode number + + // Directory node properties + this.children = options.children || new Map(); // name -> TreeNode + } + + /** + * Get full path from root to this node + * + * @param {string} parentPath + * @returns {string} + */ + getPath(parentPath = "") { + return parentPath ? path.join(parentPath, this.name) : this.name; + } + + /** + * Serialize to JSON + * + * @returns {object} + */ + toJSON() { + const obj = { + name: this.name, + type: this.type, + hash: this.hash ? this.hash.toString("hex") : null + }; + + if (this.type === "resource") { + obj.integrity = this.integrity; + obj.lastModified = this.lastModified; + obj.size = this.size; + obj.inode = this.inode; + } else { + obj.children = {}; + for (const [name, child] of this.children) { + obj.children[name] = child.toJSON(); + } + } + + return obj; + } + + /** + * Deserialize from JSON + * + * @param {object} data + * @returns {TreeNode} + */ + static fromJSON(data) { + const options = { + hash: data.hash ? Buffer.from(data.hash, "hex") : null, + integrity: data.integrity, + lastModified: data.lastModified, + size: data.size, + inode: data.inode + }; + + if (data.type === "directory" && data.children) { + options.children = new Map(); + for (const [name, childData] of Object.entries(data.children)) { + options.children.set(name, TreeNode.fromJSON(childData)); + } + } + + return new TreeNode(data.name, data.type, options); + } + + /** + * Create a deep copy of this node + * + * @returns {TreeNode} + */ + clone() { + const options = { + hash: this.hash ? Buffer.from(this.hash) : null, + integrity: this.integrity, + lastModified: this.lastModified, + size: this.size, + inode: this.inode + }; + + if (this.type === "directory") { + options.children = new Map(); + for (const [name, child] of this.children) { + options.children.set(name, child.clone()); + } + } + + return new TreeNode(this.name, this.type, options); + } +} + +/** + * Directory-based Merkle Tree for efficient resource tracking with hierarchical structure. + * + * Computes deterministic SHA256 hashes for resources and directories, enabling: + * - Fast change detection via root hash comparison + * - Structural sharing through derived trees (memory efficient) + * - Coordinated multi-tree updates via TreeRegistry + * - Batch upsert and removal operations + * + * Primary use case: Build caching systems where multiple related resource trees + * (e.g., source files, build artifacts) need to be tracked and synchronized efficiently. + */ +export default class HashTree { + #indexTimestamp; + /** + * Create a new HashTree + * + * @param {Array|null} resources + * Initial resources to populate the tree. Each resource should have a path and optional metadata. + * @param {object} options + * @param {TreeRegistry} [options.registry] - Optional registry for coordinated batch updates across multiple trees + * @param {number} [options.indexTimestamp] - Timestamp when the resource index was created (for metadata comparison) + * @param {TreeNode} [options._root] - Internal: pre-existing root node for derived trees (enables structural sharing) + */ + constructor(resources = null, options = {}) { + this.registry = options.registry || null; + this.root = options._root || new TreeNode("", "directory"); + this.#indexTimestamp = options.indexTimestamp || Date.now(); + + // Register with registry if provided + if (this.registry) { + this.registry.register(this); + } + + if (resources && !options._root) { + this._buildTree(resources); + } else if (resources && options._root) { + // Derived tree: insert additional resources into shared structure + for (const resource of resources) { + this._insertResourceWithSharing(resource.path, resource); + } + // Recompute hashes for newly added paths + this._computeHash(this.root); + } + } + + /** + * Shallow copy a directory node (copies node, shares children) + * + * @param {TreeNode} dirNode + * @returns {TreeNode} + * @private + */ + _shallowCopyDirectory(dirNode) { + if (dirNode.type !== "directory") { + throw new Error("Can only shallow copy directory nodes"); + } + + const copy = new TreeNode(dirNode.name, "directory", { + hash: dirNode.hash ? Buffer.from(dirNode.hash) : null, + children: new Map(dirNode.children) // Shallow copy of Map (shares TreeNode references) + }); + + return copy; + } + + /** + * Build tree from resource list + * + * @param {Array<{path: string, integrity?: string}>} resources + * @private + */ + _buildTree(resources) { + // Sort resources by path for deterministic ordering + const sortedResources = [...resources].sort((a, b) => a.path.localeCompare(b.path)); + + // Insert each resource into the tree + for (const resource of sortedResources) { + this._insertResource(resource.path, resource); + } + + // Compute all hashes bottom-up + this._computeHash(this.root); + } + + /** + * Insert a resource with structural sharing for derived trees + * Implements copy-on-write: only copies directories that will be modified + * + * Key optimization: When adding "a/b/c/file.js", only copies: + * - Directory "c" (will get new child) + * Directories "a" and "b" remain shared references if they existed. + * + * This preserves memory efficiency when derived trees have different + * resources in some paths but share others. + * + * @param {string} resourcePath + * @param {object} resourceData + * @private + */ + _insertResourceWithSharing(resourcePath, resourceData) { + const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); + let current = this.root; + const pathToCopy = []; // Track path that needs copy-on-write + + // Phase 1: Navigate to find where we need to start copying + for (let i = 0; i < parts.length - 1; i++) { + const dirName = parts[i]; + + if (!current.children.has(dirName)) { + // New directory needed - we'll create from here + break; + } + + const existing = current.children.get(dirName); + if (existing.type !== "directory") { + throw new Error(`Path conflict: ${dirName} exists as resource but expected directory`); + } + + pathToCopy.push({parent: current, dirName, node: existing}); + current = existing; + } + + // Phase 2: Copy path from root down (copy-on-write) + // Only copy directories that will have their children modified + current = this.root; + let needsNewChild = false; + + for (let i = 0; i < parts.length - 1; i++) { + const dirName = parts[i]; + + if (!current.children.has(dirName)) { + // Create new directory from here + const newDir = new TreeNode(dirName, "directory"); + current.children.set(dirName, newDir); + current = newDir; + needsNewChild = true; + } else if (i === parts.length - 2) { + // This is the parent directory that will get the new resource + // Copy it to avoid modifying shared structure + const existing = current.children.get(dirName); + const copiedDir = this._shallowCopyDirectory(existing); + current.children.set(dirName, copiedDir); + current = copiedDir; + } else { + // Just traverse - don't copy intermediate directories + // They remain shared with the source tree (structural sharing) + current = current.children.get(dirName); + } + } + + // Insert the resource + const resourceName = parts[parts.length - 1]; + + if (current.children.has(resourceName)) { + throw new Error(`Duplicate resource path: ${resourcePath}`); + } + + const resourceNode = new TreeNode(resourceName, "resource", { + integrity: resourceData.integrity, + lastModified: resourceData.lastModified, + size: resourceData.size, + inode: resourceData.inode + }); + + current.children.set(resourceName, resourceNode); + } + + /** + * Insert a resource into the directory tree + * + * @param {string} resourcePath + * @param {object} resourceData + * @param {string} [resourceData.integrity] - Content hash for regular resources + * @param {number} [resourceData.lastModified] - Last modified timestamp + * @param {number} [resourceData.size] - File size in bytes + * @param {number} [resourceData.inode] - File system inode number + * @private + */ + _insertResource(resourcePath, resourceData) { + const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); + let current = this.root; + + // Navigate/create directory structure + for (let i = 0; i < parts.length - 1; i++) { + const dirName = parts[i]; + + if (!current.children.has(dirName)) { + current.children.set(dirName, new TreeNode(dirName, "directory")); + } + + current = current.children.get(dirName); + + if (current.type !== "directory") { + throw new Error(`Path conflict: ${dirName} exists as resource but expected directory`); + } + } + + // Insert the resource + const resourceName = parts[parts.length - 1]; + + if (current.children.has(resourceName)) { + throw new Error(`Duplicate resource path: ${resourcePath}`); + } + + const resourceNode = new TreeNode(resourceName, "resource", { + integrity: resourceData.integrity, + lastModified: resourceData.lastModified, + size: resourceData.size, + inode: resourceData.inode + }); + + current.children.set(resourceName, resourceNode); + } + + /** + * Compute hash for a node and all its children (recursive) + * + * @param {TreeNode} node + * @returns {Buffer} + * @private + */ + _computeHash(node) { + if (node.type === "resource") { + // Resource hash + node.hash = this._hashData(`resource:${node.name}:${node.integrity}`); + } else { + // Directory hash - compute from sorted children + const childHashes = []; + + // Sort children by name for deterministic ordering + const sortedChildren = Array.from(node.children.entries()) + .sort((a, b) => a[0].localeCompare(b[0])); + + for (const [, child] of sortedChildren) { + this._computeHash(child); // Recursively compute child hashes + childHashes.push(child.hash); + } + + // Combine all child hashes + if (childHashes.length === 0) { + // Empty directory + node.hash = this._hashData(`dir:${node.name}:empty`); + } else { + const combined = Buffer.concat(childHashes); + node.hash = crypto.createHash("sha256") + .update(`dir:${node.name}:`) + .update(combined) + .digest(); + } + } + + return node.hash; + } + + /** + * Hash a string + * + * @param {string} data + * @returns {Buffer} + * @private + */ + _hashData(data) { + return crypto.createHash("sha256").update(data).digest(); + } + + /** + * Get the root hash as a hex string + * + * @returns {string} + */ + getRootHash() { + if (!this.root.hash) { + this._computeHash(this.root); + } + return this.root.hash.toString("hex"); + } + + /** + * Get the index timestamp + * + * @returns {number} + */ + getIndexTimestamp() { + return this.#indexTimestamp; + } + + /** + * Find a node by path + * + * @param {string} resourcePath + * @returns {TreeNode|null} + * @private + */ + _findNode(resourcePath) { + if (!resourcePath || resourcePath === "" || resourcePath === ".") { + return this.root; + } + + const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); + let current = this.root; + + for (const part of parts) { + if (!current.children.has(part)) { + return null; + } + current = current.children.get(part); + } + + return current; + } + + /** + * Create a derived tree that shares subtrees with this tree. + * + * Derived trees are filtered views on shared data - they share node references with the parent tree, + * enabling efficient memory usage. Changes propagate through the TreeRegistry to all derived trees. + * + * Use case: Represent different resource sets (e.g., debug vs. production builds) that share common files. + * + * @param {Array} additionalResources + * Resources to add to the derived tree (in addition to shared resources from parent) + * @returns {HashTree} New tree sharing subtrees with this tree + */ + deriveTree(additionalResources = []) { + // Shallow copy root to allow adding new top-level directories + const derivedRoot = this._shallowCopyDirectory(this.root); + + // Create derived tree with shared root and same registry + const derived = new HashTree(additionalResources, { + registry: this.registry, + _root: derivedRoot + }); + + return derived; + } + + /** + * Update a single resource and recompute affected hashes. + * + * When a registry is attached, schedules the update for batch processing. + * Otherwise, applies the update immediately and recomputes ancestor hashes. + * Skips update if resource metadata hasn't changed (optimization). + * + * @param {@ui5/fs/Resource} resource - Resource instance to update + * @returns {Promise>} Array containing the resource path if changed, empty array if unchanged + */ + async updateResource(resource) { + const resourcePath = resource.getOriginalPath(); + + // If registry is attached, schedule update instead of applying immediately + if (this.registry) { + this.registry.scheduleUpdate(resource); + return [resourcePath]; // Will be determined after flush + } + + // Fall back to immediate update + const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); + + if (parts.length === 0) { + throw new Error("Cannot update root directory"); + } + + // Navigate to parent directory + let current = this.root; + const pathToRoot = [current]; + + for (let i = 0; i < parts.length - 1; i++) { + const dirName = parts[i]; + + if (!current.children.has(dirName)) { + throw new Error(`Directory not found: ${parts.slice(0, i + 1).join("/")}`); + } + + current = current.children.get(dirName); + pathToRoot.push(current); + } + + // Update the resource + const resourceName = parts[parts.length - 1]; + const resourceNode = current.children.get(resourceName); + + if (!resourceNode) { + throw new Error(`Resource not found: ${resourcePath}`); + } + + if (resourceNode.type !== "resource") { + throw new Error(`Path is not a resource: ${resourcePath}`); + } + + // Create metadata object from current node state + const currentMetadata = { + integrity: resourceNode.integrity, + lastModified: resourceNode.lastModified, + size: resourceNode.size, + inode: resourceNode.inode + }; + + // Check whether resource actually changed + const isUnchanged = await matchResourceMetadataStrict(resource, currentMetadata, this.#indexTimestamp); + if (isUnchanged) { + return []; // No change + } + + // Update resource metadata + resourceNode.integrity = await resource.getIntegrity(); + resourceNode.lastModified = resource.getLastModified(); + resourceNode.size = await resource.getSize(); + resourceNode.inode = resource.getInode(); + + // Recompute hashes from resource up to root + this._computeHash(resourceNode); + + for (let i = pathToRoot.length - 1; i >= 0; i--) { + this._computeHash(pathToRoot[i]); + } + + return [resourcePath]; + } + + /** + * Update multiple resources efficiently. + * + * When a registry is attached, schedules updates for batch processing. + * Otherwise, updates all resources immediately, collecting affected directories + * and recomputing hashes bottom-up for optimal performance. + * + * Skips resources whose metadata hasn't changed (optimization). + * + * @param {Array<@ui5/fs/Resource>} resources - Array of Resource instances to update + * @returns {Promise>} Paths of resources that actually changed + */ + async updateResources(resources) { + if (!resources || resources.length === 0) { + return []; + } + + const changedResources = []; + const affectedPaths = new Set(); + + // Update all resources and collect affected directory paths + for (const resource of resources) { + const resourcePath = resource.getOriginalPath(); + const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); + + // Find the resource node + const node = this._findNode(resourcePath); + if (!node || node.type !== "resource") { + throw new Error(`Resource not found: ${resourcePath}`); + } + + // Create metadata object from current node state + const currentMetadata = { + integrity: node.integrity, + lastModified: node.lastModified, + size: node.size, + inode: node.inode + }; + + // Check whether resource actually changed + const isUnchanged = await matchResourceMetadataStrict(resource, currentMetadata, this.#indexTimestamp); + if (isUnchanged) { + continue; // Skip unchanged resources + } + + // Update resource metadata + node.integrity = await resource.getIntegrity(); + node.lastModified = resource.getLastModified(); + node.size = await resource.getSize(); + node.inode = resource.getInode(); + changedResources.push(resourcePath); + + // Recompute resource hash + this._computeHash(node); + + // Mark all ancestor directories as needing recomputation + for (let i = 0; i < parts.length; i++) { + affectedPaths.add(parts.slice(0, i).join(path.sep)); + } + } + + // Recompute directory hashes bottom-up + const sortedPaths = Array.from(affectedPaths).sort((a, b) => { + // Sort by depth (deeper first) and then alphabetically + const depthA = a.split(path.sep).length; + const depthB = b.split(path.sep).length; + if (depthA !== depthB) return depthB - depthA; + return a.localeCompare(b); + }); + + for (const dirPath of sortedPaths) { + const node = this._findNode(dirPath); + if (node && node.type === "directory") { + this._computeHash(node); + } + } + + return changedResources; + } + + /** + * Upsert multiple resources (insert if new, update if exists). + * + * Intelligently determines whether each resource is new (insert) or existing (update). + * When a registry is attached, schedules operations for batch processing. + * Otherwise, applies operations immediately with optimized hash recomputation. + * + * Automatically creates missing parent directories during insertion. + * Skips resources whose metadata hasn't changed (optimization). + * + * @param {Array<@ui5/fs/Resource>} resources - Array of Resource instances to upsert + * @returns {Promise<{added: Array, updated: Array, unchanged: Array, scheduled?: Array}>} + * Status report: arrays of paths by operation type. 'scheduled' is present when using registry. + */ + async upsertResources(resources) { + if (!resources || resources.length === 0) { + return {added: [], updated: [], unchanged: []}; + } + + if (this.registry) { + for (const resource of resources) { + this.registry.scheduleUpsert(resource); + } + // When using registry, actual results are determined during flush + return { + added: [], + updated: [], + unchanged: [], + scheduled: resources.map((r) => r.getOriginalPath()) + }; + } + + // Immediate mode + const added = []; + const updated = []; + const unchanged = []; + const affectedPaths = new Set(); + + for (const resource of resources) { + const resourcePath = resource.getOriginalPath(); + const existingNode = this.getResourceByPath(resourcePath); + + if (!existingNode) { + // Insert new resource + const resourceData = { + integrity: await resource.getIntegrity(), + lastModified: resource.getLastModified(), + size: await resource.getSize(), + inode: resource.getInode() + }; + this._insertResource(resourcePath, resourceData); + + const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); + const resourceNode = this._findNode(resourcePath); + this._computeHash(resourceNode); + + added.push(resourcePath); + + // Mark ancestors for recomputation + for (let i = 0; i < parts.length; i++) { + affectedPaths.add(parts.slice(0, i).join(path.sep)); + } + } else { + // Check if unchanged + const currentMetadata = { + integrity: existingNode.integrity, + lastModified: existingNode.lastModified, + size: existingNode.size, + inode: existingNode.inode + }; + + const isUnchanged = await matchResourceMetadataStrict(resource, currentMetadata, this.#indexTimestamp); + if (isUnchanged) { + unchanged.push(resourcePath); + continue; + } + + // Update existing resource + existingNode.integrity = await resource.getIntegrity(); + existingNode.lastModified = resource.getLastModified(); + existingNode.size = await resource.getSize(); + existingNode.inode = resource.getInode(); + + this._computeHash(existingNode); + updated.push(resourcePath); + + // Mark ancestors for recomputation + const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); + for (let i = 0; i < parts.length; i++) { + affectedPaths.add(parts.slice(0, i).join(path.sep)); + } + } + } + + // Recompute directory hashes bottom-up + const sortedPaths = Array.from(affectedPaths).sort((a, b) => { + const depthA = a ? a.split(path.sep).length : 0; + const depthB = b ? b.split(path.sep).length : 0; + if (depthA !== depthB) return depthB - depthA; + return a.localeCompare(b); + }); + + for (const dirPath of sortedPaths) { + const node = this._findNode(dirPath); + if (node && node.type === "directory") { + this._computeHash(node); + } + } + + return {added, updated, unchanged}; + } + + /** + * Remove multiple resources efficiently. + * + * When a registry is attached, schedules removals for batch processing. + * Otherwise, removes resources immediately and recomputes affected ancestor hashes. + * + * Note: When using a registry with derived trees, removals propagate to all trees + * sharing the affected directories (intentional for the shared view model). + * + * @param {Array} resourcePaths - Array of resource paths to remove + * @returns {Promise<{removed: Array, notFound: Array, scheduled?: Array}>} + * Status report: 'removed' contains successfully removed paths, 'notFound' contains paths that didn't exist. + * 'scheduled' is present when using registry. + */ + async removeResources(resourcePaths) { + if (!resourcePaths || resourcePaths.length === 0) { + return {removed: [], notFound: []}; + } + + if (this.registry) { + for (const resourcePath of resourcePaths) { + this.registry.scheduleRemoval(resourcePath); + } + return { + removed: [], + notFound: [], + scheduled: resourcePaths + }; + } + + // Immediate mode + const removed = []; + const notFound = []; + const affectedPaths = new Set(); + + for (const resourcePath of resourcePaths) { + const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); + + if (parts.length === 0) { + throw new Error("Cannot remove root"); + } + + // Navigate to parent + let current = this.root; + let pathExists = true; + for (let i = 0; i < parts.length - 1; i++) { + if (!current.children.has(parts[i])) { + pathExists = false; + break; + } + current = current.children.get(parts[i]); + } + + if (!pathExists) { + notFound.push(resourcePath); + continue; + } + + // Remove resource + const resourceName = parts[parts.length - 1]; + const wasRemoved = current.children.delete(resourceName); + + if (wasRemoved) { + removed.push(resourcePath); + // Mark ancestors for recomputation + for (let i = 0; i < parts.length; i++) { + affectedPaths.add(parts.slice(0, i).join(path.sep)); + } + } else { + notFound.push(resourcePath); + } + } + + // Recompute directory hashes bottom-up + const sortedPaths = Array.from(affectedPaths).sort((a, b) => { + const depthA = a ? a.split(path.sep).length : 0; + const depthB = b ? b.split(path.sep).length : 0; + if (depthA !== depthB) return depthB - depthA; + return a.localeCompare(b); + }); + + for (const dirPath of sortedPaths) { + const node = this._findNode(dirPath); + if (node && node.type === "directory") { + this._computeHash(node); + } + } + + return {removed, notFound}; + } + + /** + * Recompute hashes for all ancestor directories up to root. + * + * Used after modifications to ensure the entire path from the modified + * resource/directory up to the root has correct hash values. + * + * @param {string} resourcePath - Path to resource or directory that was modified + * @private + */ + _recomputeAncestorHashes(resourcePath) { + const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); + + // Recompute from deepest to root + for (let i = parts.length; i >= 0; i--) { + const dirPath = parts.slice(0, i).join(path.sep); + const node = this._findNode(dirPath); + if (node && node.type === "directory") { + this._computeHash(node); + } + } + } + + /** + * Get hash for a specific directory. + * + * Useful for checking if a specific subtree has changed without comparing the entire tree. + * + * @param {string} dirPath - Path to directory + * @returns {string} Directory hash as hex string + * @throws {Error} If path not found or path is not a directory + */ + getDirectoryHash(dirPath) { + const node = this._findNode(dirPath); + if (!node) { + throw new Error(`Path not found: ${dirPath}`); + } + if (node.type !== "directory") { + throw new Error(`Path is not a directory: ${dirPath}`); + } + return node.hash.toString("hex"); + } + + /** + * Check if a directory's contents have changed by comparing hashes. + * + * Efficient way to detect changes in a subtree without comparing individual files. + * + * @param {string} dirPath - Path to directory + * @param {string} previousHash - Previous hash to compare against + * @returns {boolean} true if directory contents changed, false otherwise + */ + hasDirectoryChanged(dirPath, previousHash) { + const currentHash = this.getDirectoryHash(dirPath); + return currentHash !== previousHash; + } + + /** + * Get all resources in a directory (non-recursive). + * + * Useful for inspecting directory contents or performing directory-level operations. + * + * @param {string} dirPath - Path to directory + * @returns {Array<{name: string, path: string, type: string, hash: string}>} Array of directory entries sorted by name + * @throws {Error} If directory not found or path is not a directory + */ + listDirectory(dirPath) { + const node = this._findNode(dirPath); + if (!node) { + throw new Error(`Directory not found: ${dirPath}`); + } + if (node.type !== "directory") { + throw new Error(`Path is not a directory: ${dirPath}`); + } + + const items = []; + for (const [name, child] of node.children) { + items.push({ + name, + path: path.join(dirPath, name), + type: child.type, + hash: child.hash.toString("hex") + }); + } + + return items.sort((a, b) => a.name.localeCompare(b.name)); + } + + /** + * Get all resources recursively. + * + * Returns complete resource metadata including paths, integrity hashes, and file stats. + * Useful for full tree inspection or export. + * + * @returns {Array<{path: string, integrity?: string, hash: string, lastModified?: number, size?: number, inode?: number}>} + * Array of all resources with metadata, sorted by path + */ + getAllResources() { + const resources = []; + + const traverse = (node, currentPath) => { + if (node.type === "resource") { + resources.push({ + path: currentPath, + integrity: node.integrity, + hash: node.hash.toString("hex"), + lastModified: node.lastModified, + size: node.size, + inode: node.inode + }); + } else { + for (const [name, child] of node.children) { + const childPath = currentPath ? path.join(currentPath, name) : name; + traverse(child, childPath); + } + } + }; + + traverse(this.root, "/"); + return resources.sort((a, b) => a.path.localeCompare(b.path)); + } + + /** + * Get tree statistics. + * + * Provides summary information about tree size and structure. + * + * @returns {{resources: number, directories: number, maxDepth: number, rootHash: string}} + * Statistics object with counts and root hash + */ + getStats() { + let resourceCount = 0; + let dirCount = 0; + let maxDepth = 0; + + const traverse = (node, depth) => { + maxDepth = Math.max(maxDepth, depth); + + if (node.type === "resource") { + resourceCount++; + } else { + dirCount++; + for (const child of node.children.values()) { + traverse(child, depth + 1); + } + } + }; + + traverse(this.root, 0); + + return { + resources: resourceCount, + directories: dirCount, + maxDepth, + rootHash: this.getRootHash() + }; + } + + /** + * Serialize tree to JSON + * + * @returns {object} + */ + toCacheObject() { + return { + version: 1, + root: this.root.toJSON(), + }; + } + + /** + * Deserialize tree from JSON + * + * @param {object} data + * @param {object} [options] + * @returns {HashTree} + */ + static fromCache(data, options = {}) { + if (data.version !== 1) { + throw new Error(`Unsupported version: ${data.version}`); + } + + const tree = new HashTree(null, options); + tree.root = TreeNode.fromJSON(data.root); + + return tree; + } + + /** + * Validate tree structure and hashes + * + * @returns {boolean} + */ + validate() { + const errors = []; + + const validateNode = (node, currentPath) => { + // Recompute hash + const originalHash = node.hash; + this._computeHash(node); + + if (!originalHash.equals(node.hash)) { + errors.push(`Hash mismatch at ${currentPath || "root"}`); + } + + // Restore original (in case validation is non-destructive) + node.hash = originalHash; + + // Recurse for directories + if (node.type === "directory") { + for (const [name, child] of node.children) { + const childPath = currentPath ? path.join(currentPath, name) : name; + validateNode(child, childPath); + } + } + }; + + validateNode(this.root, ""); + + if (errors.length > 0) { + throw new Error(`Validation failed:\n${errors.join("\n")}`); + } + + return true; + } + /** + * Create a deep clone of this tree. + * + * Unlike deriveTree(), this creates a completely independent copy + * with no shared node references. + * + * @returns {HashTree} New independent tree instance + */ + clone() { + const cloned = new HashTree(); + cloned.root = this.root.clone(); + return cloned; + } + + /** + * Get resource node by path + * + * @param {string} resourcePath + * @returns {TreeNode|null} + */ + getResourceByPath(resourcePath) { + const node = this._findNode(resourcePath); + return node && node.type === "resource" ? node : null; + } + + /** + * Check if a path exists in the tree + * + * @param {string} resourcePath + * @returns {boolean} + */ + hasPath(resourcePath) { + return this._findNode(resourcePath) !== null; + } + + /** + * Get all resource paths in sorted order + * + * @returns {Array} + */ + getResourcePaths() { + const paths = []; + + const traverse = (node, currentPath) => { + if (node.type === "resource") { + paths.push(currentPath); + } else { + for (const [name, child] of node.children) { + const childPath = currentPath ? path.join(currentPath, name) : name; + traverse(child, childPath); + } + } + }; + + traverse(this.root, "/"); + return paths.sort(); + } +} diff --git a/packages/project/lib/build/cache/index/ResourceIndex.js b/packages/project/lib/build/cache/index/ResourceIndex.js new file mode 100644 index 00000000000..b2b62448617 --- /dev/null +++ b/packages/project/lib/build/cache/index/ResourceIndex.js @@ -0,0 +1,233 @@ +/** + * @module @ui5/project/build/cache/index/ResourceIndex + * @description Manages an indexed view of build resources with hash-based tracking. + * + * ResourceIndex provides efficient resource tracking through hash tree structures, + * enabling fast delta detection and signature calculation for build caching. + */ +import HashTree from "./HashTree.js"; +import {createResourceIndex} from "../utils.js"; + +/** + * Manages an indexed view of build resources with content-based hashing. + * + * ResourceIndex wraps a HashTree to provide resource indexing capabilities for build caching. + * It maintains resource metadata (path, integrity, size, modification time) and computes + * signatures for change detection. The index supports efficient updates and can be + * persisted/restored from cache. + * + * @example + * // Create from resources + * const index = await ResourceIndex.create(resources, registry); + * const signature = index.getSignature(); + * + * @example + * // Update with delta detection + * const {changedPaths, resourceIndex} = await ResourceIndex.fromCacheWithDelta( + * cachedIndex, + * currentResources + * ); + */ +export default class ResourceIndex { + #tree; + #indexTimestamp; + + /** + * Creates a new ResourceIndex instance. + * + * @param {HashTree} tree - The hash tree containing resource metadata + * @param {number} [indexTimestamp] - Timestamp when the index was created (defaults to current time) + * @private + */ + constructor(tree, indexTimestamp) { + this.#tree = tree; + this.#indexTimestamp = indexTimestamp || Date.now(); + } + + /** + * Creates a new ResourceIndex from a set of resources. + * + * Builds a hash tree from the provided resources, computing content hashes + * and metadata for each resource. The resulting index can be used for + * signature calculation and change tracking. + * + * @param {Array<@ui5/fs/Resource>} resources - Resources to index + * @param {import("./TreeRegistry.js").default} [registry] - Optional tree registry for deduplication + * @returns {Promise} A new resource index + * @public + */ + static async create(resources, registry) { + const resourceIndex = await createResourceIndex(resources); + const tree = new HashTree(resourceIndex, {registry}); + return new ResourceIndex(tree); + } + + /** + * Restores a ResourceIndex from cache and applies delta updates. + * + * Takes a cached index and a current set of resources, then: + * 1. Identifies removed resources (in cache but not in current set) + * 2. Identifies added/updated resources (new or modified since cache) + * 3. Returns both the updated index and list of all changed paths + * + * This method is optimized for incremental builds where most resources + * remain unchanged between builds. + * + * @param {object} indexCache - Cached index object from previous build + * @param {number} indexCache.indexTimestamp - Timestamp of cached index + * @param {object} indexCache.indexTree - Cached hash tree structure + * @param {Array<@ui5/fs/Resource>} resources - Current resources to compare against cache + * @returns {Promise<{changedPaths: string[], resourceIndex: ResourceIndex}>} + * Object containing array of all changed resource paths and the updated index + * @public + */ + static async fromCacheWithDelta(indexCache, resources) { + const {indexTimestamp, indexTree} = indexCache; + const tree = HashTree.fromCache(indexTree, {indexTimestamp}); + const currentResourcePaths = new Set(resources.map((resource) => resource.getOriginalPath())); + const removed = tree.getResourcePaths().filter((resourcePath) => { + return !currentResourcePaths.has(resourcePath); + }); + await tree.removeResources(removed); + const {added, updated} = await tree.upsertResources(resources); + return { + changedPaths: [...added, ...updated, ...removed], + resourceIndex: new ResourceIndex(tree), + }; + } + + /** + * Restores a ResourceIndex from cached metadata. + * + * Reconstructs the resource index from cached metadata without performing + * content hash verification. Useful when the cache is known to be valid + * and fast restoration is needed. + * + * @param {object} indexCache - Cached index object + * @param {Object} indexCache.resourceMetadata - + * Map of resource paths to metadata (integrity, lastModified, size) + * @param {import("./TreeRegistry.js").default} [registry] - Optional tree registry for deduplication + * @returns {Promise} Restored resource index + * @public + */ + static async fromCache(indexCache, registry) { + const resourceIndex = Object.entries(indexCache.resourceMetadata).map(([path, metadata]) => { + return { + path, + integrity: metadata.integrity, + lastModified: metadata.lastModified, + size: metadata.size, + }; + }); + const tree = new HashTree(resourceIndex, {registry}); + return new ResourceIndex(tree); + } + + /** + * Creates a deep copy of this ResourceIndex. + * + * The cloned index has its own hash tree but shares the same timestamp + * as the original. Useful for creating independent index variations. + * + * @returns {ResourceIndex} A cloned resource index + * @public + */ + clone() { + const cloned = new ResourceIndex(this.#tree.clone(), this.#indexTimestamp); + return cloned; + } + + /** + * Creates a derived ResourceIndex by adding additional resources. + * + * Derives a new hash tree from the current tree by incorporating + * additional resources. The original index remains unchanged. + * This is useful for creating task-specific resource views. + * + * @param {Array<@ui5/fs/Resource>} additionalResources - Resources to add to the derived index + * @returns {Promise} A new resource index with the additional resources + * @public + */ + async deriveTree(additionalResources) { + const resourceIndex = await createResourceIndex(additionalResources); + return new ResourceIndex(this.#tree.deriveTree(resourceIndex)); + } + + /** + * Updates existing resources in the index. + * + * Updates metadata for resources that already exist in the index. + * Resources not present in the index are ignored. + * + * @param {Array<@ui5/fs/Resource>} resources - Resources to update + * @returns {Promise} Array of paths for resources that were updated + * @public + */ + async updateResources(resources) { + return await this.#tree.updateResources(resources); + } + + /** + * Inserts or updates resources in the index. + * + * For each resource: + * - If it exists in the index and has changed, it's updated + * - If it doesn't exist in the index, it's added + * - If it exists and hasn't changed, no action is taken + * + * @param {Array<@ui5/fs/Resource>} resources - Resources to upsert + * @returns {Promise<{added: string[], updated: string[]}>} + * Object with arrays of added and updated resource paths + * @public + */ + async upsertResources(resources) { + return await this.#tree.upsertResources(resources); + } + + /** + * Computes the signature hash for this resource index. + * + * The signature is the root hash of the underlying hash tree, + * representing the combined state of all indexed resources. + * Any change to any resource will result in a different signature. + * + * @returns {string} SHA-256 hash signature of the resource index + * @public + */ + getSignature() { + return this.#tree.getRootHash(); + } + + /** + * Serializes the ResourceIndex to a cache object. + * + * Converts the index to a plain object suitable for JSON serialization + * and storage in the build cache. The cached object can be restored + * using fromCache() or fromCacheWithDelta(). + * + * @returns {object} Cache object containing timestamp and tree structure + * @returns {number} return.indexTimestamp - Timestamp when index was created + * @returns {object} return.indexTree - Serialized hash tree structure + * @public + */ + toCacheObject() { + return { + indexTimestamp: this.#indexTimestamp, + indexTree: this.#tree.toCacheObject(), + }; + } + + // #getResourceMetadata() { + // const resources = this.#tree.getAllResources(); + // const resourceMetadata = Object.create(null); + // for (const resource of resources) { + // resourceMetadata[resource.path] = { + // lastModified: resource.lastModified, + // size: resource.size, + // integrity: resource.integrity, + // inode: resource.inode, + // }; + // } + // return resourceMetadata; + // } +} diff --git a/packages/project/lib/build/cache/index/TreeRegistry.js b/packages/project/lib/build/cache/index/TreeRegistry.js new file mode 100644 index 00000000000..92550b9ba52 --- /dev/null +++ b/packages/project/lib/build/cache/index/TreeRegistry.js @@ -0,0 +1,379 @@ +import path from "node:path/posix"; +import {matchResourceMetadataStrict} from "../utils.js"; + +/** + * Registry for coordinating batch updates across multiple Merkle trees that share nodes by reference. + * + * When multiple trees (e.g., derived trees) share directory and resource nodes through structural sharing, + * direct mutations would be visible to all trees simultaneously. The TreeRegistry provides a transaction-like + * mechanism to batch and coordinate updates: + * + * 1. Changes are scheduled via scheduleUpsert() and scheduleRemoval() without immediately modifying trees + * 2. During flush(), all pending operations are applied atomically across all registered trees + * 3. Shared nodes are modified only once, with changes propagating to all trees that reference them + * 4. Directory hashes are recomputed efficiently in a single bottom-up pass + * + * This approach ensures consistency when multiple trees represent filtered views of the same underlying data. + * + * @property {Set} trees - All registered HashTree instances + * @property {Map} pendingUpserts - Resource path to resource mappings for scheduled upserts + * @property {Set} pendingRemovals - Resource paths scheduled for removal + */ +export default class TreeRegistry { + trees = new Set(); + pendingUpserts = new Map(); + pendingRemovals = new Set(); + + /** + * Register a HashTree instance with this registry for coordinated updates. + * + * Once registered, the tree will participate in all batch operations triggered by flush(). + * Multiple trees can share the same underlying nodes through structural sharing. + * + * @param {import('./HashTree.js').default} tree - HashTree instance to register + */ + register(tree) { + this.trees.add(tree); + } + + /** + * Remove a HashTree instance from this registry. + * + * After unregistering, the tree will no longer participate in batch operations. + * Any pending operations scheduled before unregistration will still be applied during flush(). + * + * @param {import('./HashTree.js').default} tree - HashTree instance to unregister + */ + unregister(tree) { + this.trees.delete(tree); + } + + /** + * Schedule a resource update to be applied during flush(). + * + * This method delegates to scheduleUpsert() for backward compatibility. + * Prefer using scheduleUpsert() directly for new code. + * + * @param {@ui5/fs/Resource} resource - Resource instance to update + */ + scheduleUpdate(resource) { + this.scheduleUpsert(resource); + } + + /** + * Schedule a resource upsert (insert or update) to be applied during flush(). + * + * If a resource with the same path doesn't exist, it will be inserted (including creating + * any necessary parent directories). If it exists, its metadata will be updated if changed. + * Scheduling an upsert cancels any pending removal for the same resource path. + * + * @param {@ui5/fs/Resource} resource - Resource instance to upsert + */ + scheduleUpsert(resource) { + const resourcePath = resource.getOriginalPath(); + this.pendingUpserts.set(resourcePath, resource); + // Cancel any pending removal for this path + this.pendingRemovals.delete(resourcePath); + } + + /** + * Schedule a resource removal to be applied during flush(). + * + * The resource will be removed from all registered trees that contain it. + * Scheduling a removal cancels any pending upsert for the same resource path. + * Removals are processed before upserts during flush() to handle replacement scenarios. + * + * @param {string} resourcePath - POSIX-style path to the resource (e.g., "src/main.js") + */ + scheduleRemoval(resourcePath) { + this.pendingRemovals.add(resourcePath); + // Cancel any pending upsert for this path + this.pendingUpserts.delete(resourcePath); + } + + /** + * Apply all pending upserts and removals atomically across all registered trees. + * + * This method processes scheduled operations in three phases: + * + * Phase 1: Process removals + * - Delete resource nodes from all trees that contain them + * - Mark affected ancestor directories for hash recomputation + * + * Phase 2: Process upserts (inserts and updates) + * - Group operations by parent directory for efficiency + * - Create missing parent directories as needed + * - Insert new resources or update existing ones + * - Skip updates for resources with unchanged metadata + * - Track modified nodes to avoid duplicate updates to shared nodes + * + * Phase 3: Recompute directory hashes + * - Sort affected directories by depth (deepest first) + * - Recompute hashes bottom-up to root + * - Each shared node is updated once, visible to all trees + * + * After successful completion, all pending operations are cleared. + * + * @returns {Promise<{added: string[], updated: string[], unchanged: string[], removed: string[]}>} + * Object containing arrays of resource paths categorized by operation result + */ + async flush() { + if (this.pendingUpserts.size === 0 && this.pendingRemovals.size === 0) { + return { + added: [], + updated: [], + unchanged: [], + removed: [] + }; + } + + // Track added, updated, unchanged, and removed resources + const addedResources = []; + const updatedResources = []; + const unchangedResources = []; + const removedResources = []; + + // Track which resource nodes we've already modified to handle shared nodes + const modifiedNodes = new Set(); + + // Track all affected trees and the paths that need recomputation + const affectedTrees = new Map(); // tree -> Set of directory paths needing recomputation + + // 1. Handle removals first + for (const resourcePath of this.pendingRemovals) { + const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); + const resourceName = parts[parts.length - 1]; + const parentPath = parts.slice(0, -1).join(path.sep); + + for (const tree of this.trees) { + const parentNode = tree._findNode(parentPath); + if (!parentNode || parentNode.type !== "directory") { + continue; + } + + if (parentNode.children.has(resourceName)) { + parentNode.children.delete(resourceName); + + if (!affectedTrees.has(tree)) { + affectedTrees.set(tree, new Set()); + } + + this._markAncestorsAffected(tree, parts.slice(0, -1), affectedTrees); + + if (!removedResources.includes(resourcePath)) { + removedResources.push(resourcePath); + } + } + } + } + + // 2. Handle upserts - group by directory + const upsertsByDir = new Map(); // parentPath -> [{resourceName, resource, fullPath}] + + for (const [resourcePath, resource] of this.pendingUpserts) { + const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); + const resourceName = parts[parts.length - 1]; + const parentPath = parts.slice(0, -1).join(path.sep); + + if (!upsertsByDir.has(parentPath)) { + upsertsByDir.set(parentPath, []); + } + upsertsByDir.get(parentPath).push({resourceName, resource, fullPath: resourcePath}); + } + + // Apply upserts + for (const [parentPath, upserts] of upsertsByDir) { + for (const tree of this.trees) { + // Ensure parent directory exists + let parentNode = tree._findNode(parentPath); + if (!parentNode) { + parentNode = this._ensureDirectoryPath(tree, parentPath.split(path.sep).filter((p) => p.length > 0)); + } + + if (parentNode.type !== "directory") { + continue; + } + + let dirModified = false; + for (const upsert of upserts) { + let resourceNode = parentNode.children.get(upsert.resourceName); + + if (!resourceNode) { + // INSERT: Create new resource node + const TreeNode = tree.root.constructor; + resourceNode = new TreeNode(upsert.resourceName, "resource", { + integrity: await upsert.resource.getIntegrity(), + lastModified: upsert.resource.getLastModified(), + size: await upsert.resource.getSize(), + inode: upsert.resource.getInode() + }); + parentNode.children.set(upsert.resourceName, resourceNode); + modifiedNodes.add(resourceNode); + dirModified = true; + + if (!addedResources.includes(upsert.fullPath)) { + addedResources.push(upsert.fullPath); + } + } else if (resourceNode.type === "resource") { + // UPDATE: Check if modified + if (!modifiedNodes.has(resourceNode)) { + const currentMetadata = { + integrity: resourceNode.integrity, + lastModified: resourceNode.lastModified, + size: resourceNode.size, + inode: resourceNode.inode + }; + + const isUnchanged = await matchResourceMetadataStrict( + upsert.resource, + currentMetadata, + tree.getIndexTimestamp() + ); + + if (!isUnchanged) { + resourceNode.integrity = await upsert.resource.getIntegrity(); + resourceNode.lastModified = upsert.resource.getLastModified(); + resourceNode.size = await upsert.resource.getSize(); + resourceNode.inode = upsert.resource.getInode(); + modifiedNodes.add(resourceNode); + dirModified = true; + + if (!updatedResources.includes(upsert.fullPath)) { + updatedResources.push(upsert.fullPath); + } + } else { + if (!unchangedResources.includes(upsert.fullPath)) { + unchangedResources.push(upsert.fullPath); + } + } + } else { + dirModified = true; + } + } + } + + if (dirModified) { + // Compute hashes for modified/new resources + for (const upsert of upserts) { + const resourceNode = parentNode.children.get(upsert.resourceName); + if (resourceNode && resourceNode.type === "resource" && modifiedNodes.has(resourceNode)) { + tree._computeHash(resourceNode); + } + } + + if (!affectedTrees.has(tree)) { + affectedTrees.set(tree, new Set()); + } + + tree._computeHash(parentNode); + this._markAncestorsAffected(tree, parentPath.split(path.sep).filter((p) => p.length > 0), affectedTrees); + } + } + } + + // Recompute ancestor hashes for all affected trees + for (const [tree, affectedPaths] of affectedTrees) { + // Sort paths by depth (deepest first) to recompute bottom-up + const sortedPaths = Array.from(affectedPaths).sort((a, b) => { + const depthA = a ? a.split(path.sep).length : 0; + const depthB = b ? b.split(path.sep).length : 0; + if (depthA !== depthB) return depthB - depthA; // deeper first + return a.localeCompare(b); + }); + + for (const dirPath of sortedPaths) { + const node = tree._findNode(dirPath); + if (node && node.type === "directory") { + tree._computeHash(node); + } + } + } + + // Clear all pending operations + this.pendingUpserts.clear(); + this.pendingRemovals.clear(); + + return { + added: addedResources, + updated: updatedResources, + unchanged: unchangedResources, + removed: removedResources + }; + } + + /** + * Mark all ancestor directories in a tree as requiring hash recomputation. + * + * When a resource or directory is modified, all ancestor directories up to the root + * need their hashes recomputed to reflect the change. This method tracks those paths + * in the affectedTrees map for later batch processing. + * + * @param {import('./HashTree.js').default} tree - Tree containing the affected path + * @param {string[]} pathParts - Path components of the modified resource/directory + * @param {Map>} affectedTrees - Map tracking affected paths per tree + * @private + */ + _markAncestorsAffected(tree, pathParts, affectedTrees) { + if (!affectedTrees.has(tree)) { + affectedTrees.set(tree, new Set()); + } + + for (let i = 0; i <= pathParts.length; i++) { + affectedTrees.get(tree).add(pathParts.slice(0, i).join(path.sep)); + } + } + + /** + * Ensure a directory path exists in a tree, creating missing directories as needed. + * + * This method walks down the path from root, creating any missing directory nodes. + * It's used during upsert operations to automatically create parent directories + * when inserting resources into paths that don't yet exist. + * + * @param {import('./HashTree.js').default} tree - Tree to create directory path in + * @param {string[]} pathParts - Path components of the directory to ensure exists + * @returns {object} The directory node at the end of the path + * @private + */ + _ensureDirectoryPath(tree, pathParts) { + let current = tree.root; + const TreeNode = tree.root.constructor; + + for (const part of pathParts) { + if (!current.children.has(part)) { + const dirNode = new TreeNode(part, "directory"); + current.children.set(part, dirNode); + } + current = current.children.get(part); + } + + return current; + } + + /** + * Get the number of HashTree instances currently registered with this registry. + * + * @returns {number} Count of registered trees + */ + getTreeCount() { + return this.trees.size; + } + + /** + * Get the total number of pending operations (upserts + removals) waiting to be applied. + * + * @returns {number} Count of pending upserts and removals combined + */ + getPendingUpdateCount() { + return this.pendingUpserts.size + this.pendingRemovals.size; + } + + /** + * Check if there are any pending operations waiting to be applied. + * + * @returns {boolean} True if there are pending upserts or removals, false otherwise + */ + hasPendingUpdates() { + return this.pendingUpserts.size > 0 || this.pendingRemovals.size > 0; + } +} diff --git a/packages/project/lib/build/cache/utils.js b/packages/project/lib/build/cache/utils.js index de32b3f39a7..6da9489eaed 100644 --- a/packages/project/lib/build/cache/utils.js +++ b/packages/project/lib/build/cache/utils.js @@ -7,76 +7,146 @@ */ /** - * Compares two resource instances for equality + * Compares a resource instance with cached resource metadata. * - * @param {object} resourceA - First resource to compare - * @param {object} resourceB - Second resource to compare - * @returns {Promise} True if resources are equal - * @throws {Error} If either resource is undefined + * Optimized for quickly rejecting changed files + * + * @param {object} resource Resource instance to compare + * @param {ResourceMetadata} resourceMetadata Resource metadata to compare against + * @param {number} indexTimestamp Timestamp of the metadata creation + * @returns {Promise} True if resource is found to match the metadata + * @throws {Error} If resource or metadata is undefined */ -export async function areResourcesEqual(resourceA, resourceB) { - if (!resourceA || !resourceB) { - throw new Error("Cannot compare undefined resources"); +export async function matchResourceMetadata(resource, resourceMetadata, indexTimestamp) { + if (!resource || !resourceMetadata) { + throw new Error("Cannot compare undefined resources or metadata"); } - if (resourceA === resourceB) { - return true; + + const currentLastModified = resource.getLastModified(); + if (currentLastModified > indexTimestamp) { + // Resource modified after index was created, no need for further checks + return false; } - if (resourceA.getOriginalPath() !== resourceB.getOriginalPath()) { - throw new Error("Cannot compare resources with different original paths"); + if (currentLastModified !== resourceMetadata.lastModified) { + return false; } - if (resourceA.getLastModified() === resourceB.getLastModified()) { - return true; + if (await resource.getSize() !== resourceMetadata.size) { + return false; } - if (await resourceA.getSize() === await resourceB.getSize()) { - return true; + const incomingInode = resource.getInode(); + if (resourceMetadata.inode !== undefined && incomingInode !== undefined && + incomingInode !== resourceMetadata.inode) { + return false; } - if (await resourceA.getIntegrity() === await resourceB.getIntegrity()) { - return true; + + if (currentLastModified === indexTimestamp) { + // If the source modification time is equal to index creation time, + // it's possible for a race condition to have occurred where the file was modified + // during index creation without changing its size. + // In this case, we need to perform an integrity check to determine if the file has changed. + if (await resource.getIntegrity() !== resourceMetadata.integrity) { + return false; + } } - return false; + return true; } -// /** -// * Compares a resource instance with cached metadata fingerprint -// * -// * @param {object} resourceA - Resource instance to compare -// * @param {ResourceMetadata} resourceBMetadata - Cached metadata to compare against -// * @param {number} indexTimestamp - Timestamp of the index creation -// * @returns {Promise} True if resource matches the fingerprint -// * @throws {Error} If resource or metadata is undefined -// */ -// export async function matchResourceMetadata(resourceA, resourceBMetadata, indexTimestamp) { -// if (!resourceA || !resourceBMetadata) { -// throw new Error("Cannot compare undefined resources"); -// } -// if (resourceA.getLastModified() !== resourceBMetadata.lastModified) { -// return false; -// } -// if (await resourceA.getSize() !== resourceBMetadata.size) { -// return false; -// } -// if (resourceBMetadata.inode && resourceA.getInode() !== resourceBMetadata.inode) { -// return false; -// } -// if (await resourceA.getIntegrity() === resourceBMetadata.integrity) { -// return true; -// } -// return false; -// } +/** + * Determines if a resource has changed compared to cached metadata + * + * Optimized for quickly accepting unchanged files. + * I.e. Resources are assumed to be usually unchanged (same lastModified timestamp) + * + * @param {object} resource - Resource instance with methods: getInode(), getSize(), getLastModified(), getIntegrity() + * @param {ResourceMetadata} cachedMetadata - Cached metadata from the tree + * @param {number} indexTimestamp - Timestamp when the tree state was created + * @returns {Promise} True if resource content is unchanged + * @throws {Error} If resource or metadata is undefined + */ +export async function matchResourceMetadataStrict(resource, cachedMetadata, indexTimestamp) { + if (!resource || !cachedMetadata) { + throw new Error("Cannot compare undefined resources or metadata"); + } + + // Check 1: Inode mismatch would indicate file replacement (comparison only if inodes are provided) + const currentInode = resource.getInode(); + if (cachedMetadata.inode !== undefined && currentInode !== undefined && + currentInode !== cachedMetadata.inode) { + return false; + } + + // Check 2: Modification time unchanged would suggest no update needed + const currentLastModified = resource.getLastModified(); + if (currentLastModified === cachedMetadata.lastModified) { + if (currentLastModified !== indexTimestamp) { + // File has not been modified since last indexing. No update needed + return true; + } // else: Edge case. File modified exactly at index time + // Race condition possible - content may have changed during indexing + // Fall through to integrity check + } + + // Check 3: Size mismatch indicates definite content change + const currentSize = await resource.getSize(); + if (currentSize !== cachedMetadata.size) { + return false; + } + + // Check 4: Compare integrity (expensive) + // lastModified has changed, but the content might be the same. E.g. in case of a metadata-only update + const currentIntegrity = await resource.getIntegrity(); + return currentIntegrity === cachedMetadata.integrity; +} export async function createResourceIndex(resources, includeInode = false) { - const index = Object.create(null); - await Promise.all(resources.map(async (resource) => { + return await Promise.all(resources.map(async (resource) => { const resourceMetadata = { + path: resource.getOriginalPath(), + integrity: await resource.getIntegrity(), lastModified: resource.getLastModified(), size: await resource.getSize(), - integrity: await resource.getIntegrity(), }; if (includeInode) { resourceMetadata.inode = resource.getInode(); } - - index[resource.getOriginalPath()] = resourceMetadata; + return resourceMetadata; })); - return index; +} + +/** + * Returns the first truthy value from an array of promises + * + * This function evaluates all promises in parallel and returns immediately + * when the first truthy value is found. If all promises resolve to falsy + * values, null is returned. + * + * @private + * @param {Promise[]} promises - Array of promises to evaluate + * @returns {Promise<*>} The first truthy resolved value or null if all are falsy + */ +export async function firstTruthy(promises) { + return new Promise((resolve, reject) => { + let completed = 0; + const total = promises.length; + + if (total === 0) { + resolve(null); + return; + } + + promises.forEach((promise) => { + Promise.resolve(promise) + .then((value) => { + if (value) { + resolve(value); + } else { + completed++; + if (completed === total) { + resolve(null); + } + } + }) + .catch(reject); + }); + }); } diff --git a/packages/project/lib/build/helpers/ProjectBuildContext.js b/packages/project/lib/build/helpers/ProjectBuildContext.js index 038f25bc638..bcb3c5f12f6 100644 --- a/packages/project/lib/build/helpers/ProjectBuildContext.js +++ b/packages/project/lib/build/helpers/ProjectBuildContext.js @@ -149,7 +149,7 @@ class ProjectBuildContext { /** * Determine whether the project has to be built or is already built - * (typically indicated by the presence of a build manifest) + * (typically indicated by the presence of a build manifest or a valid cache) * * @returns {boolean} True if the project needs to be built */ @@ -158,26 +158,11 @@ class ProjectBuildContext { return false; } - return this._buildCache.needsRebuild(); + return this._buildCache.requiresBuild(); } async runTasks() { await this.getTaskRunner().runTasks(); - const updatedResourcePaths = this._buildCache.collectAndClearModifiedPaths(); - - if (updatedResourcePaths.size === 0) { - return; - } - this._log.verbose( - `Project ${this._project.getName()} updated resources: ${Array.from(updatedResourcePaths).join(", ")}`); - const graph = this._buildContext.getGraph(); - const emptySet = new Set(); - - // Propagate changes to all dependents of the project - for (const {project: dep} of graph.traverseDependents(this._project.getName())) { - const projectBuildContext = this._buildContext.getBuildContext(dep.getName()); - projectBuildContext.getBuildCache().resourceChanged(emptySet, updatedResourcePaths); - } } #getBuildManifest() { @@ -190,11 +175,6 @@ class ProjectBuildContext { // Manifest version 0.1 and 0.2 are always used without further checks for legacy reasons return manifest; } - // if (manifest.buildManifest.manifestVersion === "0.3" && - // manifest.buildManifest.cacheKey === this.getCacheKey()) { - // // Manifest version 0.3 is used with a matching cache key - // return manifest; - // } // Unknown manifest version can't be used return; } diff --git a/packages/project/lib/build/helpers/WatchHandler.js b/packages/project/lib/build/helpers/WatchHandler.js index 860256f3b47..81e83a6d6f8 100644 --- a/packages/project/lib/build/helpers/WatchHandler.js +++ b/packages/project/lib/build/helpers/WatchHandler.js @@ -108,8 +108,8 @@ class WatchHandler extends EventEmitter { if (!sourceChanges.has(project) && !dependencyChanges.has(project)) { return; } - const projectSourceChanges = sourceChanges.get(project) ?? new Set(); - const projectDependencyChanges = dependencyChanges.get(project) ?? new Set(); + const projectSourceChanges = Array.from(sourceChanges.get(project) ?? new Set()); + const projectDependencyChanges = Array.from(dependencyChanges.get(project) ?? new Set()); const projectBuildContext = this.#buildContext.getBuildContext(project.getName()); const tasksInvalidated = projectBuildContext.getBuildCache().resourceChanged(projectSourceChanges, projectDependencyChanges); diff --git a/packages/project/lib/specifications/ComponentProject.js b/packages/project/lib/specifications/ComponentProject.js index 3044d0f7d68..cea92e5b6e6 100644 --- a/packages/project/lib/specifications/ComponentProject.js +++ b/packages/project/lib/specifications/ComponentProject.js @@ -129,7 +129,6 @@ class ComponentProject extends Project { throw new Error(`Unknown path mapping style ${style}`); } - // reader = this._addWriter(reader, style, writer); return reader; } @@ -191,11 +190,7 @@ class ComponentProject extends Project { } }); - return { - namespaceWriter, - generalWriter, - collection - }; + return collection; } _getReader(excludes) { @@ -210,20 +205,31 @@ class ComponentProject extends Project { return reader; } - _addWriter(style, readers, writer) { - let {namespaceWriter, generalWriter} = writer; - if (!namespaceWriter || !generalWriter) { - // TODO: Too hacky - namespaceWriter = writer; - generalWriter = writer; - } - + _addReadersForWriter(readers, writer, style) { if ((style === "runtime" || style === "dist") && this._isRuntimeNamespaced) { // If the project's type requires a namespace at runtime, the // dist- and runtime-style paths are identical to buildtime-style paths style = "buildtime"; } + let generalWriter; + let namespaceWriter; + if (writer.getMapping) { + const mapping = writer.getMapping(); + generalWriter = mapping[`/`]; + for (const writer of Object.values(mapping)) { + if (writer === generalWriter) { + continue; + } + if (namespaceWriter && writer !== namespaceWriter) { + throw new Error(`Cannot determine unique namespace writer for project ${this.getName()}`); + } + namespaceWriter = writer; + } + } else { + throw new Error(`Cannot determine writers for project ${this.getName()}`); + } + switch (style) { case "buildtime": // Writer already uses buildtime style @@ -253,13 +259,6 @@ class ComponentProject extends Project { default: throw new Error(`Unknown path mapping style ${style}`); } - // return readers; - // readers.push(reader); - - // return resourceFactory.createReaderCollectionPrioritized({ - // name: `Reader/Writer collection for project ${this.getName()}`, - // readers - // }); } /* === Internals === */ diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index d1035ee02e6..239dc81bf0b 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -2,6 +2,9 @@ import Specification from "./Specification.js"; import ResourceTagCollection from "@ui5/fs/internal/ResourceTagCollection"; import {createWorkspace, createReaderCollectionPrioritized} from "@ui5/fs/resourceFactory"; +const INITIAL_STAGE_ID = "initial"; +const RESULT_STAGE_ID = "result"; + /** * Project * @@ -15,12 +18,14 @@ import {createWorkspace, createReaderCollectionPrioritized} from "@ui5/fs/resour class Project extends Specification { #stages = []; // Stages in order of creation - #currentStageWorkspace; - #currentStageReaders = new Map(); // Initialize an empty map to store the various reader styles + // State #currentStage; - #currentStageReadIndex = -1; - #currentStageName = ""; - #workspaceVersion = 0; + #currentStageReadIndex; + #currentStageId; + + // Cache + #currentStageWorkspace; + #currentStageReaders; // Map to store the various reader styles constructor(parameters) { super(parameters); @@ -29,6 +34,7 @@ class Project extends Specification { } this._resourceTagCollection = null; + this._initStageMetadata(); } /** @@ -269,15 +275,45 @@ class Project extends Specification { * @param {object} [options] * @param {string} [options.style=buildtime] Path style to access resources. * Can be "buildtime", "dist", "runtime" or "flat" + * @param {boolean} [options.excludeSourceReader] If set to true, the source reader is omitted * @returns {@ui5/fs/ReaderCollection} A reader collection instance */ - getReader({style = "buildtime"} = {}) { + getReader({style = "buildtime", excludeSourceReader} = {}) { let reader = this.#currentStageReaders.get(style); - if (reader) { + if (reader && !excludeSourceReader) { // Use cached reader return reader; } + const readers = []; + if (this.#currentStage) { + // Add current writer as highest priority reader + const currentWriter = this.#currentStage.getWriter(); + if (currentWriter) { + this._addReadersForWriter(readers, currentWriter, style); + } else { + const currentReader = this.#currentStage.getCacheReader(); + if (currentReader) { + readers.push(currentReader); + } + } + } + // Add readers for previous stages and source + readers.push(...this.#getReaders(style, excludeSourceReader)); + + reader = createReaderCollectionPrioritized({ + name: `Reader collection for stage '${this.#currentStageId}' of project ${this.getName()}`, + readers + }); + + if (excludeSourceReader) { + return reader; + } + this.#currentStageReaders.set(style, reader); + return reader; + } + + #getReaders(style = "buildtime", excludeSourceReader) { const readers = []; // Add writers for previous stages as readers @@ -285,22 +321,15 @@ class Project extends Specification { // Collect writers from all relevant stages for (let i = stageReadIdx; i >= 0; i--) { - const stageReader = this.#getReaderForStage(this.#stages[i], style); - if (stageReader) { - readers.push(stageReader); - } + this.#addReaderForStage(this.#stages[i], readers, style); } - // Always add source reader + if (excludeSourceReader) { + return readers; + } + // Finally add the project's source reader readers.push(this._getStyledReader(style)); - - reader = createReaderCollectionPrioritized({ - name: `Reader collection for stage '${this.#currentStageName}' of project ${this.getName()}`, - readers: readers - }); - - this.#currentStageReaders.set(style, reader); - return reader; + return readers; } getSourceReader(style = "buildtime") { @@ -318,7 +347,7 @@ class Project extends Specification { * @returns {@ui5/fs/DuplexCollection} DuplexCollection */ getWorkspace() { - if (!this.#currentStage) { + if (this.#currentStage.getId() === RESULT_STAGE_ID) { throw new Error( `Workspace of project ${this.getName()} is currently not available. ` + `This might indicate that the project has already finished building ` + @@ -328,41 +357,19 @@ class Project extends Specification { if (this.#currentStageWorkspace) { return this.#currentStageWorkspace; } + const reader = createReaderCollectionPrioritized({ + name: `Reader collection for stage '${this.#currentStageId}' of project ${this.getName()}`, + readers: this.#getReaders(), + }); const writer = this.#currentStage.getWriter(); const workspace = createWorkspace({ - reader: this.getReader(), - writer: writer.collection || writer + reader, + writer }); this.#currentStageWorkspace = workspace; return workspace; } - useStage(stageId) { - // if (newWriter && this.#writers.has(stageId)) { - // this.#writers.delete(stageId); - // } - if (stageId === this.#currentStage?.getId()) { - // Already using requested stage - return; - } - - const stageIdx = this.#stages.findIndex((s) => s.getId() === stageId); - - if (stageIdx === -1) { - throw new Error(`Stage '${stageId}' does not exist in project ${this.getName()}`); - } - - const stage = this.#stages[stageIdx]; - stage.newVersion(this._createWriter()); - this.#currentStage = stage; - this.#currentStageName = stageId; - this.#currentStageReadIndex = stageIdx - 1; // Read from all previous stages - - // Unset "current" reader/writer. They will be recreated on demand - this.#currentStageReaders = new Map(); - this.#currentStageWorkspace = null; - } - /** * Seal the workspace of the project, preventing further modifications. * This is typically called once the project has finished building. Resources from all stages will be used. @@ -370,10 +377,9 @@ class Project extends Specification { * A project can be unsealed by calling useStage() again. * */ - sealWorkspace() { - this.#workspaceVersion++; - this.#currentStage = null; // Unset stage - This blocks further getWorkspace() calls - this.#currentStageName = ``; + useResultStage() { + this.#currentStage = this.#stages.find((s) => s.getId() === RESULT_STAGE_ID); + this.#currentStageId = RESULT_STAGE_ID; this.#currentStageReadIndex = this.#stages.length - 1; // Read from all stages // Unset "current" reader/writer. They will be recreated on demand @@ -381,52 +387,105 @@ class Project extends Specification { this.#currentStageWorkspace = null; } - _resetStages() { + _initStageMetadata() { this.#stages = []; - this.#currentStage = null; - this.#currentStageName = ""; + // Initialize with an empty stage for use without stages (i.e. without build cache) + this.#currentStage = new Stage(INITIAL_STAGE_ID, this._createWriter()); + this.#currentStageId = INITIAL_STAGE_ID; this.#currentStageReadIndex = -1; this.#currentStageReaders = new Map(); this.#currentStageWorkspace = null; - this.#workspaceVersion = 0; } - #getReaderForStage(stage, style = "buildtime", includeCache = true) { - const writers = stage.getAllWriters(includeCache); - const readers = []; - for (const writer of writers) { - // Apply project specific handling for using writers as readers, depending on the requested style - this._addWriter(style, readers, writer); + #addReaderForStage(stage, readers, style = "buildtime") { + const writer = stage.getWriter(); + if (writer) { + this._addReadersForWriter(readers, writer, style); + } else { + const reader = stage.getCacheReader(); + if (reader) { + readers.push(reader); + } } - - return createReaderCollectionPrioritized({ - name: `Reader collection for stage '${stage.getId()}' of project ${this.getName()}`, - readers - }); } - getStagesForCache() { - return this.#stages.map((stage) => { - const reader = this.#getReaderForStage(stage, "buildtime", false); - return { - stageId: stage.getId(), - reader - }; - }); - } - - setStages(stageIds, cacheReaders) { - this._resetStages(); // Reset current stages and metadata + initStages(stageIds) { + this._initStageMetadata(); for (let i = 0; i < stageIds.length; i++) { const stageId = stageIds[i]; - const newStage = new Stage(stageId, cacheReaders?.[i]); + const newStage = new Stage(stageId, this._createWriter()); this.#stages.push(newStage); } } + getStage() { + return this.#currentStage; + } + + useStage(stageId) { + if (stageId === this.#currentStage?.getId()) { + // Already using requested stage + return; + } + + const stageIdx = this.#stages.findIndex((s) => s.getId() === stageId); + + if (stageIdx === -1) { + throw new Error(`Stage '${stageId}' does not exist in project ${this.getName()}`); + } + + const stage = this.#stages[stageIdx]; + this.#currentStage = stage; + this.#currentStageId = stageId; + this.#currentStageReadIndex = stageIdx - 1; // Read from all previous stages + + // Unset "current" reader/writer caches. They will be recreated on demand + this.#currentStageReaders = new Map(); + this.#currentStageWorkspace = null; + } + + setStage(stageId, stageOrCacheReader) { + const stageIdx = this.#stages.findIndex((s) => s.getId() === stageId); + if (stageIdx === -1) { + throw new Error(`Stage '${stageId}' does not exist in project ${this.getName()}`); + } + if (!stageOrCacheReader) { + throw new Error( + `Invalid stage or cache reader provided for stage '${stageId}' in project ${this.getName()}`); + } + const oldStage = this.#stages[stageIdx]; + if (oldStage.getId() !== stageId) { + throw new Error( + `Stage ID mismatch for stage '${stageId}' in project ${this.getName()}`); + } + let newStage; + if (stageOrCacheReader instanceof Stage) { + newStage = stageOrCacheReader; + if (oldStage === newStage) { + // No change + return; + } + } else { + newStage = new Stage(stageId, undefined, stageOrCacheReader); + } + this.#stages[stageIdx] = newStage; + if (oldStage === this.#currentStage) { + this.#currentStage = newStage; + // Unset "current" reader/writer. They might be outdated + this.#currentStageReaders = new Map(); + this.#currentStageWorkspace = null; + } + } + + setResultStage(reader) { + this._initStageMetadata(); + const resultStage = new Stage(RESULT_STAGE_ID, undefined, reader); + this.#stages.push(resultStage); + } + /* Overwritten in ComponentProject subclass */ - _addWriter(style, readers, writer) { - readers.push(writer); + _addReadersForWriter(readers, writer, style) { + readers.unshift(writer); } getResourceTagCollection() { @@ -454,13 +513,22 @@ class Project extends Specification { async _parseConfiguration(config) {} } +/** + * A stage has either a writer or a reader, never both. + * Consumers need to be able to differentiate between the two + */ class Stage { #id; - #writerVersions = []; // First element is the latest writer + #writer; #cacheReader; - constructor(id, cacheReader) { + constructor(id, writer, cacheReader) { + if (writer && cacheReader) { + throw new Error( + `Stage '${id}' cannot have both a writer and a cache reader`); + } this.#id = id; + this.#writer = writer; this.#cacheReader = cacheReader; } @@ -468,19 +536,12 @@ class Stage { return this.#id; } - newVersion(writer) { - this.#writerVersions.unshift(writer); - } - getWriter() { - return this.#writerVersions[0]; + return this.#writer; } - getAllWriters(includeCache = true) { - if (includeCache && this.#cacheReader) { - return [...this.#writerVersions, this.#cacheReader]; - } - return this.#writerVersions; + getCacheReader() { + return this.#cacheReader; } } diff --git a/packages/project/test/lib/build/cache/BuildTaskCache.js b/packages/project/test/lib/build/cache/BuildTaskCache.js new file mode 100644 index 00000000000..d8efcfdaf82 --- /dev/null +++ b/packages/project/test/lib/build/cache/BuildTaskCache.js @@ -0,0 +1,644 @@ +import test from "ava"; +import sinon from "sinon"; +import BuildTaskCache from "../../../../lib/build/cache/BuildTaskCache.js"; + +// Helper to create mock Resource instances +function createMockResource(path, integrity = "test-hash", lastModified = 1000, size = 100, inode = 1) { + return { + getOriginalPath: () => path, + getPath: () => path, + getIntegrity: async () => integrity, + getLastModified: () => lastModified, + getSize: async () => size, + getInode: () => inode, + getBuffer: async () => Buffer.from("test content"), + getStream: () => null + }; +} + +// Helper to create mock Reader (project or dependency) +function createMockReader(resources = new Map()) { + return { + byPath: sinon.stub().callsFake(async (path) => { + return resources.get(path) || null; + }), + byGlob: sinon.stub().callsFake(async (patterns) => { + // Simple mock: return all resources that match the pattern + const allPaths = Array.from(resources.keys()); + const results = []; + for (const path of allPaths) { + // Very simplified matching - just check if pattern is substring + const patternArray = Array.isArray(patterns) ? patterns : [patterns]; + for (const pattern of patternArray) { + if (pattern === "/**/*" || path.includes(pattern.replace(/\*/g, ""))) { + results.push(resources.get(path)); + break; + } + } + } + return results; + }) + }; +} + +test.afterEach.always(() => { + sinon.restore(); +}); + +// ===== CONSTRUCTOR TESTS ===== + +test("Create BuildTaskCache without metadata", (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + t.truthy(cache, "BuildTaskCache instance created"); + t.is(cache.getTaskName(), "myTask", "Task name is correct"); +}); + +test("Create BuildTaskCache with metadata", (t) => { + const metadata = { + requestSetGraph: { + nodes: [], + nextId: 1 + } + }; + + const cache = new BuildTaskCache("test.project", "myTask", "build-sig", metadata); + + t.truthy(cache, "BuildTaskCache instance created with metadata"); + t.is(cache.getTaskName(), "myTask", "Task name is correct"); +}); + +test("Create BuildTaskCache with complex metadata", (t) => { + const metadata = { + requestSetGraph: { + nodes: [ + { + id: 1, + parent: null, + addedRequests: ["path:/test.js", "patterns:[\"**/*.js\"]"] + } + ], + nextId: 2 + } + }; + + const cache = new BuildTaskCache("test.project", "myTask", "build-sig", metadata); + + t.truthy(cache, "BuildTaskCache created with complex metadata"); +}); + +// ===== METADATA ACCESS TESTS ===== + +test("getTaskName returns correct task name", (t) => { + const cache = new BuildTaskCache("test.project", "mySpecialTask", "build-sig"); + + t.is(cache.getTaskName(), "mySpecialTask", "Returns correct task name"); +}); + +test("getPossibleStageSignatures with no cached signatures", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const signatures = await cache.getPossibleStageSignatures(); + + t.deepEqual(signatures, [], "Returns empty array when no requests recorded"); +}); + +test("getPossibleStageSignatures throws when resourceIndex missing", async (t) => { + const metadata = { + requestSetGraph: { + nodes: [ + { + id: 1, + parent: null, + addedRequests: ["path:/test.js"] + } + ], + nextId: 2 + } + }; + + const cache = new BuildTaskCache("test.project", "myTask", "build-sig", metadata); + + await t.throwsAsync( + async () => { + await cache.getPossibleStageSignatures(); + }, + { + message: /Resource index missing for request set ID/ + }, + "Throws error when resource index is missing" + ); +}); + +// ===== SIGNATURE CALCULATION TESTS ===== + +test("calculateSignature with simple path requests", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const resources = new Map([ + ["/test.js", createMockResource("/test.js", "hash1")], + ["/app.js", createMockResource("/app.js", "hash2")] + ]); + + const projectReader = createMockReader(resources); + const dependencyReader = createMockReader(new Map()); + + const projectRequests = { + paths: new Set(["/test.js", "/app.js"]), + patterns: new Set() + }; + + const signature = await cache.calculateSignature( + projectRequests, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + t.truthy(signature, "Signature generated"); + t.is(typeof signature, "string", "Signature is a string"); +}); + +test("calculateSignature with pattern requests", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const resources = new Map([ + ["/src/test.js", createMockResource("/src/test.js", "hash1")], + ["/src/app.js", createMockResource("/src/app.js", "hash2")] + ]); + + const projectReader = createMockReader(resources); + const dependencyReader = createMockReader(new Map()); + + const projectRequests = { + paths: new Set(), + patterns: new Set(["/**/*.js"]) + }; + + const signature = await cache.calculateSignature( + projectRequests, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + t.truthy(signature, "Signature generated for pattern request"); +}); + +test("calculateSignature with dependency requests", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const projectResources = new Map([ + ["/app.js", createMockResource("/app.js", "hash1")] + ]); + + const depResources = new Map([ + ["/lib/dep.js", createMockResource("/lib/dep.js", "hash-dep")] + ]); + + const projectReader = createMockReader(projectResources); + const dependencyReader = createMockReader(depResources); + + const projectRequests = { + paths: new Set(["/app.js"]), + patterns: new Set() + }; + + const dependencyRequests = { + paths: new Set(["/lib/dep.js"]), + patterns: new Set() + }; + + const signature = await cache.calculateSignature( + projectRequests, + dependencyRequests, + projectReader, + dependencyReader + ); + + t.truthy(signature, "Signature generated with dependency requests"); +}); + +test("calculateSignature returns same signature for same requests", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const resources = new Map([ + ["/test.js", createMockResource("/test.js", "hash1")] + ]); + + const projectReader = createMockReader(resources); + const dependencyReader = createMockReader(new Map()); + + const projectRequests = { + paths: new Set(["/test.js"]), + patterns: new Set() + }; + + const signature1 = await cache.calculateSignature( + projectRequests, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + const signature2 = await cache.calculateSignature( + projectRequests, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + t.is(signature1, signature2, "Same requests produce same signature"); +}); + +test("calculateSignature with empty requests", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const projectReader = createMockReader(new Map()); + const dependencyReader = createMockReader(new Map()); + + const projectRequests = { + paths: new Set(), + patterns: new Set() + }; + + const signature = await cache.calculateSignature( + projectRequests, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + t.truthy(signature, "Signature generated even with no requests"); +}); + +// ===== RESOURCE MATCHING TESTS ===== + +test("matchesChangedResources: exact path match", (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + // Need to populate the cache with some requests first + // We'll use toCacheObject to verify the internal state + const result = cache.matchesChangedResources(["/test.js"], []); + + // Without any recorded requests, should not match + t.false(result, "No match when no requests recorded"); +}); + +test("matchesChangedResources: after recording requests", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const resources = new Map([ + ["/test.js", createMockResource("/test.js", "hash1")] + ]); + + const projectReader = createMockReader(resources); + const dependencyReader = createMockReader(new Map()); + + const projectRequests = { + paths: new Set(["/test.js"]), + patterns: new Set() + }; + + // Record the request + await cache.calculateSignature( + projectRequests, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + // Now check if it matches + t.true(cache.matchesChangedResources(["/test.js"], []), "Matches exact path"); + t.false(cache.matchesChangedResources(["/other.js"], []), "Doesn't match different path"); +}); + +test("matchesChangedResources: pattern matching", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const resources = new Map([ + ["/src/test.js", createMockResource("/src/test.js", "hash1")] + ]); + + const projectReader = createMockReader(resources); + const dependencyReader = createMockReader(new Map()); + + const projectRequests = { + paths: new Set(), + patterns: new Set(["**/*.js"]) + }; + + await cache.calculateSignature( + projectRequests, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + t.true(cache.matchesChangedResources(["/src/app.js"], []), "Pattern matches changed .js file"); + t.false(cache.matchesChangedResources(["/src/styles.css"], []), "Pattern doesn't match .css file"); +}); + +test("matchesChangedResources: dependency path match", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const depResources = new Map([ + ["/lib/dep.js", createMockResource("/lib/dep.js", "hash1")] + ]); + + const projectReader = createMockReader(new Map()); + const dependencyReader = createMockReader(depResources); + + const dependencyRequests = { + paths: new Set(["/lib/dep.js"]), + patterns: new Set() + }; + + await cache.calculateSignature( + {paths: new Set(), patterns: new Set()}, + dependencyRequests, + projectReader, + dependencyReader + ); + + t.true(cache.matchesChangedResources([], ["/lib/dep.js"]), "Matches dependency path"); + t.false(cache.matchesChangedResources([], ["/lib/other.js"]), "Doesn't match different dependency"); +}); + +test("matchesChangedResources: dependency pattern match", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const depResources = new Map([ + ["/lib/utils.js", createMockResource("/lib/utils.js", "hash1")] + ]); + + const projectReader = createMockReader(new Map()); + const dependencyReader = createMockReader(depResources); + + const dependencyRequests = { + paths: new Set(), + patterns: new Set(["/lib/**/*.js"]) + }; + + await cache.calculateSignature( + {paths: new Set(), patterns: new Set()}, + dependencyRequests, + projectReader, + dependencyReader + ); + + t.true(cache.matchesChangedResources([], ["/lib/helper.js"]), "Pattern matches changed dependency"); + t.false(cache.matchesChangedResources([], ["/other/file.js"]), "Pattern doesn't match outside path"); +}); + +test("matchesChangedResources: multiple patterns", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const resources = new Map([ + ["/src/app.js", createMockResource("/src/app.js", "hash1")] + ]); + + const projectReader = createMockReader(resources); + const dependencyReader = createMockReader(new Map()); + + const projectRequests = { + paths: new Set(), + patterns: new Set(["**/*.js", "**/*.css"]) + }; + + await cache.calculateSignature( + projectRequests, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + t.true(cache.matchesChangedResources(["/src/app.js"], []), "Matches .js file"); + t.true(cache.matchesChangedResources(["/src/styles.css"], []), "Matches .css file"); + t.false(cache.matchesChangedResources(["/src/image.png"], []), "Doesn't match .png file"); +}); + +// ===== UPDATE INDICES TESTS ===== + +test("updateIndices with no changes", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const resources = new Map([ + ["/test.js", createMockResource("/test.js", "hash1")] + ]); + + const projectReader = createMockReader(resources); + const dependencyReader = createMockReader(new Map()); + + // First calculate signature to establish baseline + await cache.calculateSignature( + {paths: new Set(["/test.js"]), patterns: new Set()}, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + // Update with no changed paths + await cache.updateIndices(new Set(), new Set(), projectReader, dependencyReader); + + t.pass("updateIndices completed with no changes"); +}); + +test("updateIndices with changed resource", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const resources = new Map([ + ["/test.js", createMockResource("/test.js", "hash1")] + ]); + + const projectReader = createMockReader(resources); + const dependencyReader = createMockReader(new Map()); + + // First calculate signature + await cache.calculateSignature( + {paths: new Set(["/test.js"]), patterns: new Set()}, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + // Update the resource + resources.set("/test.js", createMockResource("/test.js", "hash2", 2000)); + + // Update indices + await cache.updateIndices(new Set(["/test.js"]), new Set(), projectReader, dependencyReader); + + t.pass("updateIndices completed with changed resource"); +}); + +test("updateIndices with removed resource", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const resources = new Map([ + ["/test.js", createMockResource("/test.js", "hash1")], + ["/app.js", createMockResource("/app.js", "hash2")] + ]); + + const projectReader = createMockReader(resources); + const dependencyReader = createMockReader(new Map()); + + // First calculate signature + await cache.calculateSignature( + {paths: new Set(["/test.js", "/app.js"]), patterns: new Set()}, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + // Remove one resource + resources.delete("/app.js"); + + // Update indices - this is a more complex scenario that involves internal ResourceIndex behavior + // For now, we test that it can be called (deeper testing would require mocking ResourceIndex internals) + try { + await cache.updateIndices(new Set(["/app.js"]), new Set(), projectReader, dependencyReader); + t.pass("updateIndices can be called with removed resource"); + } catch (err) { + // Expected in unit test environment - would work with real ResourceIndex + if (err.message.includes("removeResources is not a function")) { + t.pass("updateIndices attempted to handle removed resource (integration test needed)"); + } else { + throw err; + } + } +}); + +// ===== SERIALIZATION TESTS ===== + +test("toCacheObject returns valid structure", (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const cacheObject = cache.toCacheObject(); + + t.truthy(cacheObject, "Cache object created"); + t.truthy(cacheObject.requestSetGraph, "Contains requestSetGraph"); + t.truthy(cacheObject.requestSetGraph.nodes, "requestSetGraph has nodes"); + t.is(typeof cacheObject.requestSetGraph.nextId, "number", "requestSetGraph has nextId"); +}); + +test("toCacheObject after recording requests", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const resources = new Map([ + ["/test.js", createMockResource("/test.js", "hash1")] + ]); + + const projectReader = createMockReader(resources); + const dependencyReader = createMockReader(new Map()); + + await cache.calculateSignature( + {paths: new Set(["/test.js"]), patterns: new Set()}, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + const cacheObject = cache.toCacheObject(); + + t.truthy(cacheObject.requestSetGraph, "Contains requestSetGraph"); + t.true(cacheObject.requestSetGraph.nodes.length > 0, "Has recorded nodes"); +}); + +test("Round-trip serialization", async (t) => { + const cache1 = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const resources = new Map([ + ["/test.js", createMockResource("/test.js", "hash1")] + ]); + + const projectReader = createMockReader(resources); + const dependencyReader = createMockReader(new Map()); + + await cache1.calculateSignature( + {paths: new Set(["/test.js"]), patterns: new Set(["**/*.js"])}, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + const cacheObject = cache1.toCacheObject(); + + // Create new cache from serialized data + const cache2 = new BuildTaskCache("test.project", "myTask", "build-sig", cacheObject); + + t.is(cache2.getTaskName(), "myTask", "Task name preserved"); + t.truthy(cache2.toCacheObject(), "Can serialize again"); +}); + +// ===== EDGE CASES ===== + +test("Create cache with special characters in names", (t) => { + const cache = new BuildTaskCache("test.project-123", "my:special:task", "build-sig"); + + t.is(cache.getTaskName(), "my:special:task", "Special characters in task name preserved"); +}); + +test("matchesChangedResources with empty arrays", (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const result = cache.matchesChangedResources([], []); + + t.false(result, "No matches with empty arrays"); +}); + +test("calculateSignature with non-existent resource", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const projectReader = createMockReader(new Map()); // Empty - resource doesn't exist + const dependencyReader = createMockReader(new Map()); + + const projectRequests = { + paths: new Set(["/nonexistent.js"]), + patterns: new Set() + }; + + // Should not throw, just handle gracefully + const signature = await cache.calculateSignature( + projectRequests, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + t.truthy(signature, "Signature generated even when resource doesn't exist"); +}); + +test("Multiple calculateSignature calls create optimization", async (t) => { + const cache = new BuildTaskCache("test.project", "myTask", "build-sig"); + + const resources = new Map([ + ["/test.js", createMockResource("/test.js", "hash1")], + ["/app.js", createMockResource("/app.js", "hash2")] + ]); + + const projectReader = createMockReader(resources); + const dependencyReader = createMockReader(new Map()); + + // First request set + const sig1 = await cache.calculateSignature( + {paths: new Set(["/test.js"]), patterns: new Set()}, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + // Second request set that includes first + const sig2 = await cache.calculateSignature( + {paths: new Set(["/test.js", "/app.js"]), patterns: new Set()}, + {paths: new Set(), patterns: new Set()}, + projectReader, + dependencyReader + ); + + t.truthy(sig1, "First signature generated"); + t.truthy(sig2, "Second signature generated"); + t.not(sig1, sig2, "Different request sets produce different signatures"); + + const cacheObject = cache.toCacheObject(); + t.true(cacheObject.requestSetGraph.nodes.length > 1, "Multiple request sets recorded"); +}); diff --git a/packages/project/test/lib/build/cache/ProjectBuildCache.js b/packages/project/test/lib/build/cache/ProjectBuildCache.js new file mode 100644 index 00000000000..ccc5989da35 --- /dev/null +++ b/packages/project/test/lib/build/cache/ProjectBuildCache.js @@ -0,0 +1,573 @@ +import test from "ava"; +import sinon from "sinon"; +import ProjectBuildCache from "../../../../lib/build/cache/ProjectBuildCache.js"; + +// Helper to create mock Project instances +function createMockProject(name = "test.project", id = "test-project-id") { + const stages = new Map(); + let currentStage = "source"; + let resultStageReader = null; + + // Create a reusable reader with both byGlob and byPath + const createReader = () => ({ + byGlob: sinon.stub().resolves([]), + byPath: sinon.stub().resolves(null) + }); + + return { + getName: () => name, + getId: () => id, + getSourceReader: sinon.stub().callsFake(() => createReader()), + getReader: sinon.stub().callsFake(() => createReader()), + getStage: sinon.stub().returns({ + getWriter: sinon.stub().returns({ + byGlob: sinon.stub().resolves([]) + }) + }), + useStage: sinon.stub().callsFake((stageName) => { + currentStage = stageName; + }), + setStage: sinon.stub().callsFake((stageName, stage) => { + stages.set(stageName, stage); + }), + initStages: sinon.stub(), + setResultStage: sinon.stub().callsFake((reader) => { + resultStageReader = reader; + }), + useResultStage: sinon.stub().callsFake(() => { + currentStage = "result"; + }), + _getCurrentStage: () => currentStage, + _getResultStageReader: () => resultStageReader + }; +} + +// Helper to create mock CacheManager instances +function createMockCacheManager() { + return { + readIndexCache: sinon.stub().resolves(null), + writeIndexCache: sinon.stub().resolves(), + readStageCache: sinon.stub().resolves(null), + writeStageCache: sinon.stub().resolves(), + readBuildManifest: sinon.stub().resolves(null), + writeBuildManifest: sinon.stub().resolves(), + getResourcePathForStage: sinon.stub().resolves(null), + writeStageResource: sinon.stub().resolves() + }; +} + +// Helper to create mock Resource instances +function createMockResource(path, integrity = "test-hash", lastModified = 1000, size = 100, inode = 1) { + return { + getOriginalPath: () => path, + getPath: () => path, + getIntegrity: async () => integrity, + getLastModified: () => lastModified, + getSize: async () => size, + getInode: () => inode, + getBuffer: async () => Buffer.from("test content"), + getStream: () => null + }; +} + +test.afterEach.always(() => { + sinon.restore(); +}); + +// ===== CREATION AND INITIALIZATION TESTS ===== + +test("Create ProjectBuildCache instance", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const buildSignature = "test-signature"; + + const cache = await ProjectBuildCache.create(project, buildSignature, cacheManager); + + t.truthy(cache, "ProjectBuildCache instance created"); + t.true(cacheManager.readIndexCache.called, "Index cache was attempted to be loaded"); + t.true(cacheManager.readBuildManifest.called, "Build manifest was attempted to be loaded"); +}); + +test("Create with existing index cache", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const buildSignature = "test-signature"; + + const resource = createMockResource("/test.js", "hash1", 1000, 100, 1); + project.getSourceReader.callsFake(() => ({ + byGlob: sinon.stub().resolves([resource]) + })); + + const indexCache = { + version: "1.0", + indexTree: { + version: 1, + indexTimestamp: 1000, + root: { + hash: "expected-hash", + children: {} + } + }, + taskMetadata: { + "task1": { + requestSetGraph: { + nodes: [], + nextId: 1 + } + } + } + }; + + cacheManager.readIndexCache.resolves(indexCache); + + const cache = await ProjectBuildCache.create(project, buildSignature, cacheManager); + + t.truthy(cache, "Cache created with existing index"); + t.true(cache.hasTaskCache("task1"), "Task cache loaded from index"); +}); + +test("Initialize without any cache", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const buildSignature = "test-signature"; + + const cache = await ProjectBuildCache.create(project, buildSignature, cacheManager); + + t.true(cache.requiresBuild(), "Build is required when no cache exists"); + t.false(cache.hasAnyCache(), "No task cache exists initially"); +}); + +test("requiresBuild returns true when invalidated tasks exist", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const buildSignature = "test-signature"; + + const resource = createMockResource("/test.js", "hash1", 1000, 100, 1); + project.getSourceReader.returns({ + byGlob: sinon.stub().resolves([resource]) + }); + + const cache = await ProjectBuildCache.create(project, buildSignature, cacheManager); + + // Simulate having a task cache but with changed resources + cache.resourceChanged(["/test.js"], []); + + t.true(cache.requiresBuild(), "Build required when tasks invalidated"); +}); + +// ===== TASK CACHE TESTS ===== + +test("hasTaskCache returns false for non-existent task", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + t.false(cache.hasTaskCache("nonexistent"), "Task cache doesn't exist"); +}); + +test("getTaskCache returns undefined for non-existent task", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + t.is(cache.getTaskCache("nonexistent"), undefined, "Returns undefined"); +}); + +test("isTaskCacheValid returns false for non-existent task", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + t.false(cache.isTaskCacheValid("nonexistent"), "Non-existent task is not valid"); +}); + +test("setTasks initializes project stages", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + await cache.setTasks(["task1", "task2", "task3"]); + + t.true(project.initStages.calledOnce, "initStages called once"); + t.deepEqual( + project.initStages.firstCall.args[0], + ["task/task1", "task/task2", "task/task3"], + "Stage names generated correctly" + ); +}); + +test("setDependencyReader sets the dependency reader", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + const mockDependencyReader = {byGlob: sinon.stub()}; + cache.setDependencyReader(mockDependencyReader); + + // The reader is stored internally, we can verify by checking it's used later + t.pass("Dependency reader set"); +}); + +test("allTasksCompleted switches to result stage", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + cache.allTasksCompleted(); + + t.true(project.useResultStage.calledOnce, "useResultStage called"); +}); + +// ===== TASK EXECUTION TESTS ===== + +test("prepareTaskExecution: task needs execution when no cache exists", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + await cache.setTasks(["myTask"]); + const needsExecution = await cache.prepareTaskExecution("myTask", false); + + t.true(needsExecution, "Task needs execution without cache"); + t.true(project.useStage.calledWith("task/myTask"), "Project switched to task stage"); +}); + +test("prepareTaskExecution: switches project to correct stage", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + await cache.setTasks(["task1", "task2"]); + await cache.prepareTaskExecution("task2", false); + + t.true(project.useStage.calledWith("task/task2"), "Switched to task2 stage"); +}); + +test("recordTaskResult: creates task cache if not exists", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + await cache.setTasks(["newTask"]); + await cache.prepareTaskExecution("newTask", false); + + const writtenPaths = new Set(["/output.js"]); + const projectRequests = {paths: new Set(["/input.js"]), patterns: new Set()}; + const dependencyRequests = {paths: new Set(), patterns: new Set()}; + + await cache.recordTaskResult("newTask", writtenPaths, projectRequests, dependencyRequests); + + t.true(cache.hasTaskCache("newTask"), "Task cache created"); + t.true(cache.isTaskCacheValid("newTask"), "Task cache is valid"); +}); + +test("recordTaskResult: removes task from invalidated list", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + await cache.setTasks(["task1"]); + await cache.prepareTaskExecution("task1", false); + + // Record initial result + await cache.recordTaskResult("task1", new Set(), {paths: new Set(), patterns: new Set()}, {paths: new Set(), patterns: new Set()}); + + // Invalidate task + cache.resourceChanged(["/test.js"], []); + + // Re-execute and record + await cache.prepareTaskExecution("task1", false); + await cache.recordTaskResult("task1", new Set(), {paths: new Set(), patterns: new Set()}, {paths: new Set(), patterns: new Set()}); + + t.deepEqual(cache.getInvalidatedTaskNames(), [], "No invalidated tasks after re-execution"); +}); + +// ===== RESOURCE CHANGE TESTS ===== + +test("resourceChanged: invalidates no tasks when no cache exists", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + const taskInvalidated = cache.resourceChanged(["/test.js"], []); + + t.false(taskInvalidated, "No tasks invalidated when no cache exists"); + t.deepEqual(cache.getInvalidatedTaskNames(), [], "No invalidated tasks"); +}); + +test("getChangedProjectResourcePaths: returns empty set for non-invalidated task", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + const changedPaths = cache.getChangedProjectResourcePaths("task1"); + + t.deepEqual(changedPaths, new Set(), "Returns empty set"); +}); + +test("getChangedDependencyResourcePaths: returns empty set for non-invalidated task", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + const changedPaths = cache.getChangedDependencyResourcePaths("task1"); + + t.deepEqual(changedPaths, new Set(), "Returns empty set"); +}); + +test("resourceChanged: tracks changed resource paths", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + // Create a task cache first + await cache.setTasks(["task1"]); + await cache.prepareTaskExecution("task1", false); + await cache.recordTaskResult("task1", new Set(), + {paths: new Set(["/test.js"]), patterns: new Set()}, + {paths: new Set(), patterns: new Set()}); + + // Now invalidate with changed resources + cache.resourceChanged(["/test.js", "/another.js"], ["/dep.js"]); + + const changedProject = cache.getChangedProjectResourcePaths("task1"); + const changedDeps = cache.getChangedDependencyResourcePaths("task1"); + + t.true(changedProject.has("/test.js"), "Project resource tracked"); + t.true(changedProject.has("/another.js"), "Another project resource tracked"); + t.true(changedDeps.has("/dep.js"), "Dependency resource tracked"); +}); + +test("resourceChanged: accumulates multiple invalidations", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + // Create a task cache first + await cache.setTasks(["task1"]); + await cache.prepareTaskExecution("task1", false); + await cache.recordTaskResult("task1", new Set(), + {paths: new Set(["/test.js", "/another.js"]), patterns: new Set()}, + {paths: new Set(), patterns: new Set()}); + + // First invalidation + cache.resourceChanged(["/test.js"], []); + + // Second invalidation + cache.resourceChanged(["/another.js"], []); + + const changedProject = cache.getChangedProjectResourcePaths("task1"); + + t.true(changedProject.has("/test.js"), "First change tracked"); + t.true(changedProject.has("/another.js"), "Second change tracked"); + t.is(changedProject.size, 2, "Both changes accumulated"); +}); + +// ===== INVALIDATION TESTS ===== + +test("getInvalidatedTaskNames: returns empty array when no tasks invalidated", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + t.deepEqual(cache.getInvalidatedTaskNames(), [], "No invalidated tasks"); +}); + +test("isTaskCacheValid: returns false for invalidated task", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + // Create a task cache + await cache.setTasks(["task1"]); + await cache.prepareTaskExecution("task1", false); + await cache.recordTaskResult("task1", new Set(), + {paths: new Set(["/test.js"]), patterns: new Set()}, + {paths: new Set(), patterns: new Set()}); + + t.true(cache.isTaskCacheValid("task1"), "Task is valid initially"); + + // Invalidate it + cache.resourceChanged(["/test.js"], []); + + t.false(cache.isTaskCacheValid("task1"), "Task is no longer valid after invalidation"); + t.deepEqual(cache.getInvalidatedTaskNames(), ["task1"], "Task appears in invalidated list"); +}); + +// ===== CACHE STORAGE TESTS ===== + +test("storeCache: writes index cache and build manifest", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + const buildManifest = { + manifestVersion: "1.0", + signature: "sig" + }; + + project.getReader.returns({ + byGlob: sinon.stub().resolves([]), + byPath: sinon.stub().resolves(null) + }); + + await cache.storeCache(buildManifest); + + t.true(cacheManager.writeBuildManifest.called, "Build manifest written"); + t.true(cacheManager.writeIndexCache.called, "Index cache written"); +}); + +test("storeCache: writes build manifest only once", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + const buildManifest = { + manifestVersion: "1.0", + signature: "sig" + }; + + project.getReader.returns({ + byGlob: sinon.stub().resolves([]), + byPath: sinon.stub().resolves(null) + }); + + await cache.storeCache(buildManifest); + await cache.storeCache(buildManifest); + + t.is(cacheManager.writeBuildManifest.callCount, 1, "Build manifest written only once"); +}); + +// ===== BUILD MANIFEST TESTS ===== + +test("Load build manifest with correct version", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + + cacheManager.readBuildManifest.resolves({ + buildManifest: { + manifestVersion: "1.0", + signature: "test-sig" + } + }); + + const cache = await ProjectBuildCache.create(project, "test-sig", cacheManager); + + t.truthy(cache, "Cache created successfully"); +}); + +test("Ignore build manifest with incompatible version", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + + cacheManager.readBuildManifest.resolves({ + buildManifest: { + manifestVersion: "2.0", + signature: "test-sig" + } + }); + + const cache = await ProjectBuildCache.create(project, "test-sig", cacheManager); + + t.truthy(cache, "Cache created despite incompatible manifest"); + t.true(cache.requiresBuild(), "Build required when manifest incompatible"); +}); + +test("Throw error on build signature mismatch", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + + cacheManager.readBuildManifest.resolves({ + buildManifest: { + manifestVersion: "1.0", + signature: "wrong-signature" + } + }); + + await t.throwsAsync( + async () => { + await ProjectBuildCache.create(project, "test-sig", cacheManager); + }, + { + message: /Build manifest signature wrong-signature does not match expected build signature test-sig/ + }, + "Throws error on signature mismatch" + ); +}); + +// ===== HELPER FUNCTION TESTS ===== + +test("firstTruthy: returns first truthy value from promises", async (t) => { + const {default: ProjectBuildCacheModule} = await import("../../../../lib/build/cache/ProjectBuildCache.js"); + + // Access the firstTruthy function through dynamic evaluation + // Since it's not exported, we test it indirectly through the module's behavior + // This test verifies the behavior exists without direct access + t.pass("firstTruthy is used internally for cache lookups"); +}); + +// ===== EDGE CASES ===== + +test("Create cache with empty project name", async (t) => { + const project = createMockProject("", "empty-project"); + const cacheManager = createMockCacheManager(); + + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + t.truthy(cache, "Cache created with empty project name"); +}); + +test("setTasks with empty task list", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + await cache.setTasks([]); + + t.true(project.initStages.calledWith([]), "initStages called with empty array"); +}); + +test("prepareTaskExecution with requiresDependencies flag", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + await cache.setTasks(["task1"]); + const needsExecution = await cache.prepareTaskExecution("task1", true); + + t.true(needsExecution, "Task needs execution"); + // Flag is passed but doesn't affect basic behavior without dependency reader +}); + +test("recordTaskResult with empty written paths", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + await cache.setTasks(["task1"]); + await cache.prepareTaskExecution("task1", false); + + const writtenPaths = new Set(); + const projectRequests = {paths: new Set(), patterns: new Set()}; + const dependencyRequests = {paths: new Set(), patterns: new Set()}; + + await cache.recordTaskResult("task1", writtenPaths, projectRequests, dependencyRequests); + + t.true(cache.hasTaskCache("task1"), "Task cache created even with no written paths"); +}); + +test("hasAnyCache: returns true after recording task result", async (t) => { + const project = createMockProject(); + const cacheManager = createMockCacheManager(); + const cache = await ProjectBuildCache.create(project, "sig", cacheManager); + + t.false(cache.hasAnyCache(), "No cache initially"); + + await cache.setTasks(["task1"]); + await cache.prepareTaskExecution("task1", false); + await cache.recordTaskResult("task1", new Set(), + {paths: new Set(), patterns: new Set()}, + {paths: new Set(), patterns: new Set()}); + + t.true(cache.hasAnyCache(), "Has cache after recording result"); +}); diff --git a/packages/project/test/lib/build/cache/ResourceRequestGraph.js b/packages/project/test/lib/build/cache/ResourceRequestGraph.js new file mode 100644 index 00000000000..6d99af2f660 --- /dev/null +++ b/packages/project/test/lib/build/cache/ResourceRequestGraph.js @@ -0,0 +1,988 @@ +import test from "ava"; +import ResourceRequestGraph, {Request} from "../../../../lib/build/cache/ResourceRequestGraph.js"; + +// Request Class Tests +test("Request: Create path request", (t) => { + const request = new Request("path", "a.js"); + t.is(request.type, "path"); + t.is(request.value, "a.js"); +}); + +test("Request: Create patterns request", (t) => { + const request = new Request("patterns", ["*.js", "*.css"]); + t.is(request.type, "patterns"); + t.deepEqual(request.value, ["*.js", "*.css"]); +}); + +test("Request: Create dep-path request", (t) => { + const request = new Request("dep-path", "dependency/file.js"); + t.is(request.type, "dep-path"); + t.is(request.value, "dependency/file.js"); +}); + +test("Request: Create dep-patterns request", (t) => { + const request = new Request("dep-patterns", ["dep/*.js"]); + t.is(request.type, "dep-patterns"); + t.deepEqual(request.value, ["dep/*.js"]); +}); + +test("Request: Reject invalid type", (t) => { + const error = t.throws(() => { + new Request("invalid-type", "value"); + }, {instanceOf: Error}); + t.is(error.message, "Invalid request type: invalid-type"); +}); + +test("Request: Reject non-string value for path type", (t) => { + const error = t.throws(() => { + new Request("path", ["array", "value"]); + }, {instanceOf: Error}); + t.is(error.message, "Request type 'path' requires value to be a string"); +}); + +test("Request: Reject non-string value for dep-path type", (t) => { + const error = t.throws(() => { + new Request("dep-path", ["array", "value"]); + }, {instanceOf: Error}); + t.is(error.message, "Request type 'dep-path' requires value to be a string"); +}); + +test("Request: toKey with string value", (t) => { + const request = new Request("path", "a.js"); + t.is(request.toKey(), "path:a.js"); +}); + +test("Request: toKey with array value", (t) => { + const request = new Request("patterns", ["*.js", "*.css"]); + t.is(request.toKey(), "patterns:[\"*.js\",\"*.css\"]"); +}); + +test("Request: fromKey with string value", (t) => { + const request = Request.fromKey("path:a.js"); + t.is(request.type, "path"); + t.is(request.value, "a.js"); +}); + +test("Request: fromKey with array value", (t) => { + const request = Request.fromKey("patterns:[\"*.js\",\"*.css\"]"); + t.is(request.type, "patterns"); + t.deepEqual(request.value, ["*.js", "*.css"]); +}); + +test("Request: equals returns true for identical requests", (t) => { + const req1 = new Request("path", "a.js"); + const req2 = new Request("path", "a.js"); + t.true(req1.equals(req2)); +}); + +test("Request: equals returns false for different types", (t) => { + const req1 = new Request("path", "a.js"); + const req2 = new Request("dep-path", "a.js"); + t.false(req1.equals(req2)); +}); + +test("Request: equals returns false for different values", (t) => { + const req1 = new Request("path", "a.js"); + const req2 = new Request("path", "b.js"); + t.false(req1.equals(req2)); +}); + +test("Request: equals returns true for identical array values", (t) => { + const req1 = new Request("patterns", ["*.js", "*.css"]); + const req2 = new Request("patterns", ["*.js", "*.css"]); + t.true(req1.equals(req2)); +}); + +test("Request: equals returns false for different array lengths", (t) => { + const req1 = new Request("patterns", ["*.js", "*.css"]); + const req2 = new Request("patterns", ["*.js"]); + t.false(req1.equals(req2)); +}); + +test("Request: equals returns false for different array values", (t) => { + const req1 = new Request("patterns", ["*.js", "*.css"]); + const req2 = new Request("patterns", ["*.js", "*.html"]); + t.false(req1.equals(req2)); +}); + +// ResourceRequestGraph Tests +test("ResourceRequestGraph: Initialize empty graph", (t) => { + const graph = new ResourceRequestGraph(); + t.is(graph.nodes.size, 0); + t.is(graph.nextId, 1); +}); + +test("ResourceRequestGraph: Add first request set (root node)", (t) => { + const graph = new ResourceRequestGraph(); + const requests = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + const nodeId = graph.addRequestSet(requests, {result: "xyz-1"}); + + t.is(nodeId, 1); + t.is(graph.nodes.size, 1); + + const node = graph.getNode(nodeId); + t.is(node.id, 1); + t.is(node.parent, null); + t.is(node.addedRequests.size, 2); + t.deepEqual(node.metadata, {result: "xyz-1"}); +}); + +test("ResourceRequestGraph: Add request set with parent relationship", (t) => { + const graph = new ResourceRequestGraph(); + + // Add first request set + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + const node1 = graph.addRequestSet(set1, {result: "xyz-1"}); + + // Add second request set (superset of first) + const set2 = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "c.js") + ]; + const node2 = graph.addRequestSet(set2, {result: "xyz-2"}); + + // Verify parent relationship + const node2Data = graph.getNode(node2); + t.is(node2Data.parent, node1); + t.is(node2Data.addedRequests.size, 1); + t.true(node2Data.addedRequests.has("path:c.js")); +}); + +test("ResourceRequestGraph: Add request set with no overlap creates parent", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + const node1 = graph.addRequestSet(set1); + + const set2 = [new Request("path", "x.js")]; + const node2 = graph.addRequestSet(set2); + + const node2Data = graph.getNode(node2); + // Even with no overlap, greedy algorithm will select best parent + t.is(node2Data.parent, node1); + t.is(node2Data.addedRequests.size, 1); + t.true(node2Data.addedRequests.has("path:x.js")); +}); + +test("ResourceRequestGraph: getMaterializedRequests returns full set", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + const node1 = graph.addRequestSet(set1); + + const set2 = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "c.js") + ]; + const node2 = graph.addRequestSet(set2); + + const node2Data = graph.getNode(node2); + const materialized = node2Data.getMaterializedRequests(graph); + + t.is(materialized.length, 3); + const keys = materialized.map((r) => r.toKey()).sort(); + t.deepEqual(keys, ["path:a.js", "path:b.js", "path:c.js"]); +}); + +test("ResourceRequestGraph: getAddedRequests returns only delta", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + graph.addRequestSet(set1); + + const set2 = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "c.js") + ]; + const node2 = graph.addRequestSet(set2); + + const node2Data = graph.getNode(node2); + const added = node2Data.getAddedRequests(); + + t.is(added.length, 1); + t.is(added[0].toKey(), "path:c.js"); +}); + +test("ResourceRequestGraph: findBestMatch returns node with largest subset", (t) => { + const graph = new ResourceRequestGraph(); + + // Add first request set + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + graph.addRequestSet(set1, {result: "xyz-1"}); + + // Add second request set (superset) + const set2 = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "c.js") + ]; + const node2 = graph.addRequestSet(set2, {result: "xyz-2"}); + + // Query that contains set2 + const query = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "c.js"), + new Request("path", "x.js") + ]; + const match = graph.findBestMatch(query); + + // Should return node2 (largest subset: 3 items) + t.is(match, node2); +}); + +test("ResourceRequestGraph: findBestMatch returns null when no subset found", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + graph.addRequestSet(set1); + + // Query with no overlap + const query = [ + new Request("path", "x.js"), + new Request("path", "y.js") + ]; + const match = graph.findBestMatch(query); + + t.is(match, null); +}); + +test("ResourceRequestGraph: findExactMatch returns node with identical set", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + const node1 = graph.addRequestSet(set1); + + const query = [ + new Request("path", "b.js"), + new Request("path", "a.js") // Different order, but same set + ]; + const match = graph.findExactMatch(query); + + t.is(match, node1); +}); + +test("ResourceRequestGraph: findExactMatch returns null for subset", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "c.js") + ]; + graph.addRequestSet(set1); + + const query = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + const match = graph.findExactMatch(query); + + t.is(match, null); +}); + +test("ResourceRequestGraph: findExactMatch returns null for superset", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + graph.addRequestSet(set1); + + const query = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "c.js") + ]; + const match = graph.findExactMatch(query); + + t.is(match, null); +}); + +test("ResourceRequestGraph: getMetadata returns stored metadata", (t) => { + const graph = new ResourceRequestGraph(); + const metadata = {result: "xyz", cached: true}; + + const set1 = [new Request("path", "a.js")]; + const nodeId = graph.addRequestSet(set1, metadata); + + const retrieved = graph.getMetadata(nodeId); + t.deepEqual(retrieved, metadata); +}); + +test("ResourceRequestGraph: getMetadata returns null for non-existent node", (t) => { + const graph = new ResourceRequestGraph(); + const retrieved = graph.getMetadata(999); + t.is(retrieved, null); +}); + +test("ResourceRequestGraph: setMetadata updates metadata", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + const nodeId = graph.addRequestSet(set1, {original: true}); + + graph.setMetadata(nodeId, {updated: true}); + + const retrieved = graph.getMetadata(nodeId); + t.deepEqual(retrieved, {updated: true}); +}); + +test("ResourceRequestGraph: getAllNodeIds returns all node IDs", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + const node1 = graph.addRequestSet(set1); + + const set2 = [new Request("path", "b.js")]; + const node2 = graph.addRequestSet(set2); + + const ids = graph.getAllNodeIds(); + t.is(ids.length, 2); + t.true(ids.includes(node1)); + t.true(ids.includes(node2)); +}); + +test("ResourceRequestGraph: getAllRequests returns all unique requests", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + graph.addRequestSet(set1); + + const set2 = [ + new Request("path", "a.js"), // Duplicate + new Request("path", "c.js") + ]; + graph.addRequestSet(set2); + + const allRequests = graph.getAllRequests(); + const keys = allRequests.map((r) => r.toKey()).sort(); + + // Should have 3 unique requests + t.is(keys.length, 3); + t.deepEqual(keys, ["path:a.js", "path:b.js", "path:c.js"]); +}); + +test("ResourceRequestGraph: getStats returns correct statistics", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + graph.addRequestSet(set1); + + const set2 = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "c.js") + ]; + graph.addRequestSet(set2); + + const stats = graph.getStats(); + + t.is(stats.nodeCount, 2); + t.is(stats.averageRequestsPerNode, 2.5); // (2 + 3) / 2 + t.is(stats.averageStoredDeltaSize, 1.5); // (2 + 1) / 2 + t.is(stats.maxDepth, 1); // node2 is at depth 1 + t.is(stats.compressionRatio, 0.6); // 3 stored / 5 total +}); + +test("ResourceRequestGraph: toMetadataObject exports graph structure", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + const node1 = graph.addRequestSet(set1); + + const set2 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + const node2 = graph.addRequestSet(set2); + + const exported = graph.toMetadataObject(); + + t.is(exported.nodes.length, 2); + t.is(exported.nextId, 3); + + const exportedNode1 = exported.nodes.find((n) => n.id === node1); + t.truthy(exportedNode1); + t.is(exportedNode1.parent, null); + t.deepEqual(exportedNode1.addedRequests, ["path:a.js"]); + + const exportedNode2 = exported.nodes.find((n) => n.id === node2); + t.truthy(exportedNode2); + t.is(exportedNode2.parent, node1); + t.deepEqual(exportedNode2.addedRequests, ["path:b.js"]); +}); + +test("ResourceRequestGraph: fromMetadataObject reconstructs graph", (t) => { + const graph1 = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + const node1 = graph1.addRequestSet(set1); + + const set2 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + const node2 = graph1.addRequestSet(set2); + + // Export and reconstruct + const exported = graph1.toMetadataObject(); + const graph2 = ResourceRequestGraph.fromMetadataObject(exported); + + // Verify reconstruction + t.is(graph2.nodes.size, 2); + t.is(graph2.nextId, 3); + + const reconstructedNode1 = graph2.getNode(node1); + t.truthy(reconstructedNode1); + t.is(reconstructedNode1.parent, null); + t.is(reconstructedNode1.addedRequests.size, 1); + + const reconstructedNode2 = graph2.getNode(node2); + t.truthy(reconstructedNode2); + t.is(reconstructedNode2.parent, node1); + t.is(reconstructedNode2.addedRequests.size, 1); + + // Verify materialized sets work correctly + const materialized = reconstructedNode2.getMaterializedRequests(graph2); + t.is(materialized.length, 2); +}); + +test("ResourceRequestGraph: Handles different request types", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [ + new Request("path", "a.js"), + new Request("patterns", ["*.js"]), + new Request("dep-path", "dep/file.js"), + new Request("dep-patterns", ["dep/*.js"]) + ]; + const nodeId = graph.addRequestSet(set1); + + const node = graph.getNode(nodeId); + const materialized = node.getMaterializedRequests(graph); + + t.is(materialized.length, 4); + + const types = materialized.map((r) => r.type).sort(); + t.deepEqual(types, ["dep-path", "dep-patterns", "path", "patterns"]); +}); + +test("ResourceRequestGraph: Complex parent hierarchy", (t) => { + const graph = new ResourceRequestGraph(); + + // Level 0: Root with 2 requests + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + const node1 = graph.addRequestSet(set1); + + // Level 1: Add one request + const set2 = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "c.js") + ]; + const node2 = graph.addRequestSet(set2); + + // Level 2: Add another request + const set3 = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "c.js"), + new Request("path", "d.js") + ]; + const node3 = graph.addRequestSet(set3); + + // Verify hierarchy + const node3Data = graph.getNode(node3); + t.is(node3Data.parent, node2); + + const node2Data = graph.getNode(node2); + t.is(node2Data.parent, node1); + + const stats = graph.getStats(); + t.is(stats.maxDepth, 2); +}); + +test("ResourceRequestGraph: findBestParent chooses optimal parent", (t) => { + const graph = new ResourceRequestGraph(); + + // Create two potential parents + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + const node1 = graph.addRequestSet(set1); + + const set2 = [ + new Request("path", "x.js"), + new Request("path", "y.js"), + new Request("path", "z.js") + ]; + const node2 = graph.addRequestSet(set2); + + // New set overlaps more with set2 + const set3 = [ + new Request("path", "x.js"), + new Request("path", "y.js"), + new Request("path", "z.js"), + new Request("path", "w.js") + ]; + const node3 = graph.addRequestSet(set3); + + const node3Data = graph.getNode(node3); + // Should choose node2 as parent (only needs to add 1 request vs 5) + t.is(node3Data.parent, node2); + t.is(node3Data.addedRequests.size, 1); +}); + +test("ResourceRequestGraph: Empty request set", (t) => { + const graph = new ResourceRequestGraph(); + + const nodeId = graph.addRequestSet([]); + const node = graph.getNode(nodeId); + + t.is(node.addedRequests.size, 0); + t.is(node.parent, null); +}); + +test("ResourceRequestGraph: Caching works correctly", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + graph.addRequestSet(set1); + + const set2 = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "c.js") + ]; + const node2 = graph.addRequestSet(set2); + + const node2Data = graph.getNode(node2); + + // First call should compute and cache + const materialized1 = node2Data.getMaterializedSet(graph); + t.is(materialized1.size, 3); + + // Second call should use cache (same result) + const materialized2 = node2Data.getMaterializedSet(graph); + t.is(materialized2.size, 3); + t.deepEqual(Array.from(materialized1).sort(), Array.from(materialized2).sort()); +}); + +test("ResourceRequestGraph: Usage example from documentation", (t) => { + // Create graph + const graph = new ResourceRequestGraph(); + + // Add first request set + const set1 = [ + new Request("path", "a.js"), + new Request("path", "b.js") + ]; + const node1 = graph.addRequestSet(set1, {result: "xyz-1"}); + t.is(node1, 1); + + // Add second request set (superset of first) + const set2 = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "c.js") + ]; + const node2 = graph.addRequestSet(set2, {result: "xyz-2"}); + t.is(node2, 2); + + // Verify parent relationship + const node2Data = graph.getNode(node2); + t.is(node2Data.parent, node1); + t.deepEqual(Array.from(node2Data.addedRequests), ["path:c.js"]); + + // Find best match for a query + const query = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "x.js") + ]; + const match = graph.findBestMatch(query); + t.is(match, node1); + + // Get metadata + const metadata = graph.getMetadata(match); + t.deepEqual(metadata, {result: "xyz-1"}); + + // Get statistics + const stats = graph.getStats(); + t.is(stats.nodeCount, 2); + t.truthy(stats.averageRequestsPerNode); +}); + +// Traversal Iterator Tests +test("ResourceRequestGraph: traverseByDepth iterates in breadth-first order", (t) => { + const graph = new ResourceRequestGraph(); + + // Create a tree structure: + // 1 (depth 0) + // / \ + // 2 3 (depth 1) + // / + // 4 (depth 2) + + const set1 = [new Request("path", "a.js")]; + const node1 = graph.addRequestSet(set1); + + const set2 = [new Request("path", "a.js"), new Request("path", "b.js")]; + const node2 = graph.addRequestSet(set2); + + const set3 = [new Request("path", "a.js"), new Request("path", "c.js")]; + const node3 = graph.addRequestSet(set3); + + const set4 = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "d.js") + ]; + const node4 = graph.addRequestSet(set4); + + // Collect traversal results + const traversal = []; + for (const {nodeId, depth} of graph.traverseByDepth()) { + traversal.push({nodeId, depth}); + } + + // Verify: depth 0 node comes first, then depth 1 nodes, then depth 2 + t.is(traversal.length, 4); + t.is(traversal[0].nodeId, node1); + t.is(traversal[0].depth, 0); + + // Nodes 2 and 3 should both be at depth 1 (order may vary) + t.is(traversal[1].depth, 1); + t.is(traversal[2].depth, 1); + t.true([node2, node3].includes(traversal[1].nodeId)); + t.true([node2, node3].includes(traversal[2].nodeId)); + + // Node 4 should be at depth 2 + t.is(traversal[3].nodeId, node4); + t.is(traversal[3].depth, 2); +}); + +test("ResourceRequestGraph: traverseByDepth yields correct node information", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + const node1 = graph.addRequestSet(set1, {meta: "root"}); + + const set2 = [new Request("path", "a.js"), new Request("path", "b.js")]; + const node2 = graph.addRequestSet(set2, {meta: "child"}); + + const results = Array.from(graph.traverseByDepth()); + + t.is(results.length, 2); + + // First node + t.is(results[0].nodeId, node1); + t.truthy(results[0].node); + t.is(results[0].depth, 0); + t.is(results[0].parentId, null); + t.deepEqual(results[0].node.metadata, {meta: "root"}); + + // Second node + t.is(results[1].nodeId, node2); + t.is(results[1].depth, 1); + t.is(results[1].parentId, node1); + t.deepEqual(results[1].node.metadata, {meta: "child"}); +}); + +test("ResourceRequestGraph: traverseByDepth handles empty graph", (t) => { + const graph = new ResourceRequestGraph(); + const results = Array.from(graph.traverseByDepth()); + t.is(results.length, 0); +}); + +test("ResourceRequestGraph: traverseByDepth handles multiple root nodes", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + graph.addRequestSet(set1); + + // Create a disconnected node by manipulating internal structure + // Add it without using addRequestSet to avoid automatic parent assignment + const set2 = [new Request("path", "x.js")]; + const node2 = graph.nextId++; + const requestSetNode = { + id: node2, + parent: null, + addedRequests: new Set(set2.map((r) => r.toKey())), + metadata: null, + _fullSetCache: null, + _cacheValid: false, + getMaterializedSet: function(g) { + return new Set(this.addedRequests); + }, + getMaterializedRequests: function(g) { + return Array.from(this.addedRequests).map((key) => Request.fromKey(key)); + }, + getAddedRequests: function() { + return Array.from(this.addedRequests).map((key) => Request.fromKey(key)); + }, + invalidateCache: function() { + this._cacheValid = false; + this._fullSetCache = null; + } + }; + graph.nodes.set(node2, requestSetNode); + + const results = Array.from(graph.traverseByDepth()); + + // Both roots should be at depth 0 + t.is(results.length, 2); + t.is(results[0].depth, 0); + t.is(results[1].depth, 0); + t.is(results[0].parentId, null); + t.is(results[1].parentId, null); +}); + +test("ResourceRequestGraph: traverseByDepth allows early termination", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + graph.addRequestSet(set1); + + const set2 = [new Request("path", "a.js"), new Request("path", "b.js")]; + const node2 = graph.addRequestSet(set2); + + const set3 = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "c.js") + ]; + graph.addRequestSet(set3); + + // Stop after finding node2 + let count = 0; + for (const {nodeId} of graph.traverseByDepth()) { + count++; + if (nodeId === node2) { + break; + } + } + + // Should have visited 2 nodes, not all 3 + t.is(count, 2); +}); + +test("ResourceRequestGraph: traverseByDepth allows checking deltas", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + graph.addRequestSet(set1); + + const set2 = [new Request("path", "a.js"), new Request("path", "b.js")]; + graph.addRequestSet(set2); + + const deltas = []; + for (const {node} of graph.traverseByDepth()) { + const delta = node.getAddedRequests(); + deltas.push(delta.map((r) => r.toKey())); + } + + // First node has 1 request, second node adds 1 request + t.deepEqual(deltas, [["path:a.js"], ["path:b.js"]]); +}); + +test("ResourceRequestGraph: traverseSubtree traverses only specified subtree", (t) => { + const graph = new ResourceRequestGraph(); + + // Create structure: + // 1 + // / \ + // 2 3 + // / + // 4 + + const set1 = [new Request("path", "a.js")]; + graph.addRequestSet(set1); + + const set2 = [new Request("path", "a.js"), new Request("path", "b.js")]; + const node2 = graph.addRequestSet(set2); + + const set3 = [new Request("path", "a.js"), new Request("path", "c.js")]; + graph.addRequestSet(set3); + + const set4 = [ + new Request("path", "a.js"), + new Request("path", "b.js"), + new Request("path", "d.js") + ]; + const node4 = graph.addRequestSet(set4); + + // Traverse only subtree starting from node2 + const results = Array.from(graph.traverseSubtree(node2)); + + // Should only visit node2 and node4 (not node1 or node3) + t.is(results.length, 2); + t.is(results[0].nodeId, node2); + t.is(results[0].depth, 0); // Relative depth from start + t.is(results[1].nodeId, node4); + t.is(results[1].depth, 1); +}); + +test("ResourceRequestGraph: traverseSubtree with root node traverses entire tree", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + const node1 = graph.addRequestSet(set1); + + const set2 = [new Request("path", "a.js"), new Request("path", "b.js")]; + graph.addRequestSet(set2); + + const results = Array.from(graph.traverseSubtree(node1)); + + // Should visit all nodes + t.is(results.length, 2); +}); + +test("ResourceRequestGraph: traverseSubtree handles non-existent node", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + graph.addRequestSet(set1); + + const results = Array.from(graph.traverseSubtree(999)); + t.is(results.length, 0); +}); + +test("ResourceRequestGraph: traverseSubtree handles leaf node", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + graph.addRequestSet(set1); + + const set2 = [new Request("path", "a.js"), new Request("path", "b.js")]; + const node2 = graph.addRequestSet(set2); + + // Traverse from leaf node + const results = Array.from(graph.traverseSubtree(node2)); + + // Should only visit the leaf node itself + t.is(results.length, 1); + t.is(results[0].nodeId, node2); + t.is(results[0].depth, 0); +}); + +test("ResourceRequestGraph: getChildren returns child node IDs", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + const node1 = graph.addRequestSet(set1); + + const set2 = [new Request("path", "a.js"), new Request("path", "b.js")]; + const node2 = graph.addRequestSet(set2); + + const set3 = [new Request("path", "a.js"), new Request("path", "c.js")]; + const node3 = graph.addRequestSet(set3); + + const children = graph.getChildren(node1); + + t.is(children.length, 2); + t.true(children.includes(node2)); + t.true(children.includes(node3)); +}); + +test("ResourceRequestGraph: getChildren returns empty array for leaf nodes", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + graph.addRequestSet(set1); + + const set2 = [new Request("path", "a.js"), new Request("path", "b.js")]; + const node2 = graph.addRequestSet(set2); + + const children = graph.getChildren(node2); + t.is(children.length, 0); +}); + +test("ResourceRequestGraph: getChildren returns empty array for non-existent node", (t) => { + const graph = new ResourceRequestGraph(); + + const set1 = [new Request("path", "a.js")]; + graph.addRequestSet(set1); + + const children = graph.getChildren(999); + t.is(children.length, 0); +}); + +test("ResourceRequestGraph: Efficient traversal use case", (t) => { + const graph = new ResourceRequestGraph(); + + // Simulate real usage: build a graph of resource requests + const set1 = [new Request("path", "core.js"), new Request("path", "utils.js")]; + const node1 = graph.addRequestSet(set1, {cached: true}); + + const set2 = [ + new Request("path", "core.js"), + new Request("path", "utils.js"), + new Request("path", "components.js") + ]; + const node2 = graph.addRequestSet(set2, {cached: false}); + + // Traverse and collect information + const visited = []; + for (const {nodeId, node, depth} of graph.traverseByDepth()) { + visited.push({ + nodeId, + depth, + deltaSize: node.addedRequests.size, + cached: node.metadata?.cached + }); + } + + t.is(visited.length, 2); + + // Parent processed first + t.is(visited[0].nodeId, node1); + t.is(visited[0].depth, 0); + t.is(visited[0].deltaSize, 2); + t.true(visited[0].cached); + + // Child processed second with delta + t.is(visited[1].nodeId, node2); + t.is(visited[1].depth, 1); + t.is(visited[1].deltaSize, 1); // Only added "components.js" + t.false(visited[1].cached); +}); diff --git a/packages/project/test/lib/build/cache/index/HashTree.js b/packages/project/test/lib/build/cache/index/HashTree.js new file mode 100644 index 00000000000..75fc57efaa7 --- /dev/null +++ b/packages/project/test/lib/build/cache/index/HashTree.js @@ -0,0 +1,551 @@ +import test from "ava"; +import sinon from "sinon"; +import HashTree from "../../../../../lib/build/cache/index/HashTree.js"; + +// Helper to create mock Resource instances +function createMockResource(path, integrity, lastModified, size, inode) { + return { + getOriginalPath: () => path, + getIntegrity: async () => integrity, + getLastModified: () => lastModified, + getSize: async () => size, + getInode: () => inode + }; +} + +test.afterEach.always((t) => { + sinon.restore(); +}); + +test("Create HashTree", (t) => { + const mt = new HashTree(); + t.truthy(mt, "HashTree instance created"); +}); + +test("Two instances with same resources produce same root hash", (t) => { + const resources = [ + {path: "file1.js", integrity: "hash1"}, + {path: "file2.js", integrity: "hash2"}, + {path: "dir/file3.js", integrity: "hash3"} + ]; + + const tree1 = new HashTree(resources); + const tree2 = new HashTree(resources); + + t.is(tree1.getRootHash(), tree2.getRootHash(), + "Trees with identical resources should have identical root hashes"); +}); + +test("Order of resource insertion doesn't affect root hash", (t) => { + const resources1 = [ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"}, + {path: "c.js", integrity: "hash-c"} + ]; + + const resources2 = [ + {path: "c.js", integrity: "hash-c"}, + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"} + ]; + + const tree1 = new HashTree(resources1); + const tree2 = new HashTree(resources2); + + t.is(tree1.getRootHash(), tree2.getRootHash(), + "Trees should produce same hash regardless of insertion order"); +}); + +test("Updating resources in two trees produces same root hash", async (t) => { + const initialResources = [ + {path: "file1.js", integrity: "hash1", lastModified: 1000, size: 100}, + {path: "file2.js", integrity: "hash2", lastModified: 2000, size: 200}, + {path: "dir/file3.js", integrity: "hash3", lastModified: 3000, size: 300} + ]; + + const tree1 = new HashTree(initialResources); + const tree2 = new HashTree(initialResources); + const indexTimestamp = tree1.getIndexTimestamp(); + + // Update same resource in both trees + const resource = createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1); + await tree1.updateResource(resource); + await tree2.updateResource(resource); + + t.is(tree1.getRootHash(), tree2.getRootHash(), + "Trees should have same root hash after identical updates"); +}); + +test("Multiple updates in same order produce same root hash", async (t) => { + const initialResources = [ + {path: "a.js", integrity: "hash-a", lastModified: 1000, size: 100}, + {path: "b.js", integrity: "hash-b", lastModified: 2000, size: 200}, + {path: "c.js", integrity: "hash-c", lastModified: 3000, size: 300}, + {path: "dir/d.js", integrity: "hash-d", lastModified: 4000, size: 400} + ]; + + const tree1 = new HashTree(initialResources); + const tree2 = new HashTree(initialResources); + const indexTimestamp = tree1.getIndexTimestamp(); + + // Update multiple resources in same order + await tree1.updateResource(createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)); + await tree1.updateResource(createMockResource("dir/d.js", "new-hash-d", indexTimestamp + 1, 401, 4)); + await tree1.updateResource(createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)); + + await tree2.updateResource(createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)); + await tree2.updateResource(createMockResource("dir/d.js", "new-hash-d", indexTimestamp + 1, 401, 4)); + await tree2.updateResource(createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)); + + t.is(tree1.getRootHash(), tree2.getRootHash(), + "Trees should have same root hash after same sequence of updates"); +}); + +test("Multiple updates in different order produce same root hash", async (t) => { + const initialResources = [ + {path: "a.js", integrity: "hash-a", lastModified: 1000, size: 100}, + {path: "b.js", integrity: "hash-b", lastModified: 2000, size: 200}, + {path: "c.js", integrity: "hash-c", lastModified: 3000, size: 300} + ]; + + const tree1 = new HashTree(initialResources); + const tree2 = new HashTree(initialResources); + const indexTimestamp = tree1.getIndexTimestamp(); + + // Update in different orders + await tree1.updateResource(createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)); + await tree1.updateResource(createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)); + await tree1.updateResource(createMockResource("c.js", "new-hash-c", indexTimestamp + 1, 301, 3)); + + await tree2.updateResource(createMockResource("c.js", "new-hash-c", indexTimestamp + 1, 301, 3)); + await tree2.updateResource(createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)); + await tree2.updateResource(createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)); + + t.is(tree1.getRootHash(), tree2.getRootHash(), + "Trees should have same root hash regardless of update order"); +}); + +test("Batch updates produce same hash as individual updates", async (t) => { + const initialResources = [ + {path: "file1.js", integrity: "hash1", lastModified: 1000, size: 100}, + {path: "file2.js", integrity: "hash2", lastModified: 2000, size: 200}, + {path: "file3.js", integrity: "hash3", lastModified: 3000, size: 300} + ]; + + const tree1 = new HashTree(initialResources); + const tree2 = new HashTree(initialResources); + const indexTimestamp = tree1.getIndexTimestamp(); + + // Individual updates + await tree1.updateResource(createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)); + await tree1.updateResource(createMockResource("file2.js", "new-hash2", indexTimestamp + 1, 201, 2)); + + // Batch update + const resources = [ + createMockResource("file1.js", "new-hash1", 1001, 101, 1), + createMockResource("file2.js", "new-hash2", 2001, 201, 2) + ]; + await tree2.updateResources(resources); + + t.is(tree1.getRootHash(), tree2.getRootHash(), + "Batch updates should produce same hash as individual updates"); +}); + +test("Updating resource changes root hash", async (t) => { + const resources = [ + {path: "file1.js", integrity: "hash1", lastModified: 1000, size: 100}, + {path: "file2.js", integrity: "hash2", lastModified: 2000, size: 200} + ]; + + const tree = new HashTree(resources); + const originalHash = tree.getRootHash(); + const indexTimestamp = tree.getIndexTimestamp(); + + await tree.updateResource(createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)); + const newHash = tree.getRootHash(); + + t.not(originalHash, newHash, + "Root hash should change after resource update"); +}); + +test("Updating resource back to original value restores original hash", async (t) => { + const resources = [ + {path: "file1.js", integrity: "hash1", lastModified: 1000, size: 100}, + {path: "file2.js", integrity: "hash2", lastModified: 2000, size: 200} + ]; + + const tree = new HashTree(resources); + const originalHash = tree.getRootHash(); + const indexTimestamp = tree.getIndexTimestamp(); + + // Update and then revert + await tree.updateResource(createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)); + await tree.updateResource(createMockResource("file1.js", "hash1", 1000, 100, 1)); + + t.is(tree.getRootHash(), originalHash, + "Root hash should be restored when resource is reverted to original value"); +}); + +test("updateResource returns changed resource path", async (t) => { + const resources = [ + {path: "file1.js", integrity: "hash1", lastModified: 1000, size: 100} + ]; + + const tree = new HashTree(resources); + const indexTimestamp = tree.getIndexTimestamp(); + const changed = await tree.updateResource(createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)); + + t.deepEqual(changed, ["file1.js"], "Should return path of changed resource"); +}); + +test("updateResource returns empty array when integrity unchanged", async (t) => { + const resources = [ + {path: "file1.js", integrity: "hash1", lastModified: 1000, size: 100} + ]; + + const tree = new HashTree(resources); + const changed = await tree.updateResource(createMockResource("file1.js", "hash1", 1000, 100, 1)); + + t.deepEqual(changed, [], "Should return empty array when integrity unchanged"); +}); + +test("updateResource does not change hash when integrity unchanged", async (t) => { + const resources = [ + {path: "file1.js", integrity: "hash1", lastModified: 1000, size: 100} + ]; + + const tree = new HashTree(resources); + const originalHash = tree.getRootHash(); + await tree.updateResource(createMockResource("file1.js", "hash1", 1000, 100, 1)); + + t.is(tree.getRootHash(), originalHash, "Hash should not change when integrity unchanged"); +}); + +test("updateResources returns changed resource paths", async (t) => { + const resources = [ + {path: "file1.js", integrity: "hash1", lastModified: 1000, size: 100}, + {path: "file2.js", integrity: "hash2", lastModified: 2000, size: 200}, + {path: "file3.js", integrity: "hash3", lastModified: 3000, size: 300} + ]; + + const tree = new HashTree(resources); + const indexTimestamp = tree.getIndexTimestamp(); + + const resourceUpdates = [ + createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1), // Changed + createMockResource("file2.js", "hash2", 2000, 200, 2), // unchanged + createMockResource("file3.js", "new-hash3", indexTimestamp + 1, 301, 3) // Changed + ]; + const changed = await tree.updateResources(resourceUpdates); + + t.deepEqual(changed, ["file1.js", "file3.js"], "Should return only changed paths"); +}); + +test("updateResources returns empty array when no changes", async (t) => { + const resources = [ + {path: "file1.js", integrity: "hash1", lastModified: 1000, size: 100}, + {path: "file2.js", integrity: "hash2", lastModified: 2000, size: 200} + ]; + + const tree = new HashTree(resources); + const resourceUpdates = [ + createMockResource("file1.js", "hash1", 1000, 100, 1), + createMockResource("file2.js", "hash2", 2000, 200, 2) + ]; + const changed = await tree.updateResources(resourceUpdates); + + t.deepEqual(changed, [], "Should return empty array when no changes"); +}); + +test("Different nested structures with same resources produce different hashes", (t) => { + const resources1 = [ + {path: "a/b/file.js", integrity: "hash1"} + ]; + + const resources2 = [ + {path: "a/file.js", integrity: "hash1"} + ]; + + const tree1 = new HashTree(resources1); + const tree2 = new HashTree(resources2); + + t.not(tree1.getRootHash(), tree2.getRootHash(), + "Different directory structures should produce different hashes"); +}); + +test("Updating unrelated resource doesn't affect consistency", async (t) => { + const initialResources = [ + {path: "file1.js", integrity: "hash1"}, + {path: "file2.js", integrity: "hash2"}, + {path: "dir/file3.js", integrity: "hash3"} + ]; + + const tree1 = new HashTree(initialResources); + const tree2 = new HashTree(initialResources); + + // Update different resources + await tree1.updateResource(createMockResource("file1.js", "new-hash1", Date.now(), 1024, 789)); + await tree2.updateResource(createMockResource("file1.js", "new-hash1", Date.now(), 1024, 789)); + + // Update an unrelated resource in both + await tree1.updateResource(createMockResource("dir/file3.js", "new-hash3", Date.now(), 2048, 790)); + await tree2.updateResource(createMockResource("dir/file3.js", "new-hash3", Date.now(), 2048, 790)); + + t.is(tree1.getRootHash(), tree2.getRootHash(), + "Trees should remain consistent after updating multiple resources"); +}); + +test("getResourcePaths returns all resource paths in sorted order", (t) => { + const resources = [ + {path: "z.js", integrity: "hash-z"}, + {path: "a.js", integrity: "hash-a"}, + {path: "dir/b.js", integrity: "hash-b"}, + {path: "dir/nested/c.js", integrity: "hash-c"} + ]; + + const tree = new HashTree(resources); + const paths = tree.getResourcePaths(); + + t.deepEqual(paths, [ + "/a.js", + "/dir/b.js", + "/dir/nested/c.js", + "/z.js" + ], "Resource paths should be sorted alphabetically"); +}); + +test("getResourcePaths returns empty array for empty tree", (t) => { + const tree = new HashTree(); + const paths = tree.getResourcePaths(); + + t.deepEqual(paths, [], "Empty tree should return empty array"); +}); + +// ============================================================================ +// upsertResources Tests +// ============================================================================ + +test("upsertResources - insert new resources", async (t) => { + const tree = new HashTree([{path: "a.js", integrity: "hash-a"}]); + const originalHash = tree.getRootHash(); + + const result = await tree.upsertResources([ + createMockResource("b.js", "hash-b", Date.now(), 1024, 1), + createMockResource("c.js", "hash-c", Date.now(), 2048, 2) + ]); + + t.deepEqual(result.added, ["b.js", "c.js"], "Should report added resources"); + t.deepEqual(result.updated, [], "Should have no updates"); + t.deepEqual(result.unchanged, [], "Should have no unchanged"); + + t.truthy(tree.hasPath("b.js"), "Tree should have b.js"); + t.truthy(tree.hasPath("c.js"), "Tree should have c.js"); + t.not(tree.getRootHash(), originalHash, "Root hash should change"); +}); + +test("upsertResources - update existing resources", async (t) => { + const tree = new HashTree([ + {path: "a.js", integrity: "hash-a", lastModified: 1000, size: 100}, + {path: "b.js", integrity: "hash-b", lastModified: 2000, size: 200} + ]); + const originalHash = tree.getRootHash(); + const indexTimestamp = tree.getIndexTimestamp(); + + const result = await tree.upsertResources([ + createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1), + createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2) + ]); + + t.deepEqual(result.added, [], "Should have no additions"); + t.deepEqual(result.updated, ["a.js", "b.js"], "Should report updated resources"); + t.deepEqual(result.unchanged, [], "Should have no unchanged"); + + t.is(tree.getResourceByPath("a.js").integrity, "new-hash-a"); + t.is(tree.getResourceByPath("b.js").integrity, "new-hash-b"); + t.not(tree.getRootHash(), originalHash, "Root hash should change"); +}); + +test("upsertResources - mixed insert, update, and unchanged", async (t) => { + const timestamp = Date.now(); + const tree = new HashTree([ + {path: "a.js", integrity: "hash-a", lastModified: timestamp, size: 100, inode: 1} + ]); + const originalHash = tree.getRootHash(); + + const result = await tree.upsertResources([ + createMockResource("a.js", "hash-a", timestamp, 100, 1), // unchanged + createMockResource("b.js", "hash-b", timestamp, 200, 2), // new + createMockResource("c.js", "hash-c", timestamp, 300, 3) // new + ]); + + t.deepEqual(result.unchanged, ["a.js"], "Should report unchanged resource"); + t.deepEqual(result.added, ["b.js", "c.js"], "Should report added resources"); + t.deepEqual(result.updated, [], "Should have no updates"); + + t.not(tree.getRootHash(), originalHash, "Root hash should change (new resources added)"); +}); + +// ============================================================================ +// removeResources Tests +// ============================================================================ + +test("removeResources - remove existing resources", async (t) => { + const tree = new HashTree([ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"}, + {path: "c.js", integrity: "hash-c"} + ]); + const originalHash = tree.getRootHash(); + + const result = await tree.removeResources(["b.js", "c.js"]); + + t.deepEqual(result.removed, ["b.js", "c.js"], "Should report removed resources"); + t.deepEqual(result.notFound, [], "Should have no not found"); + + t.truthy(tree.hasPath("a.js"), "Tree should still have a.js"); + t.false(tree.hasPath("b.js"), "Tree should not have b.js"); + t.false(tree.hasPath("c.js"), "Tree should not have c.js"); + t.not(tree.getRootHash(), originalHash, "Root hash should change"); +}); + +test("removeResources - remove non-existent resources", async (t) => { + const tree = new HashTree([{path: "a.js", integrity: "hash-a"}]); + const originalHash = tree.getRootHash(); + + const result = await tree.removeResources(["b.js", "c.js"]); + + t.deepEqual(result.removed, [], "Should have no removals"); + t.deepEqual(result.notFound, ["b.js", "c.js"], "Should report not found"); + + t.is(tree.getRootHash(), originalHash, "Root hash should not change"); +}); + +test("removeResources - mixed existing and non-existent", async (t) => { + const tree = new HashTree([ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"} + ]); + + const result = await tree.removeResources(["b.js", "c.js", "d.js"]); + + t.deepEqual(result.removed, ["b.js"], "Should report removed resources"); + t.deepEqual(result.notFound, ["c.js", "d.js"], "Should report not found"); + + t.truthy(tree.hasPath("a.js"), "Tree should still have a.js"); + t.false(tree.hasPath("b.js"), "Tree should not have b.js"); +}); + +test("removeResources - remove from nested directory", async (t) => { + const tree = new HashTree([ + {path: "dir1/dir2/a.js", integrity: "hash-a"}, + {path: "dir1/dir2/b.js", integrity: "hash-b"}, + {path: "dir1/c.js", integrity: "hash-c"} + ]); + + const result = await tree.removeResources(["dir1/dir2/a.js"]); + + t.deepEqual(result.removed, ["dir1/dir2/a.js"], "Should remove nested resource"); + t.false(tree.hasPath("dir1/dir2/a.js"), "Should not have dir1/dir2/a.js"); + t.truthy(tree.hasPath("dir1/dir2/b.js"), "Should still have dir1/dir2/b.js"); + t.truthy(tree.hasPath("dir1/c.js"), "Should still have dir1/c.js"); +}); + +// ============================================================================ +// Critical Flaw Tests +// ============================================================================ + +test("deriveTree - copies only modified directories (copy-on-write)", (t) => { + const tree1 = new HashTree([ + {path: "shared/a.js", integrity: "hash-a"}, + {path: "shared/b.js", integrity: "hash-b"} + ]); + + // Derive a new tree (should share structure per design goal) + const tree2 = tree1.deriveTree([]); + + // Check if they share the "shared" directory node initially + const dir1Before = tree1.root.children.get("shared"); + const dir2Before = tree2.root.children.get("shared"); + + t.is(dir1Before, dir2Before, "Should share same directory node after deriveTree"); + + // Now insert into tree2 via the intended API (not directly) + tree2._insertResourceWithSharing("shared/c.js", {integrity: "hash-c"}); + + // Check what happened + const dir1After = tree1.root.children.get("shared"); + const dir2After = tree2.root.children.get("shared"); + + // EXPECTED BEHAVIOR (per copy-on-write): + // - Tree2 should copy "shared" directory to add "c.js" without affecting tree1 + // - dir2After !== dir1After (tree2 has its own copy) + // - dir1After === dir1Before (tree1 unchanged) + + t.is(dir1After, dir1Before, "Tree1 should be unaffected"); + t.not(dir2After, dir1After, "Tree2 should have its own copy after modification"); +}); + +test("deriveTree - preserves structural sharing for unmodified paths", (t) => { + const tree1 = new HashTree([ + {path: "shared/nested/deep/a.js", integrity: "hash-a"}, + {path: "other/b.js", integrity: "hash-b"} + ]); + + // Derive tree and add to "other" directory + const tree2 = tree1.deriveTree([]); + tree2._insertResourceWithSharing("other/c.js", {integrity: "hash-c"}); + + // The "shared" directory should still be shared (not copied) + // because we didn't modify it + const sharedDir1 = tree1.root.children.get("shared"); + const sharedDir2 = tree2.root.children.get("shared"); + + t.is(sharedDir1, sharedDir2, + "Unmodified 'shared' directory should remain shared between trees"); + + // But "other" should be copied (we modified it) + const otherDir1 = tree1.root.children.get("other"); + const otherDir2 = tree2.root.children.get("other"); + + t.not(otherDir1, otherDir2, + "Modified 'other' directory should be copied in tree2"); + + // Verify tree1 wasn't affected + t.false(tree1.hasPath("other/c.js"), "Tree1 should not have c.js"); + t.true(tree2.hasPath("other/c.js"), "Tree2 should have c.js"); +}); + +test("deriveTree - changes propagate to derived trees (shared view)", async (t) => { + const tree1 = new HashTree([ + {path: "shared/a.js", integrity: "hash-a", lastModified: 1000, size: 100} + ]); + + // Create derived tree - it's a view on the same data, not an independent copy + const tree2 = tree1.deriveTree([ + {path: "unique/b.js", integrity: "hash-b"} + ]); + + // Get reference to shared directory in both trees + const sharedDir1 = tree1.root.children.get("shared"); + const sharedDir2 = tree2.root.children.get("shared"); + + // By design: They SHOULD share the same node reference + t.is(sharedDir1, sharedDir2, "Trees share directory nodes (intentional design)"); + + // When tree1 is updated, tree2 sees the change (filtered view behavior) + const indexTimestamp = tree1.getIndexTimestamp(); + await tree1.updateResource( + createMockResource("shared/a.js", "new-hash-a", indexTimestamp + 1, 101, 1) + ); + + // Both trees see the update as per design + const node1 = tree1.root.children.get("shared").children.get("a.js"); + const node2 = tree2.root.children.get("shared").children.get("a.js"); + + t.is(node1, node2, "Same resource node (shared reference)"); + t.is(node1.integrity, "new-hash-a", "Tree1 sees update"); + t.is(node2.integrity, "new-hash-a", "Tree2 also sees update (intentional)"); + + // This is the intended behavior: derived trees are views, not snapshots + // Tree2 filters which resources it exposes, but underlying data is shared +}); diff --git a/packages/project/test/lib/build/cache/index/TreeRegistry.js b/packages/project/test/lib/build/cache/index/TreeRegistry.js new file mode 100644 index 00000000000..8d9e7d70480 --- /dev/null +++ b/packages/project/test/lib/build/cache/index/TreeRegistry.js @@ -0,0 +1,567 @@ +import test from "ava"; +import sinon from "sinon"; +import HashTree from "../../../../../lib/build/cache/index/HashTree.js"; +import TreeRegistry from "../../../../../lib/build/cache/index/TreeRegistry.js"; + +// Helper to create mock Resource instances +function createMockResource(path, integrity, lastModified, size, inode) { + return { + getOriginalPath: () => path, + getIntegrity: async () => integrity, + getLastModified: () => lastModified, + getSize: async () => size, + getInode: () => inode + }; +} + +test.afterEach.always((t) => { + sinon.restore(); +}); + +// ============================================================================ +// TreeRegistry Tests +// ============================================================================ + +test("TreeRegistry - register and track trees", (t) => { + const registry = new TreeRegistry(); + new HashTree([{path: "a.js", integrity: "hash1"}], {registry}); + new HashTree([{path: "b.js", integrity: "hash2"}], {registry}); + + t.is(registry.getTreeCount(), 2, "Should track both trees"); +}); + +test("TreeRegistry - schedule and flush updates", async (t) => { + const registry = new TreeRegistry(); + const resources = [{path: "file.js", integrity: "hash1"}]; + const tree = new HashTree(resources, {registry}); + + const originalHash = tree.getRootHash(); + + const resource = createMockResource("file.js", "hash2", Date.now(), 2048, 456); + registry.scheduleUpdate(resource); + t.is(registry.getPendingUpdateCount(), 1, "Should have one pending update"); + + const result = await registry.flush(); + t.is(registry.getPendingUpdateCount(), 0, "Should have no pending updates after flush"); + t.deepEqual(result.updated, ["file.js"], "Should return changed resource path"); + + const newHash = tree.getRootHash(); + t.not(originalHash, newHash, "Root hash should change after flush"); +}); + +test("TreeRegistry - flush returns only changed resources", async (t) => { + const registry = new TreeRegistry(); + const timestamp = Date.now(); + const resources = [ + {path: "file1.js", integrity: "hash1", lastModified: timestamp, size: 1024, inode: 123}, + {path: "file2.js", integrity: "hash2", lastModified: timestamp, size: 2048, inode: 124} + ]; + new HashTree(resources, {registry}); + + registry.scheduleUpdate(createMockResource("file1.js", "new-hash1", timestamp, 1024, 123)); + registry.scheduleUpdate(createMockResource("file2.js", "hash2", timestamp, 2048, 124)); // unchanged + + const result = await registry.flush(); + t.deepEqual(result.updated, ["file1.js"], "Should return only changed resource"); +}); + +test("TreeRegistry - flush returns empty array when no changes", async (t) => { + const registry = new TreeRegistry(); + const timestamp = Date.now(); + const resources = [{path: "file.js", integrity: "hash1", lastModified: timestamp, size: 1024, inode: 123}]; + new HashTree(resources, {registry}); + + registry.scheduleUpdate(createMockResource("file.js", "hash1", timestamp, 1024, 123)); // same value + + const result = await registry.flush(); + t.deepEqual(result.updated, [], "Should return empty array when no actual changes"); +}); + +test("TreeRegistry - batch updates affect all trees sharing nodes", async (t) => { + const registry = new TreeRegistry(); + const resources = [ + {path: "shared/a.js", integrity: "hash-a"}, + {path: "shared/b.js", integrity: "hash-b"} + ]; + + const tree1 = new HashTree(resources, {registry}); + const originalHash1 = tree1.getRootHash(); + + // Create derived tree that shares "shared" directory + const tree2 = tree1.deriveTree([{path: "unique/c.js", integrity: "hash-c"}]); + const originalHash2 = tree2.getRootHash(); + t.not(originalHash1, originalHash2, "Hashes should differ due to unique content"); + + // Verify they share the same "shared" directory node + const sharedDir1 = tree1.root.children.get("shared"); + const sharedDir2 = tree2.root.children.get("shared"); + t.is(sharedDir1, sharedDir2, "Should share the same 'shared' directory node"); + + // Update shared resource + registry.scheduleUpdate(createMockResource("shared/a.js", "new-hash-a", Date.now(), 2048, 999)); + const result = await registry.flush(); + + t.deepEqual(result.updated, ["shared/a.js"], "Should report the updated resource"); + + const newHash1 = tree1.getRootHash(); + const newHash2 = tree2.getRootHash(); + + t.not(originalHash1, newHash1, "Tree1 hash should change"); + t.not(originalHash2, newHash2, "Tree2 hash should change"); + t.not(newHash1, newHash2, "Hashes should differ due to unique content"); + + // Both trees should see the update + const resource1 = tree1.getResourceByPath("shared/a.js"); + const resource2 = tree2.getResourceByPath("shared/a.js"); + + t.is(resource1.integrity, "new-hash-a", "Tree1 should have updated integrity"); + t.is(resource2.integrity, "new-hash-a", "Tree2 should have updated integrity (shared node)"); +}); + +test("TreeRegistry - handles missing resources gracefully during flush", async (t) => { + const registry = new TreeRegistry(); + new HashTree([{path: "exists.js", integrity: "hash1"}], {registry}); + + // Schedule update for non-existent resource + registry.scheduleUpdate(createMockResource("missing.js", "hash2", Date.now(), 1024, 444)); + + // Should not throw + await t.notThrows(async () => await registry.flush(), "Should handle missing resources gracefully"); +}); + +test("TreeRegistry - multiple updates to same resource", async (t) => { + const registry = new TreeRegistry(); + const tree = new HashTree([{path: "file.js", integrity: "v1"}], {registry}); + + const timestamp = Date.now(); + registry.scheduleUpdate(createMockResource("file.js", "v2", timestamp, 1024, 100)); + registry.scheduleUpdate(createMockResource("file.js", "v3", timestamp + 1, 1024, 100)); + registry.scheduleUpdate(createMockResource("file.js", "v4", timestamp + 2, 1024, 100)); + + t.is(registry.getPendingUpdateCount(), 1, "Should consolidate updates to same path"); + + await registry.flush(); + + // Should apply the last update + t.is(tree.getResourceByPath("file.js").integrity, "v4", "Should apply last update"); +}); + +test("TreeRegistry - updates without changes lead to same hash", async (t) => { + const registry = new TreeRegistry(); + const timestamp = Date.now(); + const tree = new HashTree([{ + path: "/src/foo/file1.js", integrity: "v1", + }, { + path: "/src/foo/file3.js", integrity: "v1", + }, { + path: "/src/foo/file2.js", integrity: "v1", + }], {registry}); + const initialHash = tree.getRootHash(); + const file2Hash = tree.getResourceByPath("/src/foo/file2.js").hash; + + registry.scheduleUpdate(createMockResource("/src/foo/file2.js", "v1", timestamp, 1024, 200)); + + t.is(registry.getPendingUpdateCount(), 1, "Should have one pending update"); + + await registry.flush(); + + // Should apply the last update + t.is(tree.getResourceByPath("/src/foo/file2.js").hash.toString("hex"), file2Hash.toString("hex"), + "Should have same has for file"); + t.is(tree.getRootHash(), initialHash, "Root hash should remain unchanged"); +}); + +test("TreeRegistry - unregister tree", async (t) => { + const registry = new TreeRegistry(); + const tree1 = new HashTree([{path: "a.js", integrity: "hash1"}], {registry}); + const tree2 = new HashTree([{path: "b.js", integrity: "hash2"}], {registry}); + + t.is(registry.getTreeCount(), 2); + + registry.unregister(tree1); + t.is(registry.getTreeCount(), 1); + + // Flush should only affect tree2 + registry.scheduleUpdate(createMockResource("b.js", "new-hash2", Date.now(), 1024, 777)); + await registry.flush(); + + t.notThrows(() => tree2.getRootHash(), "Tree2 should still work"); +}); + +// ============================================================================ +// Derived Tree Tests +// ============================================================================ + +test("deriveTree - creates tree sharing subtrees", (t) => { + const resources = [ + {path: "dir1/a.js", integrity: "hash-a"}, + {path: "dir1/b.js", integrity: "hash-b"} + ]; + + const tree1 = new HashTree(resources); + const tree2 = tree1.deriveTree([{path: "dir2/c.js", integrity: "hash-c"}]); + + // Both trees should have dir1 + t.truthy(tree2.hasPath("dir1/a.js"), "Derived tree should have shared resources"); + t.truthy(tree2.hasPath("dir2/c.js"), "Derived tree should have new resources"); + + // Tree1 should not have dir2 + t.false(tree1.hasPath("dir2/c.js"), "Original tree should not have derived resources"); +}); + +test("deriveTree - shared nodes are the same reference", (t) => { + const resources = [ + {path: "shared/file.js", integrity: "hash1"} + ]; + + const tree1 = new HashTree(resources); + const tree2 = tree1.deriveTree([]); + + // Get the shared directory node from both trees + const dir1 = tree1.root.children.get("shared"); + const dir2 = tree2.root.children.get("shared"); + + t.is(dir1, dir2, "Shared directory nodes should be same reference"); + + // Get the file node + const file1 = dir1.children.get("file.js"); + const file2 = dir2.children.get("file.js"); + + t.is(file1, file2, "Shared resource nodes should be same reference"); +}); + +test("deriveTree - updates to shared nodes visible in all trees", async (t) => { + const registry = new TreeRegistry(); + const resources = [ + {path: "shared/file.js", integrity: "original"} + ]; + + const tree1 = new HashTree(resources, {registry}); + const tree2 = tree1.deriveTree([]); + + // Get nodes before update + const node1Before = tree1.getResourceByPath("shared/file.js"); + const node2Before = tree2.getResourceByPath("shared/file.js"); + + t.is(node1Before, node2Before, "Should be same node reference"); + t.is(node1Before.integrity, "original", "Original integrity"); + + // Update via registry + registry.scheduleUpdate(createMockResource("shared/file.js", "updated", Date.now(), 1024, 555)); + await registry.flush(); + + // Both should see the update (same node) + t.is(node1Before.integrity, "updated", "Tree1 node should be updated"); + t.is(node2Before.integrity, "updated", "Tree2 node should be updated (same reference)"); +}); + +test("deriveTree - multiple levels of derivation", async (t) => { + const registry = new TreeRegistry(); + + const tree1 = new HashTree([{path: "a.js", integrity: "hash-a"}], {registry}); + const tree2 = tree1.deriveTree([{path: "b.js", integrity: "hash-b"}]); + const tree3 = tree2.deriveTree([{path: "c.js", integrity: "hash-c"}]); + + t.truthy(tree3.hasPath("a.js"), "Should have resources from tree1"); + t.truthy(tree3.hasPath("b.js"), "Should have resources from tree2"); + t.truthy(tree3.hasPath("c.js"), "Should have its own resources"); + + // Update shared resource + registry.scheduleUpdate(createMockResource("a.js", "new-hash-a", Date.now(), 1024, 111)); + await registry.flush(); + + // All trees should see the update + t.is(tree1.getResourceByPath("a.js").integrity, "new-hash-a"); + t.is(tree2.getResourceByPath("a.js").integrity, "new-hash-a"); + t.is(tree3.getResourceByPath("a.js").integrity, "new-hash-a"); +}); + +test("deriveTree - efficient hash recomputation", async (t) => { + const registry = new TreeRegistry(); + const resources = [ + {path: "dir1/a.js", integrity: "hash-a"}, + {path: "dir1/b.js", integrity: "hash-b"}, + {path: "dir2/c.js", integrity: "hash-c"} + ]; + + const tree1 = new HashTree(resources, {registry}); + const tree2 = tree1.deriveTree([{path: "dir3/d.js", integrity: "hash-d"}]); + + // Spy on _computeHash to count calls + const computeSpy = sinon.spy(tree1, "_computeHash"); + const compute2Spy = sinon.spy(tree2, "_computeHash"); + + // Update resource in shared directory + registry.scheduleUpdate(createMockResource("dir1/a.js", "new-hash-a", Date.now(), 2048, 222)); + await registry.flush(); + + // Each affected directory should be hashed once per tree + // dir1/a.js node, dir1 node, root node for each tree + t.true(computeSpy.callCount >= 3, "Tree1 should recompute affected nodes"); + t.true(compute2Spy.callCount >= 3, "Tree2 should recompute affected nodes"); +}); + +test("deriveTree - independent updates to different directories", async (t) => { + const registry = new TreeRegistry(); + const resources = [ + {path: "dir1/a.js", integrity: "hash-a"} + ]; + + const tree1 = new HashTree(resources, {registry}); + const tree2 = tree1.deriveTree([{path: "dir2/b.js", integrity: "hash-b"}]); + + const hash1Before = tree1.getRootHash(); + const hash2Before = tree2.getRootHash(); + + // Update only in tree2's unique directory + registry.scheduleUpdate(createMockResource("dir2/b.js", "new-hash-b", Date.now(), 1024, 333)); + await registry.flush(); + + const hash1After = tree1.getRootHash(); + const hash2After = tree2.getRootHash(); + + // Both trees are affected because they share the root and dir2 is added/updated via registry + t.not(hash1Before, hash1After, "Tree1 hash changes (dir2 added to shared root)"); + t.not(hash2Before, hash2After, "Tree2 hash should change"); + + // Tree1 now has dir2 because registry ensures directory path exists + t.truthy(tree1.hasPath("dir2/b.js"), "Tree1 should now have dir2/b.js"); + t.truthy(tree2.hasPath("dir2/b.js"), "Tree2 should have dir2/b.js"); +}); + +test("deriveTree - preserves tree statistics correctly", (t) => { + const resources = [ + {path: "dir1/a.js", integrity: "hash-a"}, + {path: "dir1/b.js", integrity: "hash-b"} + ]; + + const tree1 = new HashTree(resources); + const tree2 = tree1.deriveTree([ + {path: "dir2/c.js", integrity: "hash-c"}, + {path: "dir2/d.js", integrity: "hash-d"} + ]); + + const stats1 = tree1.getStats(); + const stats2 = tree2.getStats(); + + t.is(stats1.resources, 2, "Tree1 should have 2 resources"); + t.is(stats2.resources, 4, "Tree2 should have 4 resources"); + t.true(stats2.directories >= stats1.directories, "Tree2 should have at least as many directories"); +}); + +test("deriveTree - empty derivation creates exact copy with shared nodes", (t) => { + const resources = [ + {path: "file.js", integrity: "hash1"} + ]; + + const tree1 = new HashTree(resources); + const tree2 = tree1.deriveTree([]); + + // Should have same structure + t.is(tree1.getRootHash(), tree2.getRootHash(), "Should have same root hash"); + + // But different root nodes (shallow copied) + t.not(tree1.root, tree2.root, "Root nodes should be different"); + + // But shared children + const child1 = tree1.root.children.get("file.js"); + const child2 = tree2.root.children.get("file.js"); + t.is(child1, child2, "Children should be shared"); +}); + +test("deriveTree - complex shared structure", async (t) => { + const registry = new TreeRegistry(); + const resources = [ + {path: "shared/deep/nested/file1.js", integrity: "hash1"}, + {path: "shared/deep/file2.js", integrity: "hash2"}, + {path: "shared/file3.js", integrity: "hash3"} + ]; + + const tree1 = new HashTree(resources, {registry}); + const tree2 = tree1.deriveTree([ + {path: "unique/file4.js", integrity: "hash4"} + ]); + + // Update deeply nested shared file + registry.scheduleUpdate(createMockResource("shared/deep/nested/file1.js", "new-hash1", Date.now(), 2048, 666)); + await registry.flush(); + + // Both trees should reflect the change + t.is(tree1.getResourceByPath("shared/deep/nested/file1.js").integrity, "new-hash1"); + t.is(tree2.getResourceByPath("shared/deep/nested/file1.js").integrity, "new-hash1"); + + // Root hashes should both change + const paths1 = tree1.getResourcePaths(); + const paths2 = tree2.getResourcePaths(); + + t.is(paths1.length, 3, "Tree1 should have 3 resources"); + t.is(paths2.length, 4, "Tree2 should have 4 resources"); +}); + +// ============================================================================ +// upsertResources Tests with Registry +// ============================================================================ + +test("upsertResources - with registry schedules operations", async (t) => { + const registry = new TreeRegistry(); + const tree = new HashTree([{path: "a.js", integrity: "hash-a"}], {registry}); + + const result = await tree.upsertResources([ + createMockResource("b.js", "hash-b", Date.now(), 1024, 1) + ]); + + t.deepEqual(result.scheduled, ["b.js"], "Should report scheduled paths"); + t.deepEqual(result.added, [], "Should have empty added in scheduled mode"); + t.deepEqual(result.updated, [], "Should have empty updated in scheduled mode"); +}); + +test("upsertResources - with registry and flush", async (t) => { + const registry = new TreeRegistry(); + const tree = new HashTree([{path: "a.js", integrity: "hash-a"}], {registry}); + const originalHash = tree.getRootHash(); + + await tree.upsertResources([ + createMockResource("b.js", "hash-b", Date.now(), 1024, 1), + createMockResource("c.js", "hash-c", Date.now(), 2048, 2) + ]); + + const result = await registry.flush(); + + t.truthy(result.added, "Result should have added array"); + t.true(result.added.includes("b.js"), "Should report b.js as added"); + t.true(result.added.includes("c.js"), "Should report c.js as added"); + + t.truthy(tree.hasPath("b.js"), "Tree should have b.js"); + t.truthy(tree.hasPath("c.js"), "Tree should have c.js"); + t.not(tree.getRootHash(), originalHash, "Root hash should change"); +}); + +test("upsertResources - with derived trees", async (t) => { + const registry = new TreeRegistry(); + const tree1 = new HashTree([{path: "shared/a.js", integrity: "hash-a"}], {registry}); + const tree2 = tree1.deriveTree([{path: "unique/b.js", integrity: "hash-b"}]); + + await tree1.upsertResources([ + createMockResource("shared/c.js", "hash-c", Date.now(), 1024, 3) + ]); + + await registry.flush(); + + t.truthy(tree1.hasPath("shared/c.js"), "Tree1 should have shared/c.js"); + t.truthy(tree2.hasPath("shared/c.js"), "Tree2 should also have shared/c.js"); + t.false(tree1.hasPath("unique/b.js"), "Tree1 should not have unique/b.js"); + t.truthy(tree2.hasPath("unique/b.js"), "Tree2 should have unique/b.js"); +}); + +// ============================================================================ +// removeResources Tests with Registry +// ============================================================================ + +test("removeResources - with registry schedules operations", async (t) => { + const registry = new TreeRegistry(); + const tree = new HashTree([ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"} + ], {registry}); + + const result = await tree.removeResources(["b.js"]); + + t.deepEqual(result.scheduled, ["b.js"], "Should report scheduled paths"); + t.deepEqual(result.removed, [], "Should have empty removed in scheduled mode"); +}); + +test("removeResources - with registry and flush", async (t) => { + const registry = new TreeRegistry(); + const tree = new HashTree([ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"}, + {path: "c.js", integrity: "hash-c"} + ], {registry}); + const originalHash = tree.getRootHash(); + + await tree.removeResources(["b.js", "c.js"]); + + const result = await registry.flush(); + + t.truthy(result.removed, "Result should have removed array"); + t.true(result.removed.includes("b.js"), "Should report b.js as removed"); + t.true(result.removed.includes("c.js"), "Should report c.js as removed"); + + t.truthy(tree.hasPath("a.js"), "Tree should still have a.js"); + t.false(tree.hasPath("b.js"), "Tree should not have b.js"); + t.false(tree.hasPath("c.js"), "Tree should not have c.js"); + t.not(tree.getRootHash(), originalHash, "Root hash should change"); +}); + +test("removeResources - with derived trees propagates removal", async (t) => { + const registry = new TreeRegistry(); + const tree1 = new HashTree([ + {path: "shared/a.js", integrity: "hash-a"}, + {path: "shared/b.js", integrity: "hash-b"} + ], {registry}); + const tree2 = tree1.deriveTree([{path: "unique/c.js", integrity: "hash-c"}]); + + // Verify both trees share the resources + t.truthy(tree1.hasPath("shared/a.js")); + t.truthy(tree1.hasPath("shared/b.js")); + t.truthy(tree2.hasPath("shared/a.js")); + t.truthy(tree2.hasPath("shared/b.js")); + + // Remove from shared directory + await tree1.removeResources(["shared/b.js"]); + await registry.flush(); + + // Both trees should see the removal + t.truthy(tree1.hasPath("shared/a.js"), "Tree1 should still have shared/a.js"); + t.false(tree1.hasPath("shared/b.js"), "Tree1 should not have shared/b.js"); + t.truthy(tree2.hasPath("shared/a.js"), "Tree2 should still have shared/a.js"); + t.false(tree2.hasPath("shared/b.js"), "Tree2 should not have shared/b.js"); + t.truthy(tree2.hasPath("unique/c.js"), "Tree2 should still have unique/c.js"); +}); + +// ============================================================================ +// Combined upsert and remove operations with Registry +// ============================================================================ + +test("upsertResources and removeResources - combined operations", async (t) => { + const registry = new TreeRegistry(); + const tree = new HashTree([ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"} + ], {registry}); + const originalHash = tree.getRootHash(); + + // Schedule both operations + await tree.upsertResources([ + createMockResource("c.js", "hash-c", Date.now(), 1024, 3) + ]); + await tree.removeResources(["b.js"]); + + const result = await registry.flush(); + + t.true(result.added.includes("c.js"), "Should add c.js"); + t.true(result.removed.includes("b.js"), "Should remove b.js"); + + t.truthy(tree.hasPath("a.js"), "Tree should have a.js"); + t.false(tree.hasPath("b.js"), "Tree should not have b.js"); + t.truthy(tree.hasPath("c.js"), "Tree should have c.js"); + t.not(tree.getRootHash(), originalHash, "Root hash should change"); +}); + +test("upsertResources and removeResources - conflicting operations on same path", async (t) => { + const registry = new TreeRegistry(); + const tree = new HashTree([{path: "a.js", integrity: "hash-a"}], {registry}); + + // Schedule removal then upsert (upsert should win) + await tree.removeResources(["a.js"]); + await tree.upsertResources([ + createMockResource("a.js", "new-hash-a", Date.now(), 1024, 1) + ]); + + const result = await registry.flush(); + + // Upsert cancels removal + t.deepEqual(result.removed, [], "Should have no removals"); + t.true(result.updated.includes("a.js") || result.changed.includes("a.js"), "Should update or keep a.js"); + t.truthy(tree.hasPath("a.js"), "Tree should still have a.js"); +}); From 42e37b54acdb12a236bf4d67e25ef29e5457702d Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Fri, 2 Jan 2026 10:45:12 +0100 Subject: [PATCH 047/110] refactor(project): Compress cache using gzip --- .../project/lib/build/cache/CacheManager.js | 74 ++----------------- .../lib/build/cache/ProjectBuildCache.js | 8 +- 2 files changed, 14 insertions(+), 68 deletions(-) diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index 61630f2e9a5..f2d7c565d90 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -2,6 +2,7 @@ import cacache from "cacache"; import path from "node:path"; import fs from "graceful-fs"; import {promisify} from "node:util"; +import {gzip} from "node:zlib"; const mkdir = promisify(fs.mkdir); const readFile = promisify(fs.readFile); const writeFile = promisify(fs.writeFile); @@ -285,23 +286,11 @@ export default class CacheManager { if (!integrity) { throw new Error("Integrity hash must be provided to read from cache"); } - const cacheKey = this.#createKeyForStage(buildSignature, stageId, stageSignature, resourcePath); - const result = await cacache.get.info(this.#casDir, cacheKey); + // const cacheKey = this.#createKeyForStage(buildSignature, stageId, stageSignature, resourcePath, integrity); + const result = await cacache.get.info(this.#casDir, integrity); if (!result) { return null; } - if (result.integrity !== integrity) { - log.info(`Integrity mismatch for cache entry ` + - `${cacheKey}: expected ${integrity}, got ${result.integrity}`); - - const res = await cacache.get.byDigest(this.#casDir, integrity); - if (res) { - log.info(`Updating cache entry with expectation...`); - await this.writeStage(buildSignature, stageId, resourcePath, res); - return await this.getResourcePathForStage( - buildSignature, stageId, stageSignature, resourcePath, integrity); - } - } return result.path; } @@ -324,64 +313,17 @@ export default class CacheManager { async writeStageResource(buildSignature, stageId, stageSignature, resource) { // Check if resource has already been written const integrity = await resource.getIntegrity(); - const hasResource = await cacache.get.hasContent(this.#casDir, integrity); - const cacheKey = this.#createKeyForStage(buildSignature, stageId, stageSignature, resource.getOriginalPath()); + const hasResource = await cacache.get.info(this.#casDir, integrity); if (!hasResource) { const buffer = await resource.getBuffer(); + // Compress the buffer using gzip before caching + const compressedBuffer = await promisify(gzip)(buffer); await cacache.put( this.#casDir, - cacheKey, - buffer, + integrity, + compressedBuffer, CACACHE_OPTIONS ); - } else { - // Update index - await cacache.index.insert(this.#casDir, cacheKey, integrity, CACACHE_OPTIONS); } } - - // async writeStage(buildSignature, stageId, resourcePath, buffer) { - // return await cacache.put( - // this.#casDir, - // this.#createKeyForStage(buildSignature, stageId, resourcePath), - // buffer, - // CACACHE_OPTIONS - // ); - // } - - // async writeStageStream(buildSignature, stageId, resourcePath, stream) { - // const writable = cacache.put.stream( - // this.#casDir, - // this.#createKeyForStage(buildSignature, stageId, resourcePath), - // stream, - // CACACHE_OPTIONS, - // ); - // return new Promise((resolve, reject) => { - // writable.on("integrity", (digest) => { - // resolve(digest); - // }); - // writable.on("error", (err) => { - // reject(err); - // }); - // stream.pipe(writable); - // }); - // } - - /** - * Creates a cache key for a resource in a specific stage - * - * The key format is: buildSignature|stageId|stageSignature|resourcePath - * This ensures unique identification of resources across different builds, - * stages, and input combinations. - * - * @private - * @param {string} buildSignature - Build signature hash - * @param {string} stageId - Stage identifier (e.g., "result" or "task/taskName") - * @param {string} stageSignature - Stage signature hash - * @param {string} resourcePath - Virtual path of the resource - * @returns {string} Cache key string - */ - #createKeyForStage(buildSignature, stageId, stageSignature, resourcePath) { - return `${buildSignature}|${stageId}|${stageSignature}|${resourcePath}`; - } } diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 5fdc8006c2a..120f2f74df9 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -2,6 +2,7 @@ import {createResource, createProxy} from "@ui5/fs/resourceFactory"; import {getLogger} from "@ui5/logger"; import fs from "graceful-fs"; import {promisify} from "node:util"; +import {gunzip, createGunzip} from "node:zlib"; const readFile = promisify(fs.readFile); import BuildTaskCache from "./BuildTaskCache.js"; import StageCache from "./StageCache.js"; @@ -616,10 +617,13 @@ export default class ProjectBuildCache { fsPath: cachePath }, createStream: () => { - return fs.createReadStream(cachePath); + // Decompress the gzip-compressed stream + return fs.createReadStream(cachePath).pipe(createGunzip()); }, createBuffer: async () => { - return await readFile(cachePath); + // Decompress the gzip-compressed buffer + const compressedBuffer = await readFile(cachePath); + return await promisify(gunzip)(compressedBuffer); }, size, lastModified, From 0937ee4350b0a1fb3e40cecfa05b7e23b0af2b5f Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Fri, 2 Jan 2026 11:08:59 +0100 Subject: [PATCH 048/110] refactor(fs): Ensure writer collection uses unique readers --- packages/fs/lib/WriterCollection.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/fs/lib/WriterCollection.js b/packages/fs/lib/WriterCollection.js index 21e8200b7f1..4b5d6279e1f 100644 --- a/packages/fs/lib/WriterCollection.js +++ b/packages/fs/lib/WriterCollection.js @@ -61,7 +61,7 @@ class WriterCollection extends AbstractReaderWriter { this._writerMapping = writerMapping; this._readerCollection = new ReaderCollection({ name: `Reader collection of writer collection '${this._name}'`, - readers: Object.values(writerMapping) + readers: Array.from(new Set(Object.values(writerMapping))) // Ensure unique readers }); } From 8294181dfd8bb36854536f119472de8144d127f6 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Fri, 2 Jan 2026 11:12:06 +0100 Subject: [PATCH 049/110] refactor(fs): Remove write tracking from MonitoredReaderWriter Not needed in current implementation --- packages/fs/lib/MonitoredReaderWriter.js | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/packages/fs/lib/MonitoredReaderWriter.js b/packages/fs/lib/MonitoredReaderWriter.js index 4a42c2980d6..0472fb9b610 100644 --- a/packages/fs/lib/MonitoredReaderWriter.js +++ b/packages/fs/lib/MonitoredReaderWriter.js @@ -5,7 +5,6 @@ export default class MonitoredReaderWriter extends AbstractReaderWriter { #sealed = false; #paths = new Set(); #patterns = new Set(); - #pathsWritten = new Set(); constructor(readerWriter) { super(readerWriter.getName()); @@ -20,11 +19,6 @@ export default class MonitoredReaderWriter extends AbstractReaderWriter { }; } - getWrittenResourcePaths() { - this.#sealed = true; - return this.#pathsWritten; - } - async _byGlob(virPattern, options, trace) { if (this.#sealed) { throw new Error(`Unexpected read operation after reader has been sealed`); @@ -54,13 +48,6 @@ export default class MonitoredReaderWriter extends AbstractReaderWriter { } async _write(resource, options) { - if (this.#sealed) { - throw new Error(`Unexpected write operation after writer has been sealed`); - } - if (!resource) { - throw new Error(`Cannot write undefined resource`); - } - this.#pathsWritten.add(resource.getOriginalPath()); return this.#readerWriter.write(resource, options); } } From b2bfb294b60de28d080599d73b08b48f80d3c0d4 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Fri, 2 Jan 2026 11:12:47 +0100 Subject: [PATCH 050/110] refactor(project): Identify written resources using stage writer --- packages/project/lib/build/TaskRunner.js | 1 - .../lib/build/cache/ProjectBuildCache.js | 19 ++++++------------- 2 files changed, 6 insertions(+), 14 deletions(-) diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index f5c833ede47..0f74e715f64 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -243,7 +243,6 @@ class TaskRunner { } this._log.endTask(taskName); await this._buildCache.recordTaskResult(taskName, - workspace.getWrittenResourcePaths(), workspace.getResourceRequests(), dependencies?.getResourceRequests()); }; diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 120f2f74df9..088c51d83b6 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -230,14 +230,13 @@ export default class ProjectBuildCache { * 4. Removes the task from the invalidated tasks list * * @param {string} taskName - Name of the executed task - * @param {Set} writtenResourcePaths - Set of resource paths written by the task * @param {@ui5/project/build/cache/BuildTaskCache~ResourceRequests} projectResourceRequests * Resource requests for project resources * @param {@ui5/project/build/cache/BuildTaskCache~ResourceRequests} dependencyResourceRequests * Resource requests for dependency resources * @returns {Promise} */ - async recordTaskResult(taskName, writtenResourcePaths, projectResourceRequests, dependencyResourceRequests) { + async recordTaskResult(taskName, projectResourceRequests, dependencyResourceRequests) { if (!this.#taskCache.has(taskName)) { // Initialize task cache this.#taskCache.set(taskName, new BuildTaskCache(this.#project.getName(), taskName, this.#buildSignature)); @@ -253,17 +252,11 @@ export default class ProjectBuildCache { this.#dependencyReader ); - // TODO: Read written resources from writer instead of relying on monitor? - // const stage = this.#project.getStage(); - // const stageWriter = stage.getWriter(); - // const writer = stageWriter.collection ? stageWriter.collection : stageWriter; - // const writtenResources = await writer.byGlob("/**/*"); - // if (writtenResources.length !== writtenResourcePaths.size) { - // throw new Error( - // `Mismatch between recorded written resources (${writtenResourcePaths.size}) ` + - // `and actual resources in stage (${writtenResources.length}) for task ${taskName} ` + - // `in project ${this.#project.getName()}`); - // } + // Identify resources written by task + const stage = this.#project.getStage(); + const stageWriter = stage.getWriter(); + const writtenResources = await stageWriter.byGlob("/**/*"); + const writtenResourcePaths = writtenResources.map((res) => res.getOriginalPath()); log.verbose(`Storing stage for task ${taskName} in project ${this.#project.getName()} ` + `with signature ${stageSignature}`); From 85828e7ea85623617089de214217eca268cace1e Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Fri, 2 Jan 2026 15:46:16 +0100 Subject: [PATCH 051/110] refactor(project): Add basic differential update functionality --- packages/project/lib/build/TaskRunner.js | 43 +-- .../project/lib/build/cache/BuildTaskCache.js | 289 ++++++++++++------ .../project/lib/build/cache/CacheManager.js | 63 +++- .../lib/build/cache/ProjectBuildCache.js | 122 +++++--- .../project/lib/build/cache/index/HashTree.js | 66 +++- .../lib/build/cache/index/ResourceIndex.js | 53 +++- .../lib/build/cache/index/TreeRegistry.js | 58 +++- packages/project/lib/build/cache/utils.js | 1 + .../lib/build/definitions/application.js | 3 + .../lib/build/definitions/component.js | 3 + .../project/lib/build/definitions/library.js | 4 + .../lib/build/definitions/themeLibrary.js | 2 + .../project/lib/build/helpers/WatchHandler.js | 6 +- .../project/lib/specifications/Project.js | 7 +- .../lib/specifications/extensions/Task.js | 7 + .../lib/build/cache/index/TreeRegistry.js | 278 ++++++++++++++++- 16 files changed, 803 insertions(+), 202 deletions(-) diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index 0f74e715f64..b23a80dd2dd 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -174,10 +174,13 @@ class TaskRunner { * @param {string} taskName Name of the task which should be in the list availableTasks. * @param {object} [parameters] * @param {boolean} [parameters.requiresDependencies] + * @param {boolean} [parameters.supportsDifferentialUpdates] * @param {object} [parameters.options] * @param {Function} [parameters.taskFunction] */ - _addTask(taskName, {requiresDependencies = false, options = {}, taskFunction} = {}) { + _addTask(taskName, { + requiresDependencies = false, supportsDifferentialUpdates = false, options = {}, taskFunction + } = {}) { if (this._tasks[taskName]) { throw new Error(`Failed to add duplicate task ${taskName} for project ${this._project.getName()}`); } @@ -195,13 +198,12 @@ class TaskRunner { options.projectName = this._project.getName(); options.projectNamespace = this._project.getNamespace(); // TODO: Apply cache and stage handling for custom tasks as well - const requiresRun = await this._buildCache.prepareTaskExecution(taskName, requiresDependencies); - if (!requiresRun) { + const cacheInfo = await this._buildCache.prepareTaskExecution(taskName, requiresDependencies); + if (cacheInfo === true) { this._log.skipTask(taskName); return; } - - const expectedOutput = new Set(); // TODO: Determine expected output properly + const usingCache = supportsDifferentialUpdates && cacheInfo; this._log.info( `Executing task ${taskName} for project ${this._project.getName()}`); @@ -209,18 +211,6 @@ class TaskRunner { const params = { workspace, taskUtil: this._taskUtil, - cacheUtil: { - // TODO: Create a proper interface for this - hasCache: () => { - return this._buildCache.hasTaskCache(taskName); - }, - getChangedProjectResourcePaths: () => { - return this._buildCache.getChangedProjectResourcePaths(taskName); - }, - getChangedDependencyResourcePaths: () => { - return this._buildCache.getChangedDependencyResourcePaths(taskName); - }, - }, options, }; @@ -229,11 +219,19 @@ class TaskRunner { dependencies = createMonitor(this._allDependenciesReader); params.dependencies = dependencies; } - + if (usingCache) { + this._log.info( + `Using differential update for task ${taskName} of project ${this._project.getName()}`); + // workspace = + params.changedProjectResourcePaths = Array.from(cacheInfo.changedProjectResourcePaths); + if (requiresDependencies) { + params.changedDependencyResourcePaths = Array.from(cacheInfo.changedDependencyResourcePaths); + } + } if (!taskFunction) { - taskFunction = (await this._taskRepository.getTask(taskName)).task; + const {task} = await this._taskRepository.getTask(taskName); + taskFunction = task; } - this._log.startTask(taskName); this._taskStart = performance.now(); await taskFunction(params); @@ -244,7 +242,8 @@ class TaskRunner { this._log.endTask(taskName); await this._buildCache.recordTaskResult(taskName, workspace.getResourceRequests(), - dependencies?.getResourceRequests()); + dependencies?.getResourceRequests(), + usingCache ? cacheInfo : undefined); }; } this._tasks[taskName] = { @@ -319,6 +318,7 @@ class TaskRunner { const requiredDependenciesCallback = await task.getRequiredDependenciesCallback(); const getBuildSignatureCallback = await task.getBuildSignatureCallback(); const getExpectedOutputCallback = await task.getExpectedOutputCallback(); + const differentialUpdateCallback = await task.getDifferentialUpdateCallback(); const specVersion = task.getSpecVersion(); let requiredDependencies; @@ -392,6 +392,7 @@ class TaskRunner { provideDependenciesReader, getBuildSignatureCallback, getExpectedOutputCallback, + differentialUpdateCallback, getDependenciesReader: () => { // Create the dependencies reader on-demand return this._createDependenciesReader(requiredDependencies); diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index 86756dc5b72..70a9184e74f 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -1,9 +1,9 @@ import micromatch from "micromatch"; -// import {getLogger} from "@ui5/logger"; +import {getLogger} from "@ui5/logger"; import ResourceRequestGraph, {Request} from "./ResourceRequestGraph.js"; import ResourceIndex from "./index/ResourceIndex.js"; import TreeRegistry from "./index/TreeRegistry.js"; -// const log = getLogger("build:cache:BuildTaskCache"); +const log = getLogger("build:cache:BuildTaskCache"); /** * @typedef {object} @ui5/project/build/cache/BuildTaskCache~ResourceRequests @@ -36,33 +36,46 @@ import TreeRegistry from "./index/TreeRegistry.js"; * to reuse existing resource indices, optimizing both memory and computation. */ export default class BuildTaskCache { - // #projectName; #taskName; + #projectName; #resourceRequests; + #readTaskMetadataCache; #treeRegistries = []; + #useDifferentialUpdate = true; // ===== LIFECYCLE ===== /** * Creates a new BuildTaskCache instance * - * @param {string} projectName - Name of the project (currently unused but reserved for logging) * @param {string} taskName - Name of the task this cache manages - * @param {string} buildSignature - Build signature for the current build (currently unused but reserved) - * @param {TaskCacheMetadata} [metadata] - Previously cached metadata to restore from. - * If provided, reconstructs the resource request graph from serialized data. - * If omitted, starts with an empty request graph. + * @param {string} projectName - Name of the project this task belongs to + * @param {Function} readTaskMetadataCache - Function to read cached task metadata */ - constructor(projectName, taskName, buildSignature, metadata) { - // this.#projectName = projectName; + constructor(taskName, projectName, readTaskMetadataCache) { this.#taskName = taskName; + this.#projectName = projectName; + this.#readTaskMetadataCache = readTaskMetadataCache; + } - if (metadata) { - this.#resourceRequests = ResourceRequestGraph.fromCacheObject(metadata.requestSetGraph); - } else { + async #initResourceRequests() { + if (this.#resourceRequests) { + return; // Already initialized + } + if (!this.#readTaskMetadataCache) { + // No cache reader provided, start with empty graph this.#resourceRequests = new ResourceRequestGraph(); + return; + } + + const taskMetadata = + await this.#readTaskMetadataCache(); + if (!taskMetadata) { + throw new Error(`No cached metadata found for task '${this.#taskName}' ` + + `of project '${this.#projectName}'`); } + this.#resourceRequests = this.#restoreGraphFromCache(taskMetadata); } // ===== METADATA ACCESS ===== @@ -76,30 +89,6 @@ export default class BuildTaskCache { return this.#taskName; } - /** - * Gets all possible stage signatures for this task - * - * Returns signatures from all recorded request sets. Each signature represents - * a unique combination of resources that were accessed during task execution. - * Used to look up cached build stages. - * - * @param {module:@ui5/fs.AbstractReader} [projectReader] - Reader for project resources (currently unused) - * @param {module:@ui5/fs.AbstractReader} [dependencyReader] - Reader for dependency resources (currently unused) - * @returns {Promise} Array of stage signature strings - * @throws {Error} If resource index is missing for any request set - */ - async getPossibleStageSignatures(projectReader, dependencyReader) { - const requestSetIds = this.#resourceRequests.getAllNodeIds(); - const signatures = requestSetIds.map((requestSetId) => { - const {resourceIndex} = this.#resourceRequests.getMetadata(requestSetId); - if (!resourceIndex) { - throw new Error(`Resource index missing for request set ID ${requestSetId}`); - } - return resourceIndex.getSignature(); - }); - return signatures; - } - /** * Updates resource indices for request sets affected by changed resources * @@ -119,6 +108,7 @@ export default class BuildTaskCache { * @returns {Promise} */ async updateIndices(changedProjectResourcePaths, changedDepResourcePaths, projectReader, dependencyReader) { + await this.#initResourceRequests(); // Filter relevant resource changes and update the indices if necessary const matchingRequestSetIds = []; const updatesByRequestSetId = new Map(); @@ -142,11 +132,6 @@ export default class BuildTaskCache { } } if (relevantUpdates.length) { - if (!this.#resourceRequests.getMetadata(nodeId).resourceIndex) { - // Restore missing resource index - await this.#restoreResourceIndex(nodeId, projectReader, dependencyReader); - continue; // Index is fresh now, no need to update again - } updatesByRequestSetId.set(nodeId, relevantUpdates); matchingRequestSetIds.push(nodeId); } @@ -156,6 +141,9 @@ export default class BuildTaskCache { // Update matching resource indices for (const requestSetId of matchingRequestSetIds) { const {resourceIndex} = this.#resourceRequests.getMetadata(requestSetId); + if (!resourceIndex) { + throw new Error(`Missing resource index for request set ID ${requestSetId}`); + } const resourcePathsToUpdate = updatesByRequestSetId.get(requestSetId); const resourcesToUpdate = []; @@ -186,44 +174,11 @@ export default class BuildTaskCache { await resourceIndex.upsertResources(resourcesToUpdate); } } - return await this.#flushTreeRegistries(); - } - - /** - * Restores a missing resource index for a request set - * - * Recursively restores parent indices first, then derives or creates the index - * for the current request set. Uses tree derivation when a parent index exists - * to share common resources efficiently. - * - * @private - * @param {number} requestSetId - ID of the request set to restore - * @param {module:@ui5/fs.AbstractReader} projectReader - Reader for project resources - * @param {module:@ui5/fs.AbstractReader} dependencyReader - Reader for dependency resources - * @returns {Promise} The restored resource index - */ - async #restoreResourceIndex(requestSetId, projectReader, dependencyReader) { - const node = this.#resourceRequests.getNode(requestSetId); - const addedRequests = node.getAddedRequests(); - const parentId = node.getParentId(); - let resourceIndex; - if (parentId) { - let {resourceIndex: parentResourceIndex} = this.#resourceRequests.getMetadata(parentId); - if (!parentResourceIndex) { - // Restore parent index first - parentResourceIndex = await this.#restoreResourceIndex(parentId, projectReader, dependencyReader); - } - // Add resources from delta to index - const resourcesToAdd = this.#getResourcesForRequests(addedRequests, projectReader, dependencyReader); - resourceIndex = parentResourceIndex.deriveTree(resourcesToAdd); + if (this.#useDifferentialUpdate) { + return await this.#flushTreeChangesWithDiff(changedProjectResourcePaths); } else { - const resourcesRead = - await this.#getResourcesForRequests(addedRequests, projectReader, dependencyReader); - resourceIndex = await ResourceIndex.create(resourcesRead, this.#newTreeRegistry()); + return await this.#flushTreeChanges(changedProjectResourcePaths); } - const metadata = this.#resourceRequests.getMetadata(requestSetId); - metadata.resourceIndex = resourceIndex; - return resourceIndex; } /** @@ -266,6 +221,31 @@ export default class BuildTaskCache { return matchedResources; } + /** + * Gets all possible stage signatures for this task + * + * Returns signatures from all recorded request sets. Each signature represents + * a unique combination of resources that were accessed during task execution. + * Used to look up cached build stages. + * + * @param {module:@ui5/fs.AbstractReader} [projectReader] - Reader for project resources (currently unused) + * @param {module:@ui5/fs.AbstractReader} [dependencyReader] - Reader for dependency resources (currently unused) + * @returns {Promise} Array of stage signature strings + * @throws {Error} If resource index is missing for any request set + */ + async getPossibleStageSignatures(projectReader, dependencyReader) { + await this.#initResourceRequests(); + const requestSetIds = this.#resourceRequests.getAllNodeIds(); + const signatures = requestSetIds.map((requestSetId) => { + const {resourceIndex} = this.#resourceRequests.getMetadata(requestSetId); + if (!resourceIndex) { + throw new Error(`Resource index missing for request set ID ${requestSetId}`); + } + return resourceIndex.getSignature(); + }); + return signatures; + } + /** * Calculates a signature for the task based on accessed resources * @@ -286,6 +266,7 @@ export default class BuildTaskCache { * @returns {Promise} Signature hash string of the resource index */ async calculateSignature(projectRequests, dependencyRequests, projectReader, dependencyReader) { + await this.#initResourceRequests(); const requests = []; for (const pathRead of projectRequests.paths) { requests.push(new Request("path", pathRead)); @@ -354,10 +335,94 @@ export default class BuildTaskCache { * Must be called after operations that schedule updates via registries. * * @private - * @returns {Promise} + * @returns {Promise} Object containing sets of added, updated, and removed resource paths */ - async #flushTreeRegistries() { - await Promise.all(this.#treeRegistries.map((registry) => registry.flush())); + async #flushTreeChanges() { + return await Promise.all(this.#treeRegistries.map((registry) => registry.flush())); + } + + /** + * Flushes all tree registries to apply batched updates + * + * Commits all pending tree modifications across all registries in parallel. + * Must be called after operations that schedule updates via registries. + * + * @param {Set} projectResourcePaths Set of changed project resource paths + * @private + * @returns {Promise} Object containing sets of added, updated, and removed resource paths + */ + async #flushTreeChangesWithDiff(projectResourcePaths) { + const requestSetIds = this.#resourceRequests.getAllNodeIds(); + const trees = new Map(); + // Record current signatures and create mapping between trees and request sets + requestSetIds.map((requestSetId) => { + const {resourceIndex} = this.#resourceRequests.getMetadata(requestSetId); + if (!resourceIndex) { + throw new Error(`Resource index missing for request set ID ${requestSetId}`); + } + trees.set(resourceIndex.getTree(), { + requestSetId, + signature: resourceIndex.getSignature(), + }); + }); + + let greatestNumberOfChanges = 0; + let relevantTree; + let relevantStats; + const res = await this.#flushTreeChanges(); + + // Based on the returned stats, find the tree with the greatest difference + // If none of the updated trees lead to a valid cache, this tree can be used to execute a differential + // build (assuming there's a cache for its previous signature) + for (const {treeStats} of res) { + for (const [tree, stats] of treeStats) { + if (stats.removed.length > 0) { + // If resources have been removed, we currently decide to not rely on any cache + return; + } + const numberOfChanges = stats.added.length + stats.updated.length; + if (numberOfChanges > greatestNumberOfChanges) { + greatestNumberOfChanges = numberOfChanges; + relevantTree = tree; + relevantStats = stats; + } + } + } + + if (!relevantTree) { + return; + } + // Update signatures for affected request sets + const {requestSetId, signature: originalSignature} = trees.get(relevantTree); + const newSignature = relevantTree.getRootHash(); + log.verbose(`Task '${this.#taskName}' of project '${this.#projectName}' ` + + `updated resource index for request set ID ${requestSetId} ` + + `from signature ${originalSignature} ` + + `to ${newSignature}`); + + const changedProjectResourcePaths = new Set(); + const changedDependencyResourcePaths = new Set(); + for (const path of relevantStats.added) { + if (projectResourcePaths.has(path)) { + changedProjectResourcePaths.add(path); + } else { + changedDependencyResourcePaths.add(path); + } + } + for (const path of relevantStats.updated) { + if (projectResourcePaths.has(path)) { + changedProjectResourcePaths.add(path); + } else { + changedDependencyResourcePaths.add(path); + } + } + + return { + originalSignature, + newSignature, + changedProjectResourcePaths, + changedDependencyResourcePaths, + }; } /** @@ -415,8 +480,6 @@ export default class BuildTaskCache { return resourcesMap.values(); } - // ===== VALIDATION ===== - /** * Checks if changed resources match this task's tracked resources * @@ -427,7 +490,8 @@ export default class BuildTaskCache { * @param {string[]} dependencyResourcePaths - Changed dependency resource paths * @returns {boolean} True if any changed resources match this task's tracked resources */ - matchesChangedResources(projectResourcePaths, dependencyResourcePaths) { + async matchesChangedResources(projectResourcePaths, dependencyResourcePaths) { + await this.#initResourceRequests(); const resourceRequests = this.#resourceRequests.getAllRequests(); return resourceRequests.some(({type, value}) => { if (type === "path") { @@ -455,8 +519,63 @@ export default class BuildTaskCache { * @returns {TaskCacheMetadata} Serialized cache metadata containing the request set graph */ toCacheObject() { + const rootIndices = []; + const deltaIndices = []; + for (const {nodeId, parentId} of this.#resourceRequests.traverseByDepth()) { + const {resourceIndex} = this.#resourceRequests.getMetadata(nodeId); + if (!resourceIndex) { + throw new Error(`Missing resource index for node ID ${nodeId}`); + } + if (!parentId) { + rootIndices.push({ + nodeId, + resourceIndex: resourceIndex.toCacheObject(), + }); + } else { + const rootResourceIndex = this.#resourceRequests.getMetadata(parentId); + if (!rootResourceIndex) { + throw new Error(`Missing root resource index for parent ID ${parentId}`); + } + const addedResourceIndex = resourceIndex.getAddedResourceIndex(rootResourceIndex); + deltaIndices.push({ + nodeId, + addedResourceIndex, + }); + } + } return { - requestSetGraph: this.#resourceRequests.toCacheObject() + requestSetGraph: this.#resourceRequests.toCacheObject(), + rootIndices, + deltaIndices, }; } + + #restoreGraphFromCache({requestSetGraph, rootIndices, deltaIndices}) { + const resourceRequests = ResourceRequestGraph.fromCacheObject(requestSetGraph); + const registries = new Map(); + // Restore root resource indices + for (const {nodeId, resourceIndex: serializedIndex} of rootIndices) { + const metadata = resourceRequests.getMetadata(nodeId); + const registry = this.#newTreeRegistry(); + registries.set(nodeId, registry); + metadata.resourceIndex = ResourceIndex.fromCache(serializedIndex, registry); + } + // Restore delta resource indices + if (deltaIndices) { + for (const {nodeId, addedResourceIndex} of deltaIndices) { + const node = resourceRequests.getNode(nodeId); + const {resourceIndex: parentResourceIndex} = resourceRequests.getMetadata(node.getParentId()); + const registry = registries.get(node.getParentId()); + if (!registry) { + throw new Error(`Missing tree registry for parent of node ID ${nodeId}`); + } + const resourceIndex = parentResourceIndex.deriveTreeWithIndex(addedResourceIndex, registry); + + resourceRequests.setMetadata(nodeId, { + resourceIndex, + }); + } + } + return resourceRequests; + } } diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index f2d7c565d90..72fa6f17a3c 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -158,7 +158,7 @@ export default class CacheManager { * @param {string} buildSignature - Build signature hash * @returns {string} Absolute path to the index metadata file */ - #getIndexMetadataPath(packageName, buildSignature) { + #getIndexCachePath(packageName, buildSignature) { const pkgDir = getPathFromPackageName(packageName); return path.join(this.#indexDir, pkgDir, `${buildSignature}.json`); } @@ -176,7 +176,7 @@ export default class CacheManager { */ async readIndexCache(projectId, buildSignature) { try { - const metadata = await readFile(this.#getIndexMetadataPath(projectId, buildSignature), "utf8"); + const metadata = await readFile(this.#getIndexCachePath(projectId, buildSignature), "utf8"); return JSON.parse(metadata); } catch (err) { if (err.code === "ENOENT") { @@ -199,7 +199,7 @@ export default class CacheManager { * @returns {Promise} */ async writeIndexCache(projectId, buildSignature, index) { - const indexPath = this.#getIndexMetadataPath(projectId, buildSignature); + const indexPath = this.#getIndexCachePath(projectId, buildSignature); await mkdir(path.dirname(indexPath), {recursive: true}); await writeFile(indexPath, JSON.stringify(index, null, 2), "utf8"); } @@ -267,6 +267,63 @@ export default class CacheManager { await writeFile(metadataPath, JSON.stringify(metadata, null, 2), "utf8"); } + /** + * Generates the file path for stage metadata + * + * @private + * @param {string} packageName - Package/project identifier + * @param {string} buildSignature - Build signature hash + * @param {string} taskName + * @returns {string} Absolute path to the stage metadata file + */ + #getTaskMetadataPath(packageName, buildSignature, taskName) { + const pkgDir = getPathFromPackageName(packageName); + return path.join(this.#stageMetadataDir, pkgDir, buildSignature, taskName, `metadata.json`); + } + + /** + * Reads stage metadata from cache + * + * Stage metadata contains information about resources produced by a build stage, + * including resource paths and their metadata. + * + * @param {string} projectId - Project identifier (typically package name) + * @param {string} buildSignature - Build signature hash + * @param {string} taskName + * @returns {Promise} Parsed stage metadata or null if not found + * @throws {Error} If file read fails for reasons other than file not existing + */ + async readTaskMetadata(projectId, buildSignature, taskName) { + try { + const metadata = await readFile(this.#getTaskMetadataPath(projectId, buildSignature, taskName), "utf8"); + return JSON.parse(metadata); + } catch (err) { + if (err.code === "ENOENT") { + // Cache miss + return null; + } + throw err; + } + } + + /** + * Writes stage metadata to cache + * + * Persists metadata about resources produced by a build stage. + * Creates parent directories if needed. + * + * @param {string} projectId - Project identifier (typically package name) + * @param {string} buildSignature - Build signature hash + * @param {string} taskName + * @param {object} metadata - Stage metadata object to serialize + * @returns {Promise} + */ + async writeTaskMetadata(projectId, buildSignature, taskName, metadata) { + const metadataPath = this.#getTaskMetadataPath(projectId, buildSignature, taskName); + await mkdir(path.dirname(metadataPath), {recursive: true}); + await writeFile(metadataPath, JSON.stringify(metadata, null, 2), "utf8"); + } + /** * Retrieves the file system path for a cached resource * diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 088c51d83b6..9a774e990d3 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -103,9 +103,10 @@ export default class ProjectBuildCache { await ResourceIndex.fromCacheWithDelta(indexCache, resources); // Import task caches - for (const [taskName, metadata] of Object.entries(indexCache.taskMetadata)) { + for (const taskName of indexCache.taskList) { this.#taskCache.set(taskName, - new BuildTaskCache(this.#project.getName(), taskName, this.#buildSignature, metadata)); + new BuildTaskCache(taskName, this.#project.getName(), + this.#createBuildTaskCacheMetadataReader(taskName))); } if (changedPaths.length) { // Invalidate tasks based on changed resources @@ -114,7 +115,7 @@ export default class ProjectBuildCache { // Since no tasks have been invalidated, a rebuild is still necessary in this case, so that // each task can find and use its individual stage cache. // Hence requiresInitialBuild will be set to true in this case (and others. - this.resourceChanged(changedPaths, []); + await this.resourceChanged(changedPaths, []); } else if (indexCache.indexTree.root.hash !== resourceIndex.getSignature()) { // Validate index signature matches with cached signature throw new Error( @@ -140,7 +141,7 @@ export default class ProjectBuildCache { * * @param {string} taskName - Name of the task to prepare * @param {boolean} requiresDependencies - Whether the task requires dependency reader - * @returns {Promise} True if task needs execution, false if cached result can be used + * @returns {Promise} True or object if task can use cache, false otherwise */ async prepareTaskExecution(taskName, requiresDependencies) { const stageName = this.#getStageNameForTask(taskName); @@ -149,35 +150,50 @@ export default class ProjectBuildCache { this.#project.useStage(stageName); if (taskCache) { + let deltaInfo; if (this.#invalidatedTasks.has(taskName)) { - const {changedProjectResourcePaths, changedDependencyResourcePaths} = + const invalidationInfo = this.#invalidatedTasks.get(taskName); - await taskCache.updateIndices( - changedProjectResourcePaths, changedDependencyResourcePaths, + deltaInfo = await taskCache.updateIndices( + invalidationInfo.changedProjectResourcePaths, + invalidationInfo.changedDependencyResourcePaths, this.#project.getReader(), this.#dependencyReader); } // else: Index will be created upon task completion // After index update, try to find cached stages for the new signatures - const stageCache = await this.#findStageCache(taskCache, stageName); + const stageSignatures = await taskCache.getPossibleStageSignatures(); + const stageCache = await this.#findStageCache(stageName, stageSignatures); if (stageCache) { - // TODO: This might cause more changed resources for following tasks - this.#project.setStage(stageName, stageCache.stage); + const stageChanged = this.#project.setStage(stageName, stageCache.stage); // Task can be skipped, use cached stage as project reader if (this.#invalidatedTasks.has(taskName)) { this.#invalidatedTasks.delete(taskName); } - if (stageCache.writtenResourcePaths.size) { + if (!stageChanged && stageCache.writtenResourcePaths.size) { // Invalidate following tasks this.#invalidateFollowingTasks(taskName, stageCache.writtenResourcePaths); } - return false; // No need to execute the task + return true; // No need to execute the task + } else if (deltaInfo) { + log.verbose(`No cached stage found for task ${taskName} in project ${this.#project.getName()}`); + + const deltaStageCache = await this.#findStageCache(stageName, [deltaInfo.originalSignature]); + if (deltaStageCache) { + log.verbose(`Using delta cached stage for task ${taskName} in project ${this.#project.getName()}`); + return { + previousStageCache: deltaStageCache, + newSignature: deltaInfo.newSignature, + changedProjectResourcePaths: deltaInfo.changedProjectResourcePaths, + changedDependencyResourcePaths: deltaInfo.changedDependencyResourcePaths + }; + } } } // No cached stage found, store current project reader for later use in recordTaskResult this.#currentProjectReader = this.#project.getReader(); - return true; // Task needs to be executed + return false; // Task needs to be executed } /** @@ -187,13 +203,12 @@ export default class ProjectBuildCache { * stage signature. Returns the first matching cached stage found. * * @private - * @param {BuildTaskCache} taskCache - Task cache containing possible stage signatures * @param {string} stageName - Name of the stage to find + * @param {string[]} stageSignatures - Possible signatures for the stage * @returns {Promise} Cached stage entry or null if not found */ - async #findStageCache(taskCache, stageName) { + async #findStageCache(stageName, stageSignatures) { // Check cache exists and ensure it's still valid before using it - const stageSignatures = await taskCache.getPossibleStageSignatures(); log.verbose(`Looking for cached stage for task ${stageName} in project ${this.#project.getName()} ` + `with ${stageSignatures.length} possible signatures:\n - ${stageSignatures.join("\n - ")}`); if (stageSignatures.length) { @@ -234,30 +249,52 @@ export default class ProjectBuildCache { * Resource requests for project resources * @param {@ui5/project/build/cache/BuildTaskCache~ResourceRequests} dependencyResourceRequests * Resource requests for dependency resources + * @param {object} cacheInfo * @returns {Promise} */ - async recordTaskResult(taskName, projectResourceRequests, dependencyResourceRequests) { + async recordTaskResult(taskName, projectResourceRequests, dependencyResourceRequests, cacheInfo) { if (!this.#taskCache.has(taskName)) { // Initialize task cache - this.#taskCache.set(taskName, new BuildTaskCache(this.#project.getName(), taskName, this.#buildSignature)); + this.#taskCache.set(taskName, new BuildTaskCache(taskName, this.#project.getName())); } log.verbose(`Updating build cache with results of task ${taskName} in project ${this.#project.getName()}`); const taskCache = this.#taskCache.get(taskName); - // Calculate signature for executed task - const stageSignature = await taskCache.calculateSignature( - projectResourceRequests, - dependencyResourceRequests, - this.#currentProjectReader, - this.#dependencyReader - ); - // Identify resources written by task const stage = this.#project.getStage(); const stageWriter = stage.getWriter(); const writtenResources = await stageWriter.byGlob("/**/*"); const writtenResourcePaths = writtenResources.map((res) => res.getOriginalPath()); + let stageSignature; + if (cacheInfo) { + stageSignature = cacheInfo.newSignature; + // Add resources from previous stage cache to current stage + let reader; + if (cacheInfo.previousStageCache.stage.byGlob) { + // Reader instance + reader = cacheInfo.previousStageCache.stage; + } else { + // Stage instance + reader = cacheInfo.previousStageCache.stage.getWriter() ?? + cacheInfo.previousStageCache.stage.getReader(); + } + const previousWrittenResources = await reader.byGlob("/**/*"); + for (const res of previousWrittenResources) { + if (!writtenResourcePaths.includes(res.getOriginalPath())) { + await stageWriter.write(res); + } + } + } else { + // Calculate signature for executed task + stageSignature = await taskCache.calculateSignature( + projectResourceRequests, + dependencyResourceRequests, + this.#currentProjectReader, + this.#dependencyReader + ); + } + log.verbose(`Storing stage for task ${taskName} in project ${this.#project.getName()} ` + `with signature ${stageSignature}`); // Store resulting stage in stage cache @@ -289,9 +326,8 @@ export default class ProjectBuildCache { * @private * @param {string} taskName - Name of the task that wrote resources * @param {Set} writtenResourcePaths - Paths of resources written by the task - * @returns {void} */ - #invalidateFollowingTasks(taskName, writtenResourcePaths) { + async #invalidateFollowingTasks(taskName, writtenResourcePaths) { const writtenPathsArray = Array.from(writtenResourcePaths); // Check whether following tasks need to be invalidated @@ -299,7 +335,7 @@ export default class ProjectBuildCache { const taskIdx = allTasks.indexOf(taskName); for (let i = taskIdx + 1; i < allTasks.length; i++) { const nextTaskName = allTasks[i]; - if (!this.#taskCache.get(nextTaskName).matchesChangedResources(writtenPathsArray, [])) { + if (!await this.#taskCache.get(nextTaskName).matchesChangedResources(writtenPathsArray, [])) { continue; } if (this.#invalidatedTasks.has(nextTaskName)) { @@ -339,10 +375,10 @@ export default class ProjectBuildCache { * @param {string[]} dependencyResourcePaths - Changed dependency resource paths * @returns {boolean} True if any task was invalidated, false otherwise */ - resourceChanged(projectResourcePaths, dependencyResourcePaths) { + async resourceChanged(projectResourcePaths, dependencyResourcePaths) { let taskInvalidated = false; for (const [taskName, taskCache] of this.#taskCache) { - if (!taskCache.matchesChangedResources(projectResourcePaths, dependencyResourcePaths)) { + if (!await taskCache.matchesChangedResources(projectResourcePaths, dependencyResourcePaths)) { continue; } taskInvalidated = true; @@ -652,16 +688,11 @@ export default class ProjectBuildCache { // Store result stage await this.#writeResultStage(); - // Store index cache - const indexMetadata = this.#resourceIndex.toCacheObject(); - const taskMetadata = Object.create(null); + // Store task caches for (const [taskName, taskCache] of this.#taskCache) { - taskMetadata[taskName] = taskCache.toCacheObject(); + await this.#cacheManager.writeTaskMetadata(this.#project.getId(), this.#buildSignature, taskName, + taskCache.toCacheObject()); } - await this.#cacheManager.writeIndexCache(this.#project.getId(), this.#buildSignature, { - ...indexMetadata, - taskMetadata, - }); // Store stage caches const stageQueue = this.#stageCache.flushCacheQueue(); @@ -689,6 +720,13 @@ export default class ProjectBuildCache { await this.#cacheManager.writeStageCache( this.#project.getId(), this.#buildSignature, stageId, stageSignature, metadata); })); + + // Finally store index cache + const indexMetadata = this.#resourceIndex.toCacheObject(); + await this.#cacheManager.writeIndexCache(this.#project.getId(), this.#buildSignature, { + ...indexMetadata, + taskList: Array.from(this.#taskCache.keys()), + }); } /** @@ -736,4 +774,10 @@ export default class ProjectBuildCache { }); } } + + #createBuildTaskCacheMetadataReader(taskName) { + return () => { + return this.#cacheManager.readTaskMetadata(this.#project.getId(), this.#buildSignature, taskName); + }; + } } diff --git a/packages/project/lib/build/cache/index/HashTree.js b/packages/project/lib/build/cache/index/HashTree.js index b1678bb41a9..6fcd6fd477d 100644 --- a/packages/project/lib/build/cache/index/HashTree.js +++ b/packages/project/lib/build/cache/index/HashTree.js @@ -627,8 +627,9 @@ export default class HashTree { * Skips resources whose metadata hasn't changed (optimization). * * @param {Array<@ui5/fs/Resource>} resources - Array of Resource instances to upsert - * @returns {Promise<{added: Array, updated: Array, unchanged: Array, scheduled?: Array}>} - * Status report: arrays of paths by operation type. 'scheduled' is present when using registry. + * @returns {Promise<{added: Array, updated: Array, unchanged: Array}|undefined>} + * Status report: arrays of paths by operation type. + * Undefined if using registry (results determined during flush). */ async upsertResources(resources) { if (!resources || resources.length === 0) { @@ -640,12 +641,7 @@ export default class HashTree { this.registry.scheduleUpsert(resource); } // When using registry, actual results are determined during flush - return { - added: [], - updated: [], - unchanged: [], - scheduled: resources.map((r) => r.getOriginalPath()) - }; + return; } // Immediate mode @@ -738,9 +734,9 @@ export default class HashTree { * sharing the affected directories (intentional for the shared view model). * * @param {Array} resourcePaths - Array of resource paths to remove - * @returns {Promise<{removed: Array, notFound: Array, scheduled?: Array}>} + * @returns {Promise<{removed: Array, notFound: Array}|undefined>} * Status report: 'removed' contains successfully removed paths, 'notFound' contains paths that didn't exist. - * 'scheduled' is present when using registry. + * Undefined if using registry (results determined during flush). */ async removeResources(resourcePaths) { if (!resourcePaths || resourcePaths.length === 0) { @@ -751,11 +747,7 @@ export default class HashTree { for (const resourcePath of resourcePaths) { this.registry.scheduleRemoval(resourcePath); } - return { - removed: [], - notFound: [], - scheduled: resourcePaths - }; + return; } // Immediate mode @@ -1100,4 +1092,48 @@ export default class HashTree { traverse(this.root, "/"); return paths.sort(); } + + /** + * For a tree derived from a base tree, get the list of resource nodes + * that were added compared to the base tree. + * + * @param {HashTree} rootTree - The base tree to compare against + * @returns {Array} Array of added resource nodes + */ + getAddedResources(rootTree) { + const added = []; + + const traverse = (node, currentPath, implicitlyAdded = false) => { + if (implicitlyAdded) { + if (node.type === "resource") { + added.push(node); + } + } else { + const baseNode = rootTree._findNode(currentPath); + if (baseNode && baseNode === node) { + // Node exists in base tree and is the same (structural sharing) + // Neither node nor children are added + return; + } else { + // Node doesn't exist in base tree - it's added + if (node.type === "resource") { + added.push(node); + } else { + // Directory - all children are added + implicitlyAdded = true; + } + } + } + + if (node.type === "directory") { + for (const [name, child] of node.children) { + const childPath = currentPath ? path.join(currentPath, name) : name; + traverse(child, childPath, implicitlyAdded); + } + } + }; + + traverse(this.root, ""); + return added; + } } diff --git a/packages/project/lib/build/cache/index/ResourceIndex.js b/packages/project/lib/build/cache/index/ResourceIndex.js index b2b62448617..e318f683a67 100644 --- a/packages/project/lib/build/cache/index/ResourceIndex.js +++ b/packages/project/lib/build/cache/index/ResourceIndex.js @@ -52,7 +52,7 @@ export default class ResourceIndex { * signature calculation and change tracking. * * @param {Array<@ui5/fs/Resource>} resources - Resources to index - * @param {import("./TreeRegistry.js").default} [registry] - Optional tree registry for deduplication + * @param {TreeRegistry} [registry] - Optional tree registry for structural sharing within trees * @returns {Promise} A new resource index * @public */ @@ -77,13 +77,14 @@ export default class ResourceIndex { * @param {number} indexCache.indexTimestamp - Timestamp of cached index * @param {object} indexCache.indexTree - Cached hash tree structure * @param {Array<@ui5/fs/Resource>} resources - Current resources to compare against cache + * @param {TreeRegistry} [registry] - Optional tree registry for structural sharing within trees * @returns {Promise<{changedPaths: string[], resourceIndex: ResourceIndex}>} * Object containing array of all changed resource paths and the updated index * @public */ - static async fromCacheWithDelta(indexCache, resources) { + static async fromCacheWithDelta(indexCache, resources, registry) { const {indexTimestamp, indexTree} = indexCache; - const tree = HashTree.fromCache(indexTree, {indexTimestamp}); + const tree = HashTree.fromCache(indexTree, {indexTimestamp, registry}); const currentResourcePaths = new Set(resources.map((resource) => resource.getOriginalPath())); const removed = tree.getResourcePaths().filter((resourcePath) => { return !currentResourcePaths.has(resourcePath); @@ -104,25 +105,22 @@ export default class ResourceIndex { * and fast restoration is needed. * * @param {object} indexCache - Cached index object - * @param {Object} indexCache.resourceMetadata - - * Map of resource paths to metadata (integrity, lastModified, size) - * @param {import("./TreeRegistry.js").default} [registry] - Optional tree registry for deduplication + * @param {number} indexCache.indexTimestamp - Timestamp of cached index + * @param {object} indexCache.indexTree - Cached hash tree structure + * @param {TreeRegistry} [registry] - Optional tree registry for structural sharing within trees * @returns {Promise} Restored resource index * @public */ - static async fromCache(indexCache, registry) { - const resourceIndex = Object.entries(indexCache.resourceMetadata).map(([path, metadata]) => { - return { - path, - integrity: metadata.integrity, - lastModified: metadata.lastModified, - size: metadata.size, - }; - }); - const tree = new HashTree(resourceIndex, {registry}); + static fromCache(indexCache, registry) { + const {indexTimestamp, indexTree} = indexCache; + const tree = HashTree.fromCache(indexTree, {indexTimestamp, registry}); return new ResourceIndex(tree); } + getTree() { + return this.#tree; + } + /** * Creates a deep copy of this ResourceIndex. * @@ -153,6 +151,10 @@ export default class ResourceIndex { return new ResourceIndex(this.#tree.deriveTree(resourceIndex)); } + async deriveTreeWithIndex(resourceIndex) { + return new ResourceIndex(this.#tree.deriveTree(resourceIndex)); + } + /** * Updates existing resources in the index. * @@ -167,6 +169,25 @@ export default class ResourceIndex { return await this.#tree.updateResources(resources); } + /** + * Compares this index against a base index and returns metadata + * for resources that have been added in this index. + * + * @param {ResourceIndex} baseIndex - The base resource index to compare against + */ + getAddedResourceIndex(baseIndex) { + const addedResources = this.#tree.getAddedResources(baseIndex.getTree()); + return addedResources.map(((resource) => { + return { + path: resource.path, + integrity: resource.integrity, + size: resource.size, + lastModified: resource.lastModified, + inode: resource.inode, + }; + })); + } + /** * Inserts or updates resources in the index. * diff --git a/packages/project/lib/build/cache/index/TreeRegistry.js b/packages/project/lib/build/cache/index/TreeRegistry.js index 92550b9ba52..dd2cfe058da 100644 --- a/packages/project/lib/build/cache/index/TreeRegistry.js +++ b/packages/project/lib/build/cache/index/TreeRegistry.js @@ -114,8 +114,9 @@ export default class TreeRegistry { * * After successful completion, all pending operations are cleared. * - * @returns {Promise<{added: string[], updated: string[], unchanged: string[], removed: string[]}>} - * Object containing arrays of resource paths categorized by operation result + * @returns {Promise<{added: string[], updated: string[], unchanged: string[], removed: string[], treeStats: Map}>} + * Object containing arrays of resource paths categorized by operation result, + * plus per-tree statistics showing which resource paths were added/updated/unchanged/removed in each tree */ async flush() { if (this.pendingUpserts.size === 0 && this.pendingRemovals.size === 0) { @@ -123,7 +124,8 @@ export default class TreeRegistry { added: [], updated: [], unchanged: [], - removed: [] + removed: [], + treeStats: new Map() }; } @@ -133,6 +135,12 @@ export default class TreeRegistry { const unchangedResources = []; const removedResources = []; + // Track per-tree statistics + const treeStats = new Map(); // tree -> {added: string[], updated: string[], unchanged: string[], removed: string[]} + for (const tree of this.trees) { + treeStats.set(tree, {added: [], updated: [], unchanged: [], removed: []}); + } + // Track which resource nodes we've already modified to handle shared nodes const modifiedNodes = new Set(); @@ -145,24 +153,33 @@ export default class TreeRegistry { const resourceName = parts[parts.length - 1]; const parentPath = parts.slice(0, -1).join(path.sep); + // Track which trees have this resource before deletion (for shared nodes) + const treesWithResource = []; for (const tree of this.trees) { const parentNode = tree._findNode(parentPath); - if (!parentNode || parentNode.type !== "directory") { - continue; + if (parentNode && parentNode.type === "directory" && parentNode.children.has(resourceName)) { + treesWithResource.push({tree, parentNode}); } + } - if (parentNode.children.has(resourceName)) { - parentNode.children.delete(resourceName); + // Perform deletion once and track for all trees that had it + if (treesWithResource.length > 0) { + const {parentNode} = treesWithResource[0]; + parentNode.children.delete(resourceName); + for (const {tree} of treesWithResource) { if (!affectedTrees.has(tree)) { affectedTrees.set(tree, new Set()); } this._markAncestorsAffected(tree, parts.slice(0, -1), affectedTrees); - if (!removedResources.includes(resourcePath)) { - removedResources.push(resourcePath); - } + // Track per-tree removal + treeStats.get(tree).removed.push(resourcePath); + } + + if (!removedResources.includes(resourcePath)) { + removedResources.push(resourcePath); } } } @@ -187,7 +204,8 @@ export default class TreeRegistry { // Ensure parent directory exists let parentNode = tree._findNode(parentPath); if (!parentNode) { - parentNode = this._ensureDirectoryPath(tree, parentPath.split(path.sep).filter((p) => p.length > 0)); + parentNode = this._ensureDirectoryPath( + tree, parentPath.split(path.sep).filter((p) => p.length > 0)); } if (parentNode.type !== "directory") { @@ -211,6 +229,9 @@ export default class TreeRegistry { modifiedNodes.add(resourceNode); dirModified = true; + // Track per-tree addition + treeStats.get(tree).added.push(upsert.fullPath); + if (!addedResources.includes(upsert.fullPath)) { addedResources.push(upsert.fullPath); } @@ -238,15 +259,24 @@ export default class TreeRegistry { modifiedNodes.add(resourceNode); dirModified = true; + // Track per-tree update + treeStats.get(tree).updated.push(upsert.fullPath); + if (!updatedResources.includes(upsert.fullPath)) { updatedResources.push(upsert.fullPath); } } else { + // Track per-tree unchanged + treeStats.get(tree).unchanged.push(upsert.fullPath); + if (!unchangedResources.includes(upsert.fullPath)) { unchangedResources.push(upsert.fullPath); } } } else { + // Node was already modified by another tree (shared node) + // Still count it as an update for this tree since the change affects it + treeStats.get(tree).updated.push(upsert.fullPath); dirModified = true; } } @@ -266,7 +296,8 @@ export default class TreeRegistry { } tree._computeHash(parentNode); - this._markAncestorsAffected(tree, parentPath.split(path.sep).filter((p) => p.length > 0), affectedTrees); + this._markAncestorsAffected( + tree, parentPath.split(path.sep).filter((p) => p.length > 0), affectedTrees); } } } @@ -297,7 +328,8 @@ export default class TreeRegistry { added: addedResources, updated: updatedResources, unchanged: unchangedResources, - removed: removedResources + removed: removedResources, + treeStats }; } diff --git a/packages/project/lib/build/cache/utils.js b/packages/project/lib/build/cache/utils.js index 6da9489eaed..3925660e357 100644 --- a/packages/project/lib/build/cache/utils.js +++ b/packages/project/lib/build/cache/utils.js @@ -105,6 +105,7 @@ export async function createResourceIndex(resources, includeInode = false) { integrity: await resource.getIntegrity(), lastModified: resource.getLastModified(), size: await resource.getSize(), + inode: await resource.getInode(), }; if (includeInode) { resourceMetadata.inode = resource.getInode(); diff --git a/packages/project/lib/build/definitions/application.js b/packages/project/lib/build/definitions/application.js index c546ee9d6bf..86873606872 100644 --- a/packages/project/lib/build/definitions/application.js +++ b/packages/project/lib/build/definitions/application.js @@ -20,6 +20,7 @@ export default function({project, taskUtil, getTask}) { }); tasks.set("replaceCopyright", { + supportsDifferentialUpdates: true, options: { copyright: project.getCopyright(), pattern: "/**/*.{js,json}" @@ -27,6 +28,7 @@ export default function({project, taskUtil, getTask}) { }); tasks.set("replaceVersion", { + supportsDifferentialUpdates: true, options: { version: project.getVersion(), pattern: "/**/*.{js,json}" @@ -42,6 +44,7 @@ export default function({project, taskUtil, getTask}) { } } tasks.set("minify", { + supportsDifferentialUpdates: true, options: { pattern: minificationPattern } diff --git a/packages/project/lib/build/definitions/component.js b/packages/project/lib/build/definitions/component.js index 48684b6df03..3fd7711855f 100644 --- a/packages/project/lib/build/definitions/component.js +++ b/packages/project/lib/build/definitions/component.js @@ -20,6 +20,7 @@ export default function({project, taskUtil, getTask}) { }); tasks.set("replaceCopyright", { + supportsDifferentialUpdates: true, options: { copyright: project.getCopyright(), pattern: "/**/*.{js,json}" @@ -27,6 +28,7 @@ export default function({project, taskUtil, getTask}) { }); tasks.set("replaceVersion", { + supportsDifferentialUpdates: true, options: { version: project.getVersion(), pattern: "/**/*.{js,json}" @@ -41,6 +43,7 @@ export default function({project, taskUtil, getTask}) { } tasks.set("minify", { + supportsDifferentialUpdates: true, options: { pattern: minificationPattern } diff --git a/packages/project/lib/build/definitions/library.js b/packages/project/lib/build/definitions/library.js index 9b92177d1cd..3f9b31ea5f2 100644 --- a/packages/project/lib/build/definitions/library.js +++ b/packages/project/lib/build/definitions/library.js @@ -20,6 +20,7 @@ export default function({project, taskUtil, getTask}) { }); tasks.set("replaceCopyright", { + supportsDifferentialUpdates: true, options: { copyright: project.getCopyright(), pattern: "/**/*.{js,library,css,less,theme,html}" @@ -27,6 +28,7 @@ export default function({project, taskUtil, getTask}) { }); tasks.set("replaceVersion", { + supportsDifferentialUpdates: true, options: { version: project.getVersion(), pattern: "/**/*.{js,json,library,css,less,theme,html}" @@ -34,6 +36,7 @@ export default function({project, taskUtil, getTask}) { }); tasks.set("replaceBuildtime", { + supportsDifferentialUpdates: true, options: { pattern: "/resources/sap/ui/{Global,core/Core}.js" } @@ -82,6 +85,7 @@ export default function({project, taskUtil, getTask}) { } tasks.set("minify", { + supportsDifferentialUpdates: true, options: { pattern: minificationPattern } diff --git a/packages/project/lib/build/definitions/themeLibrary.js b/packages/project/lib/build/definitions/themeLibrary.js index 2acf0392768..4b70d01b872 100644 --- a/packages/project/lib/build/definitions/themeLibrary.js +++ b/packages/project/lib/build/definitions/themeLibrary.js @@ -11,6 +11,7 @@ export default function({project, taskUtil, getTask}) { const tasks = new Map(); tasks.set("replaceCopyright", { + supportsDifferentialUpdates: true, options: { copyright: project.getCopyright(), pattern: "/resources/**/*.{less,theme}" @@ -18,6 +19,7 @@ export default function({project, taskUtil, getTask}) { }); tasks.set("replaceVersion", { + supportsDifferentialUpdates: true, options: { version: project.getVersion(), pattern: "/resources/**/*.{less,theme}" diff --git a/packages/project/lib/build/helpers/WatchHandler.js b/packages/project/lib/build/helpers/WatchHandler.js index 81e83a6d6f8..a33012f0aaa 100644 --- a/packages/project/lib/build/helpers/WatchHandler.js +++ b/packages/project/lib/build/helpers/WatchHandler.js @@ -104,15 +104,15 @@ class WatchHandler extends EventEmitter { } } - await graph.traverseDepthFirst(({project}) => { + await graph.traverseDepthFirst(async ({project}) => { if (!sourceChanges.has(project) && !dependencyChanges.has(project)) { return; } const projectSourceChanges = Array.from(sourceChanges.get(project) ?? new Set()); const projectDependencyChanges = Array.from(dependencyChanges.get(project) ?? new Set()); const projectBuildContext = this.#buildContext.getBuildContext(project.getName()); - const tasksInvalidated = - projectBuildContext.getBuildCache().resourceChanged(projectSourceChanges, projectDependencyChanges); + const tasksInvalidated = await projectBuildContext.getBuildCache() + .resourceChanged(projectSourceChanges, projectDependencyChanges); if (tasksInvalidated) { someProjectTasksInvalidated = true; diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index 239dc81bf0b..cbb0f206a53 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -462,19 +462,22 @@ class Project extends Specification { if (stageOrCacheReader instanceof Stage) { newStage = stageOrCacheReader; if (oldStage === newStage) { - // No change - return; + // Same stage as before + return false; // Stored stage has not changed } } else { newStage = new Stage(stageId, undefined, stageOrCacheReader); } this.#stages[stageIdx] = newStage; + + // Update current stage reference if necessary if (oldStage === this.#currentStage) { this.#currentStage = newStage; // Unset "current" reader/writer. They might be outdated this.#currentStageReaders = new Map(); this.#currentStageWorkspace = null; } + return true; // Indicate that the stored stage has changed } setResultStage(reader) { diff --git a/packages/project/lib/specifications/extensions/Task.js b/packages/project/lib/specifications/extensions/Task.js index dfb88fc83ec..e8cefcc7a94 100644 --- a/packages/project/lib/specifications/extensions/Task.js +++ b/packages/project/lib/specifications/extensions/Task.js @@ -38,6 +38,13 @@ class Task extends Extension { return (await this._getImplementation()).determineBuildSignature; } + /** + * @public + */ + async getDifferentialUpdateCallback() { + return (await this._getImplementation()).differentialUpdate; + } + /** * @public */ diff --git a/packages/project/test/lib/build/cache/index/TreeRegistry.js b/packages/project/test/lib/build/cache/index/TreeRegistry.js index 8d9e7d70480..9dcbb0fd6d6 100644 --- a/packages/project/test/lib/build/cache/index/TreeRegistry.js +++ b/packages/project/test/lib/build/cache/index/TreeRegistry.js @@ -410,9 +410,7 @@ test("upsertResources - with registry schedules operations", async (t) => { createMockResource("b.js", "hash-b", Date.now(), 1024, 1) ]); - t.deepEqual(result.scheduled, ["b.js"], "Should report scheduled paths"); - t.deepEqual(result.added, [], "Should have empty added in scheduled mode"); - t.deepEqual(result.updated, [], "Should have empty updated in scheduled mode"); + t.is(result, undefined, "Should return undefined in scheduled mode"); }); test("upsertResources - with registry and flush", async (t) => { @@ -466,8 +464,7 @@ test("removeResources - with registry schedules operations", async (t) => { const result = await tree.removeResources(["b.js"]); - t.deepEqual(result.scheduled, ["b.js"], "Should report scheduled paths"); - t.deepEqual(result.removed, [], "Should have empty removed in scheduled mode"); + t.is(result, undefined, "Should return undefined in scheduled mode"); }); test("removeResources - with registry and flush", async (t) => { @@ -565,3 +562,274 @@ test("upsertResources and removeResources - conflicting operations on same path" t.true(result.updated.includes("a.js") || result.changed.includes("a.js"), "Should update or keep a.js"); t.truthy(tree.hasPath("a.js"), "Tree should still have a.js"); }); + +// ============================================================================ +// Per-Tree Statistics Tests +// ============================================================================ + +test("TreeRegistry - flush returns per-tree statistics", async (t) => { + const registry = new TreeRegistry(); + const tree1 = new HashTree([{path: "a.js", integrity: "hash-a"}], {registry}); + const tree2 = new HashTree([{path: "b.js", integrity: "hash-b"}], {registry}); + + // Update tree1 resource + registry.scheduleUpdate(createMockResource("a.js", "new-hash-a", Date.now(), 1024, 1)); + // Add new resource - gets added to all trees + registry.scheduleUpsert(createMockResource("c.js", "hash-c", Date.now(), 2048, 2)); + + const result = await registry.flush(); + + // Verify global results + // a.js gets updated in tree1 but added to tree2 (didn't exist before) + t.true(result.updated.includes("a.js"), "Should report a.js as updated"); + t.true(result.added.includes("c.js"), "Should report c.js as added"); + t.true(result.added.includes("a.js"), "Should report a.js as added to tree2"); + + // Verify per-tree statistics + t.truthy(result.treeStats, "Should have treeStats"); + t.is(result.treeStats.size, 2, "Should have stats for both trees"); + + const stats1 = result.treeStats.get(tree1); + const stats2 = result.treeStats.get(tree2); + + t.truthy(stats1, "Should have stats for tree1"); + t.truthy(stats2, "Should have stats for tree2"); + + // Tree1: 1 update to a.js, 1 add for c.js + t.is(stats1.updated.length, 1, "Tree1 should have 1 update (a.js)"); + t.true(stats1.updated.includes("a.js"), "Tree1 should have a.js in updated"); + t.is(stats1.added.length, 1, "Tree1 should have 1 addition (c.js)"); + t.true(stats1.added.includes("c.js"), "Tree1 should have c.js in added"); + t.is(stats1.unchanged.length, 0, "Tree1 should have 0 unchanged"); + t.is(stats1.removed.length, 0, "Tree1 should have 0 removals"); + + // Tree2: 1 add for c.js, 1 add for a.js (didn't exist in tree2) + t.is(stats2.updated.length, 0, "Tree2 should have 0 updates"); + t.is(stats2.added.length, 2, "Tree2 should have 2 additions (a.js, c.js)"); + t.true(stats2.added.includes("a.js"), "Tree2 should have a.js in added"); + t.true(stats2.added.includes("c.js"), "Tree2 should have c.js in added"); + t.is(stats2.unchanged.length, 0, "Tree2 should have 0 unchanged"); + t.is(stats2.removed.length, 0, "Tree2 should have 0 removals"); +}); + +test("TreeRegistry - per-tree statistics with shared nodes", async (t) => { + const registry = new TreeRegistry(); + const tree1 = new HashTree([ + {path: "shared/a.js", integrity: "hash-a"}, + {path: "shared/b.js", integrity: "hash-b"} + ], {registry}); + const tree2 = tree1.deriveTree([{path: "unique/c.js", integrity: "hash-c"}]); + + // Verify trees share the "shared" directory + const sharedDir1 = tree1.root.children.get("shared"); + const sharedDir2 = tree2.root.children.get("shared"); + t.is(sharedDir1, sharedDir2, "Should share the same 'shared' directory node"); + + // Update shared resource + registry.scheduleUpdate(createMockResource("shared/a.js", "new-hash-a", Date.now(), 1024, 1)); + + const result = await registry.flush(); + + // Verify global results + t.deepEqual(result.updated, ["shared/a.js"], "Should report shared/a.js as updated"); + + // Verify per-tree statistics + const stats1 = result.treeStats.get(tree1); + const stats2 = result.treeStats.get(tree2); + + // Both trees should count the update since they share the node + t.is(stats1.updated.length, 1, "Tree1 should count the shared update"); + t.true(stats1.updated.includes("shared/a.js"), "Tree1 should have shared/a.js in updated"); + t.is(stats2.updated.length, 1, "Tree2 should count the shared update"); + t.true(stats2.updated.includes("shared/a.js"), "Tree2 should have shared/a.js in updated"); + t.is(stats1.added.length, 0, "Tree1 should have 0 additions"); + t.is(stats2.added.length, 0, "Tree2 should have 0 additions"); + t.is(stats1.unchanged.length, 0, "Tree1 should have 0 unchanged"); + t.is(stats2.unchanged.length, 0, "Tree2 should have 0 unchanged"); + t.is(stats1.removed.length, 0, "Tree1 should have 0 removals"); + t.is(stats2.removed.length, 0, "Tree2 should have 0 removals"); +}); + +test("TreeRegistry - per-tree statistics with mixed operations", async (t) => { + const registry = new TreeRegistry(); + const tree1 = new HashTree([ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"}, + {path: "c.js", integrity: "hash-c"} + ], {registry}); + const tree2 = tree1.deriveTree([{path: "d.js", integrity: "hash-d"}]); + + // Update a.js (affects both trees - shared) + registry.scheduleUpdate(createMockResource("a.js", "new-hash-a", Date.now(), 1024, 1)); + // Remove b.js (affects both trees - shared) + registry.scheduleRemoval("b.js"); + // Add e.js (affects both trees) + registry.scheduleUpsert(createMockResource("e.js", "hash-e", Date.now(), 2048, 5)); + // Update d.js (exists in tree2, will be added to tree1) + registry.scheduleUpdate(createMockResource("d.js", "new-hash-d", Date.now(), 1024, 4)); + + const result = await registry.flush(); + + // Verify per-tree statistics + const stats1 = result.treeStats.get(tree1); + const stats2 = result.treeStats.get(tree2); + + // Tree1: 1 update (a.js), 2 additions (e.js, d.js), 1 removal (b.js) + t.is(stats1.updated.length, 1, "Tree1 should have 1 update (a.js)"); + t.true(stats1.updated.includes("a.js"), "Tree1 should have a.js in updated"); + t.is(stats1.added.length, 2, "Tree1 should have 2 additions (e.js, d.js)"); + t.true(stats1.added.includes("e.js"), "Tree1 should have e.js in added"); + t.true(stats1.added.includes("d.js"), "Tree1 should have d.js in added"); + t.is(stats1.unchanged.length, 0, "Tree1 should have 0 unchanged"); + t.is(stats1.removed.length, 1, "Tree1 should have 1 removal (b.js)"); + t.true(stats1.removed.includes("b.js"), "Tree1 should have b.js in removed"); + + // Tree2: 2 updates (a.js shared, d.js), 1 addition (e.js), 1 removal (b.js shared) + t.is(stats2.updated.length, 2, "Tree2 should have 2 updates (a.js, d.js)"); + t.true(stats2.updated.includes("a.js"), "Tree2 should have a.js in updated"); + t.true(stats2.updated.includes("d.js"), "Tree2 should have d.js in updated"); + t.is(stats2.added.length, 1, "Tree2 should have 1 addition (e.js)"); + t.true(stats2.added.includes("e.js"), "Tree2 should have e.js in added"); + t.is(stats2.unchanged.length, 0, "Tree2 should have 0 unchanged"); + t.is(stats2.removed.length, 1, "Tree2 should have 1 removal (b.js)"); + t.true(stats2.removed.includes("b.js"), "Tree2 should have b.js in removed"); +}); + +test("TreeRegistry - per-tree statistics with no changes", async (t) => { + const registry = new TreeRegistry(); + const timestamp = Date.now(); + const tree1 = new HashTree([{ + path: "a.js", + integrity: "hash-a", + lastModified: timestamp, + size: 1024, + inode: 100 + }], {registry}); + const tree2 = new HashTree([{ + path: "b.js", + integrity: "hash-b", + lastModified: timestamp, + size: 2048, + inode: 200 + }], {registry}); + + // Schedule updates with unchanged metadata + // Note: These will add missing resources to the other tree + registry.scheduleUpdate(createMockResource("a.js", "hash-a", timestamp, 1024, 100)); + registry.scheduleUpdate(createMockResource("b.js", "hash-b", timestamp, 2048, 200)); + + const result = await registry.flush(); + + // a.js is unchanged in tree1 but added to tree2 + // b.js is unchanged in tree2 but added to tree1 + t.deepEqual(result.updated, [], "Should have no updates"); + t.true(result.added.includes("a.js"), "a.js should be added to tree2"); + t.true(result.added.includes("b.js"), "b.js should be added to tree1"); + t.true(result.unchanged.includes("a.js"), "a.js should be unchanged in tree1"); + t.true(result.unchanged.includes("b.js"), "b.js should be unchanged in tree2"); + + // Verify per-tree statistics + const stats1 = result.treeStats.get(tree1); + const stats2 = result.treeStats.get(tree2); + + // Tree1: a.js unchanged, b.js added + t.is(stats1.updated.length, 0, "Tree1 should have 0 updates"); + t.is(stats1.added.length, 1, "Tree1 should have 1 addition (b.js)"); + t.true(stats1.added.includes("b.js"), "Tree1 should have b.js in added"); + t.is(stats1.unchanged.length, 1, "Tree1 should have 1 unchanged (a.js)"); + t.true(stats1.unchanged.includes("a.js"), "Tree1 should have a.js in unchanged"); + t.is(stats1.removed.length, 0, "Tree1 should have 0 removals"); + + // Tree2: b.js unchanged, a.js added + t.is(stats2.updated.length, 0, "Tree2 should have 0 updates"); + t.is(stats2.added.length, 1, "Tree2 should have 1 addition (a.js)"); + t.true(stats2.added.includes("a.js"), "Tree2 should have a.js in added"); + t.is(stats2.unchanged.length, 1, "Tree2 should have 1 unchanged (b.js)"); + t.true(stats2.unchanged.includes("b.js"), "Tree2 should have b.js in unchanged"); + t.is(stats2.removed.length, 0, "Tree2 should have 0 removals"); +}); + +test("TreeRegistry - empty flush returns empty treeStats", async (t) => { + const registry = new TreeRegistry(); + new HashTree([{path: "a.js", integrity: "hash-a"}], {registry}); + new HashTree([{path: "b.js", integrity: "hash-b"}], {registry}); + + // Flush without scheduling any operations + const result = await registry.flush(); + + t.truthy(result.treeStats, "Should have treeStats"); + t.is(result.treeStats.size, 0, "Should have empty treeStats when no operations"); + t.deepEqual(result.added, [], "Should have no additions"); + t.deepEqual(result.updated, [], "Should have no updates"); + t.deepEqual(result.removed, [], "Should have no removals"); +}); + +test("TreeRegistry - derived tree reflects base tree resource changes in statistics", async (t) => { + const registry = new TreeRegistry(); + + // Create base tree with some resources + const baseTree = new HashTree([ + {path: "shared/resource1.js", integrity: "hash1"}, + {path: "shared/resource2.js", integrity: "hash2"} + ], {registry}); + + // Derive a new tree from base tree (shares same registry) + // Note: deriveTree doesn't schedule the new resources, it adds them directly to the derived tree + const derivedTree = baseTree.deriveTree([ + {path: "derived/resource3.js", integrity: "hash3"} + ]); + + // Verify both trees are registered + t.is(registry.getTreeCount(), 2, "Registry should have both trees"); + + // Verify they share the same nodes + const sharedDir1 = baseTree.root.children.get("shared"); + const sharedDir2 = derivedTree.root.children.get("shared"); + t.is(sharedDir1, sharedDir2, "Both trees should share the 'shared' directory node"); + + // Update a resource that exists in base tree (and is shared with derived tree) + registry.scheduleUpdate(createMockResource("shared/resource1.js", "new-hash1", Date.now(), 2048, 100)); + + // Add a new resource to the shared path + registry.scheduleUpsert(createMockResource("shared/resource4.js", "hash4", Date.now(), 1024, 200)); + + // Remove a shared resource + registry.scheduleRemoval("shared/resource2.js"); + + const result = await registry.flush(); + + // Verify global results + t.deepEqual(result.updated, ["shared/resource1.js"], "Should report resource1 as updated"); + t.true(result.added.includes("shared/resource4.js"), "Should report resource4 as added"); + t.deepEqual(result.removed, ["shared/resource2.js"], "Should report resource2 as removed"); + + // Verify per-tree statistics + const baseStats = result.treeStats.get(baseTree); + const derivedStats = result.treeStats.get(derivedTree); + + // Base tree statistics + // Base tree will also get derived/resource3.js added via registry (since it processes all trees) + t.is(baseStats.updated.length, 1, "Base tree should have 1 update"); + t.true(baseStats.updated.includes("shared/resource1.js"), "Base tree should have resource1 in updated"); + // baseStats.added should include both resource4 and resource3 + t.true(baseStats.added.includes("shared/resource4.js"), "Base tree should have resource4 in added"); + t.is(baseStats.removed.length, 1, "Base tree should have 1 removal"); + t.true(baseStats.removed.includes("shared/resource2.js"), "Base tree should have resource2 in removed"); + + // Derived tree statistics - CRITICAL: should reflect the same changes for shared resources + // Note: resource4 shows as "updated" because it's added to an already-existing shared node that was modified + t.is(derivedStats.updated.length, 2, "Derived tree should have 2 updates (resource1 changed, resource4 added to shared dir)"); + t.true(derivedStats.updated.includes("shared/resource1.js"), "Derived tree should have resource1 in updated"); + t.true(derivedStats.updated.includes("shared/resource4.js"), "Derived tree should have resource4 in updated"); + t.is(derivedStats.added.length, 0, "Derived tree should have 0 additions tracked separately"); + t.is(derivedStats.removed.length, 1, "Derived tree should have 1 removal (shared resource2)"); + t.true(derivedStats.removed.includes("shared/resource2.js"), "Derived tree should have resource2 in removed"); + + // Verify the actual tree state + t.is(baseTree.getResourceByPath("shared/resource1.js").integrity, "new-hash1", "Base tree should have updated integrity"); + t.is(derivedTree.getResourceByPath("shared/resource1.js").integrity, "new-hash1", "Derived tree should have updated integrity (shared node)"); + t.truthy(baseTree.hasPath("shared/resource4.js"), "Base tree should have new resource"); + t.truthy(derivedTree.hasPath("shared/resource4.js"), "Derived tree should have new resource (shared)"); + t.false(baseTree.hasPath("shared/resource2.js"), "Base tree should not have removed resource"); + t.false(derivedTree.hasPath("shared/resource2.js"), "Derived tree should not have removed resource (shared)"); +}); From 97ea3d7acaf438d9e1fc9644c5286d6a197c3bbd Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 7 Jan 2026 11:02:47 +0100 Subject: [PATCH 052/110] refactor(builder): Re-add cache handling in tasks This reverts commit 084bb393f580b0e03cb0515ffcdbd2a757f0c406. --- .../builder/lib/tasks/escapeNonAsciiCharacters.js | 9 +++++---- packages/builder/lib/tasks/minify.js | 12 +++++++++--- packages/builder/lib/tasks/replaceBuildtime.js | 12 +++++++++--- packages/builder/lib/tasks/replaceCopyright.js | 12 +++++++++--- packages/builder/lib/tasks/replaceVersion.js | 12 +++++++++--- 5 files changed, 41 insertions(+), 16 deletions(-) diff --git a/packages/builder/lib/tasks/escapeNonAsciiCharacters.js b/packages/builder/lib/tasks/escapeNonAsciiCharacters.js index 81d967c4012..697b2425080 100644 --- a/packages/builder/lib/tasks/escapeNonAsciiCharacters.js +++ b/packages/builder/lib/tasks/escapeNonAsciiCharacters.js @@ -14,20 +14,21 @@ import nonAsciiEscaper from "../processors/nonAsciiEscaper.js"; * * @param {object} parameters Parameters * @param {@ui5/fs/DuplexCollection} parameters.workspace DuplexCollection to read and write files - * @param {Array} parameters.invalidatedResources List of invalidated resource paths + * @param {string[]} [parameters.changedProjectResourcePaths] Set of changed resource paths within the project. + * This is only set if a cache is used and changes have been detected. * @param {object} parameters.options Options * @param {string} parameters.options.pattern Glob pattern to locate the files to be processed * @param {string} parameters.options.encoding source file encoding either "UTF-8" or "ISO-8859-1" * @returns {Promise} Promise resolving with undefined once data has been written */ -export default async function({workspace, invalidatedResources, options: {pattern, encoding}}) { +export default async function({workspace, changedProjectResourcePaths, options: {pattern, encoding}}) { if (!encoding) { throw new Error("[escapeNonAsciiCharacters] Mandatory option 'encoding' not provided"); } let allResources; - if (invalidatedResources) { - allResources = await Promise.all(invalidatedResources.map((resource) => workspace.byPath(resource))); + if (changedProjectResourcePaths) { + allResources = await Promise.all(changedProjectResourcePaths.map((resource) => workspace.byPath(resource))); } else { allResources = await workspace.byGlob(pattern); } diff --git a/packages/builder/lib/tasks/minify.js b/packages/builder/lib/tasks/minify.js index 069212db989..5fdccc8124f 100644 --- a/packages/builder/lib/tasks/minify.js +++ b/packages/builder/lib/tasks/minify.js @@ -16,7 +16,8 @@ import fsInterface from "@ui5/fs/fsInterface"; * @param {object} parameters Parameters * @param {@ui5/fs/DuplexCollection} parameters.workspace DuplexCollection to read and write files * @param {@ui5/project/build/helpers/TaskUtil|object} [parameters.taskUtil] TaskUtil - * @param {object} [parameters.cacheUtil] Cache utility instance + * @param {string[]} [parameters.changedProjectResourcePaths] Set of changed resource paths within the project. + * This is only set if a cache is used and changes have been detected. * @param {object} parameters.options Options * @param {string} parameters.options.pattern Pattern to locate the files to be processed * @param {boolean} [parameters.options.omitSourceMapResources=false] Whether source map resources shall @@ -27,10 +28,15 @@ import fsInterface from "@ui5/fs/fsInterface"; * @returns {Promise} Promise resolving with undefined once data has been written */ export default async function({ - workspace, taskUtil, cacheUtil, + workspace, taskUtil, changedProjectResourcePaths, options: {pattern, omitSourceMapResources = false, useInputSourceMaps = true} }) { - const resources = await workspace.byGlob(pattern); + let resources; + if (changedProjectResourcePaths) { + resources = await Promise.all(changedProjectResourcePaths.map((resource) => workspace.byPath(resource))); + } else { + resources = await workspace.byGlob(pattern); + } if (resources.length === 0) { return; } diff --git a/packages/builder/lib/tasks/replaceBuildtime.js b/packages/builder/lib/tasks/replaceBuildtime.js index 8cbe83b5713..44498a09186 100644 --- a/packages/builder/lib/tasks/replaceBuildtime.js +++ b/packages/builder/lib/tasks/replaceBuildtime.js @@ -28,13 +28,19 @@ function getTimestamp() { * * @param {object} parameters Parameters * @param {@ui5/fs/DuplexCollection} parameters.workspace DuplexCollection to read and write files - * @param {object} [parameters.cacheUtil] Cache utility instance + * @param {string[]} [parameters.changedProjectResourcePaths] Set of changed resource paths within the project. + * This is only set if a cache is used and changes have been detected. * @param {object} parameters.options Options * @param {string} parameters.options.pattern Pattern to locate the files to be processed * @returns {Promise} Promise resolving with undefined once data has been written */ -export default async function({workspace, cacheUtil, options: {pattern}}) { - const resources = await workspace.byGlob(pattern); +export default async function({workspace, changedProjectResourcePaths, options: {pattern}}) { + let resources; + if (changedProjectResourcePaths) { + resources = await Promise.all(changedProjectResourcePaths.map((resource) => workspace.byPath(resource))); + } else { + resources = await workspace.byGlob(pattern); + } const timestamp = getTimestamp(); const processedResources = await stringReplacer({ resources, diff --git a/packages/builder/lib/tasks/replaceCopyright.js b/packages/builder/lib/tasks/replaceCopyright.js index 103e43e3003..90daed02fd5 100644 --- a/packages/builder/lib/tasks/replaceCopyright.js +++ b/packages/builder/lib/tasks/replaceCopyright.js @@ -24,13 +24,14 @@ import stringReplacer from "../processors/stringReplacer.js"; * * @param {object} parameters Parameters * @param {@ui5/fs/DuplexCollection} parameters.workspace DuplexCollection to read and write files - * @param {object} [parameters.cacheUtil] Cache utility instance + * @param {string[]} [parameters.changedProjectResourcePaths] Set of changed resource paths within the project. + * This is only set if a cache is used and changes have been detected. * @param {object} parameters.options Options * @param {string} parameters.options.copyright Replacement copyright * @param {string} parameters.options.pattern Pattern to locate the files to be processed * @returns {Promise} Promise resolving with undefined once data has been written */ -export default async function({workspace, cacheUtil, options: {copyright, pattern}}) { +export default async function({workspace, changedProjectResourcePaths, options: {copyright, pattern}}) { if (!copyright) { return; } @@ -38,7 +39,12 @@ export default async function({workspace, cacheUtil, options: {copyright, patter // Replace optional placeholder ${currentYear} with the current year copyright = copyright.replace(/(?:\$\{currentYear\})/, new Date().getFullYear()); - const resources = await workspace.byGlob(pattern); + let resources; + if (changedProjectResourcePaths) { + resources = await Promise.all(changedProjectResourcePaths.map((resource) => workspace.byPath(resource))); + } else { + resources = await workspace.byGlob(pattern); + } const processedResources = await stringReplacer({ resources, diff --git a/packages/builder/lib/tasks/replaceVersion.js b/packages/builder/lib/tasks/replaceVersion.js index b1cd2eb1d16..d30b0839dc6 100644 --- a/packages/builder/lib/tasks/replaceVersion.js +++ b/packages/builder/lib/tasks/replaceVersion.js @@ -14,14 +14,20 @@ import stringReplacer from "../processors/stringReplacer.js"; * * @param {object} parameters Parameters * @param {@ui5/fs/DuplexCollection} parameters.workspace DuplexCollection to read and write files - * @param {object} parameters.cacheUtil Cache utility instance + * @param {string[]} [parameters.changedProjectResourcePaths] Set of changed resource paths within the project. + * This is only set if a cache is used and changes have been detected. * @param {object} parameters.options Options * @param {string} parameters.options.pattern Pattern to locate the files to be processed * @param {string} parameters.options.version Replacement version * @returns {Promise} Promise resolving with undefined once data has been written */ -export default async function({workspace, cacheUtil, options: {pattern, version}}) { - const resources = await workspace.byGlob(pattern); +export default async function({workspace, changedProjectResourcePaths, options: {pattern, version}}) { + let resources; + if (changedProjectResourcePaths) { + resources = await Promise.all(changedProjectResourcePaths.map((resource) => workspace.byPath(resource))); + } else { + resources = await workspace.byGlob(pattern); + } const processedResources = await stringReplacer({ resources, options: { From 0042996418e04e81eec22767b971cbc7e54a2c72 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 7 Jan 2026 13:24:29 +0100 Subject: [PATCH 053/110] refactor(project): Cleanup HashTree implementation --- .../project/lib/build/cache/index/HashTree.js | 166 ++---------------- .../lib/build/cache/index/ResourceIndex.js | 14 -- .../lib/build/cache/index/TreeRegistry.js | 7 +- .../test/lib/build/cache/ProjectBuildCache.js | 18 +- .../lib/build/cache/ResourceRequestGraph.js | 4 +- .../test/lib/build/cache/index/HashTree.js | 58 +++--- .../lib/build/cache/index/TreeRegistry.js | 9 +- 7 files changed, 60 insertions(+), 216 deletions(-) diff --git a/packages/project/lib/build/cache/index/HashTree.js b/packages/project/lib/build/cache/index/HashTree.js index 6fcd6fd477d..fcb73b83232 100644 --- a/packages/project/lib/build/cache/index/HashTree.js +++ b/packages/project/lib/build/cache/index/HashTree.js @@ -136,9 +136,9 @@ export default class HashTree { * @param {Array|null} resources * Initial resources to populate the tree. Each resource should have a path and optional metadata. * @param {object} options - * @param {TreeRegistry} [options.registry] - Optional registry for coordinated batch updates across multiple trees - * @param {number} [options.indexTimestamp] - Timestamp when the resource index was created (for metadata comparison) - * @param {TreeNode} [options._root] - Internal: pre-existing root node for derived trees (enables structural sharing) + * @param {TreeRegistry} [options.registry] Optional registry for coordinated batch updates across multiple trees + * @param {number} [options.indexTimestamp] Timestamp when the resource index was created (for metadata comparison) + * @param {TreeNode} [options._root] Internal: pre-existing root node for derived trees (enables structural sharing) */ constructor(resources = null, options = {}) { this.registry = options.registry || null; @@ -242,7 +242,6 @@ export default class HashTree { // Phase 2: Copy path from root down (copy-on-write) // Only copy directories that will have their children modified current = this.root; - let needsNewChild = false; for (let i = 0; i < parts.length - 1; i++) { const dirName = parts[i]; @@ -252,7 +251,6 @@ export default class HashTree { const newDir = new TreeNode(dirName, "directory"); current.children.set(dirName, newDir); current = newDir; - needsNewChild = true; } else if (i === parts.length - 2) { // This is the parent directory that will get the new resource // Copy it to avoid modifying shared structure @@ -403,6 +401,10 @@ export default class HashTree { return this.#indexTimestamp; } + _updateIndexTimestamp() { + this.#indexTimestamp = Date.now(); + } + /** * Find a node by path * @@ -453,89 +455,6 @@ export default class HashTree { return derived; } - /** - * Update a single resource and recompute affected hashes. - * - * When a registry is attached, schedules the update for batch processing. - * Otherwise, applies the update immediately and recomputes ancestor hashes. - * Skips update if resource metadata hasn't changed (optimization). - * - * @param {@ui5/fs/Resource} resource - Resource instance to update - * @returns {Promise>} Array containing the resource path if changed, empty array if unchanged - */ - async updateResource(resource) { - const resourcePath = resource.getOriginalPath(); - - // If registry is attached, schedule update instead of applying immediately - if (this.registry) { - this.registry.scheduleUpdate(resource); - return [resourcePath]; // Will be determined after flush - } - - // Fall back to immediate update - const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); - - if (parts.length === 0) { - throw new Error("Cannot update root directory"); - } - - // Navigate to parent directory - let current = this.root; - const pathToRoot = [current]; - - for (let i = 0; i < parts.length - 1; i++) { - const dirName = parts[i]; - - if (!current.children.has(dirName)) { - throw new Error(`Directory not found: ${parts.slice(0, i + 1).join("/")}`); - } - - current = current.children.get(dirName); - pathToRoot.push(current); - } - - // Update the resource - const resourceName = parts[parts.length - 1]; - const resourceNode = current.children.get(resourceName); - - if (!resourceNode) { - throw new Error(`Resource not found: ${resourcePath}`); - } - - if (resourceNode.type !== "resource") { - throw new Error(`Path is not a resource: ${resourcePath}`); - } - - // Create metadata object from current node state - const currentMetadata = { - integrity: resourceNode.integrity, - lastModified: resourceNode.lastModified, - size: resourceNode.size, - inode: resourceNode.inode - }; - - // Check whether resource actually changed - const isUnchanged = await matchResourceMetadataStrict(resource, currentMetadata, this.#indexTimestamp); - if (isUnchanged) { - return []; // No change - } - - // Update resource metadata - resourceNode.integrity = await resource.getIntegrity(); - resourceNode.lastModified = resource.getLastModified(); - resourceNode.size = await resource.getSize(); - resourceNode.inode = resource.getInode(); - - // Recompute hashes from resource up to root - this._computeHash(resourceNode); - - for (let i = pathToRoot.length - 1; i >= 0; i--) { - this._computeHash(pathToRoot[i]); - } - - return [resourcePath]; - } - /** * Update multiple resources efficiently. * @@ -613,6 +532,7 @@ export default class HashTree { } } + this._updateIndexTimestamp(); return changedResources; } @@ -721,6 +641,7 @@ export default class HashTree { } } + this._updateIndexTimestamp(); return {added, updated, unchanged}; } @@ -808,6 +729,7 @@ export default class HashTree { } } + this._updateIndexTimestamp(); return {removed, notFound}; } @@ -867,71 +789,6 @@ export default class HashTree { return currentHash !== previousHash; } - /** - * Get all resources in a directory (non-recursive). - * - * Useful for inspecting directory contents or performing directory-level operations. - * - * @param {string} dirPath - Path to directory - * @returns {Array<{name: string, path: string, type: string, hash: string}>} Array of directory entries sorted by name - * @throws {Error} If directory not found or path is not a directory - */ - listDirectory(dirPath) { - const node = this._findNode(dirPath); - if (!node) { - throw new Error(`Directory not found: ${dirPath}`); - } - if (node.type !== "directory") { - throw new Error(`Path is not a directory: ${dirPath}`); - } - - const items = []; - for (const [name, child] of node.children) { - items.push({ - name, - path: path.join(dirPath, name), - type: child.type, - hash: child.hash.toString("hex") - }); - } - - return items.sort((a, b) => a.name.localeCompare(b.name)); - } - - /** - * Get all resources recursively. - * - * Returns complete resource metadata including paths, integrity hashes, and file stats. - * Useful for full tree inspection or export. - * - * @returns {Array<{path: string, integrity?: string, hash: string, lastModified?: number, size?: number, inode?: number}>} - * Array of all resources with metadata, sorted by path - */ - getAllResources() { - const resources = []; - - const traverse = (node, currentPath) => { - if (node.type === "resource") { - resources.push({ - path: currentPath, - integrity: node.integrity, - hash: node.hash.toString("hex"), - lastModified: node.lastModified, - size: node.size, - inode: node.inode - }); - } else { - for (const [name, child] of node.children) { - const childPath = currentPath ? path.join(currentPath, name) : name; - traverse(child, childPath); - } - } - }; - - traverse(this.root, "/"); - return resources.sort((a, b) => a.path.localeCompare(b.path)); - } - /** * Get tree statistics. * @@ -1001,6 +858,8 @@ export default class HashTree { /** * Validate tree structure and hashes * + * Currently unused, but possibly useful future integrity checks. + * * @returns {boolean} */ validate() { @@ -1035,6 +894,7 @@ export default class HashTree { return true; } + /** * Create a deep clone of this tree. * diff --git a/packages/project/lib/build/cache/index/ResourceIndex.js b/packages/project/lib/build/cache/index/ResourceIndex.js index e318f683a67..6256958d655 100644 --- a/packages/project/lib/build/cache/index/ResourceIndex.js +++ b/packages/project/lib/build/cache/index/ResourceIndex.js @@ -237,18 +237,4 @@ export default class ResourceIndex { indexTree: this.#tree.toCacheObject(), }; } - - // #getResourceMetadata() { - // const resources = this.#tree.getAllResources(); - // const resourceMetadata = Object.create(null); - // for (const resource of resources) { - // resourceMetadata[resource.path] = { - // lastModified: resource.lastModified, - // size: resource.size, - // integrity: resource.integrity, - // inode: resource.inode, - // }; - // } - // return resourceMetadata; - // } } diff --git a/packages/project/lib/build/cache/index/TreeRegistry.js b/packages/project/lib/build/cache/index/TreeRegistry.js index dd2cfe058da..1831d5753e0 100644 --- a/packages/project/lib/build/cache/index/TreeRegistry.js +++ b/packages/project/lib/build/cache/index/TreeRegistry.js @@ -114,7 +114,9 @@ export default class TreeRegistry { * * After successful completion, all pending operations are cleared. * - * @returns {Promise<{added: string[], updated: string[], unchanged: string[], removed: string[], treeStats: Map}>} + * @returns {Promise<{added: string[], updated: string[], unchanged: string[], removed: string[], + * treeStats: Map}>} * Object containing arrays of resource paths categorized by operation result, * plus per-tree statistics showing which resource paths were added/updated/unchanged/removed in each tree */ @@ -136,7 +138,7 @@ export default class TreeRegistry { const removedResources = []; // Track per-tree statistics - const treeStats = new Map(); // tree -> {added: string[], updated: string[], unchanged: string[], removed: string[]} + const treeStats = new Map(); for (const tree of this.trees) { treeStats.set(tree, {added: [], updated: [], unchanged: [], removed: []}); } @@ -318,6 +320,7 @@ export default class TreeRegistry { tree._computeHash(node); } } + tree._updateIndexTimestamp(); } // Clear all pending operations diff --git a/packages/project/test/lib/build/cache/ProjectBuildCache.js b/packages/project/test/lib/build/cache/ProjectBuildCache.js index ccc5989da35..83527bb4c15 100644 --- a/packages/project/test/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/test/lib/build/cache/ProjectBuildCache.js @@ -270,14 +270,16 @@ test("recordTaskResult: removes task from invalidated list", async (t) => { await cache.prepareTaskExecution("task1", false); // Record initial result - await cache.recordTaskResult("task1", new Set(), {paths: new Set(), patterns: new Set()}, {paths: new Set(), patterns: new Set()}); + await cache.recordTaskResult("task1", new Set(), + {paths: new Set(), patterns: new Set()}, {paths: new Set(), patterns: new Set()}); // Invalidate task cache.resourceChanged(["/test.js"], []); // Re-execute and record await cache.prepareTaskExecution("task1", false); - await cache.recordTaskResult("task1", new Set(), {paths: new Set(), patterns: new Set()}, {paths: new Set(), patterns: new Set()}); + await cache.recordTaskResult("task1", new Set(), + {paths: new Set(), patterns: new Set()}, {paths: new Set(), patterns: new Set()}); t.deepEqual(cache.getInvalidatedTaskNames(), [], "No invalidated tasks after re-execution"); }); @@ -494,18 +496,6 @@ test("Throw error on build signature mismatch", async (t) => { "Throws error on signature mismatch" ); }); - -// ===== HELPER FUNCTION TESTS ===== - -test("firstTruthy: returns first truthy value from promises", async (t) => { - const {default: ProjectBuildCacheModule} = await import("../../../../lib/build/cache/ProjectBuildCache.js"); - - // Access the firstTruthy function through dynamic evaluation - // Since it's not exported, we test it indirectly through the module's behavior - // This test verifies the behavior exists without direct access - t.pass("firstTruthy is used internally for cache lookups"); -}); - // ===== EDGE CASES ===== test("Create cache with empty project name", async (t) => { diff --git a/packages/project/test/lib/build/cache/ResourceRequestGraph.js b/packages/project/test/lib/build/cache/ResourceRequestGraph.js index 6d99af2f660..2a410cc7567 100644 --- a/packages/project/test/lib/build/cache/ResourceRequestGraph.js +++ b/packages/project/test/lib/build/cache/ResourceRequestGraph.js @@ -178,7 +178,7 @@ test("ResourceRequestGraph: getMaterializedRequests returns full set", (t) => { new Request("path", "a.js"), new Request("path", "b.js") ]; - const node1 = graph.addRequestSet(set1); + graph.addRequestSet(set1); const set2 = [ new Request("path", "a.js"), @@ -545,7 +545,7 @@ test("ResourceRequestGraph: findBestParent chooses optimal parent", (t) => { new Request("path", "a.js"), new Request("path", "b.js") ]; - const node1 = graph.addRequestSet(set1); + graph.addRequestSet(set1); const set2 = [ new Request("path", "x.js"), diff --git a/packages/project/test/lib/build/cache/index/HashTree.js b/packages/project/test/lib/build/cache/index/HashTree.js index 75fc57efaa7..8b524b50fed 100644 --- a/packages/project/test/lib/build/cache/index/HashTree.js +++ b/packages/project/test/lib/build/cache/index/HashTree.js @@ -69,8 +69,8 @@ test("Updating resources in two trees produces same root hash", async (t) => { // Update same resource in both trees const resource = createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1); - await tree1.updateResource(resource); - await tree2.updateResource(resource); + await tree1.updateResources([resource]); + await tree2.updateResources([resource]); t.is(tree1.getRootHash(), tree2.getRootHash(), "Trees should have same root hash after identical updates"); @@ -89,13 +89,13 @@ test("Multiple updates in same order produce same root hash", async (t) => { const indexTimestamp = tree1.getIndexTimestamp(); // Update multiple resources in same order - await tree1.updateResource(createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)); - await tree1.updateResource(createMockResource("dir/d.js", "new-hash-d", indexTimestamp + 1, 401, 4)); - await tree1.updateResource(createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)); + await tree1.updateResources([createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)]); + await tree1.updateResources([createMockResource("dir/d.js", "new-hash-d", indexTimestamp + 1, 401, 4)]); + await tree1.updateResources([createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)]); - await tree2.updateResource(createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)); - await tree2.updateResource(createMockResource("dir/d.js", "new-hash-d", indexTimestamp + 1, 401, 4)); - await tree2.updateResource(createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)); + await tree2.updateResources([createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)]); + await tree2.updateResources([createMockResource("dir/d.js", "new-hash-d", indexTimestamp + 1, 401, 4)]); + await tree2.updateResources([createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)]); t.is(tree1.getRootHash(), tree2.getRootHash(), "Trees should have same root hash after same sequence of updates"); @@ -113,13 +113,13 @@ test("Multiple updates in different order produce same root hash", async (t) => const indexTimestamp = tree1.getIndexTimestamp(); // Update in different orders - await tree1.updateResource(createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)); - await tree1.updateResource(createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)); - await tree1.updateResource(createMockResource("c.js", "new-hash-c", indexTimestamp + 1, 301, 3)); + await tree1.updateResources([createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)]); + await tree1.updateResources([createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)]); + await tree1.updateResources([createMockResource("c.js", "new-hash-c", indexTimestamp + 1, 301, 3)]); - await tree2.updateResource(createMockResource("c.js", "new-hash-c", indexTimestamp + 1, 301, 3)); - await tree2.updateResource(createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)); - await tree2.updateResource(createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)); + await tree2.updateResources([createMockResource("c.js", "new-hash-c", indexTimestamp + 1, 301, 3)]); + await tree2.updateResources([createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)]); + await tree2.updateResources([createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)]); t.is(tree1.getRootHash(), tree2.getRootHash(), "Trees should have same root hash regardless of update order"); @@ -137,8 +137,8 @@ test("Batch updates produce same hash as individual updates", async (t) => { const indexTimestamp = tree1.getIndexTimestamp(); // Individual updates - await tree1.updateResource(createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)); - await tree1.updateResource(createMockResource("file2.js", "new-hash2", indexTimestamp + 1, 201, 2)); + await tree1.updateResources([createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)]); + await tree1.updateResources([createMockResource("file2.js", "new-hash2", indexTimestamp + 1, 201, 2)]); // Batch update const resources = [ @@ -161,7 +161,7 @@ test("Updating resource changes root hash", async (t) => { const originalHash = tree.getRootHash(); const indexTimestamp = tree.getIndexTimestamp(); - await tree.updateResource(createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)); + await tree.updateResources([createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)]); const newHash = tree.getRootHash(); t.not(originalHash, newHash, @@ -179,8 +179,8 @@ test("Updating resource back to original value restores original hash", async (t const indexTimestamp = tree.getIndexTimestamp(); // Update and then revert - await tree.updateResource(createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)); - await tree.updateResource(createMockResource("file1.js", "hash1", 1000, 100, 1)); + await tree.updateResources([createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)]); + await tree.updateResources([createMockResource("file1.js", "hash1", 1000, 100, 1)]); t.is(tree.getRootHash(), originalHash, "Root hash should be restored when resource is reverted to original value"); @@ -193,7 +193,9 @@ test("updateResource returns changed resource path", async (t) => { const tree = new HashTree(resources); const indexTimestamp = tree.getIndexTimestamp(); - const changed = await tree.updateResource(createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)); + const changed = await tree.updateResources([ + createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1) + ]); t.deepEqual(changed, ["file1.js"], "Should return path of changed resource"); }); @@ -204,7 +206,7 @@ test("updateResource returns empty array when integrity unchanged", async (t) => ]; const tree = new HashTree(resources); - const changed = await tree.updateResource(createMockResource("file1.js", "hash1", 1000, 100, 1)); + const changed = await tree.updateResources([createMockResource("file1.js", "hash1", 1000, 100, 1)]); t.deepEqual(changed, [], "Should return empty array when integrity unchanged"); }); @@ -216,7 +218,7 @@ test("updateResource does not change hash when integrity unchanged", async (t) = const tree = new HashTree(resources); const originalHash = tree.getRootHash(); - await tree.updateResource(createMockResource("file1.js", "hash1", 1000, 100, 1)); + await tree.updateResources([createMockResource("file1.js", "hash1", 1000, 100, 1)]); t.is(tree.getRootHash(), originalHash, "Hash should not change when integrity unchanged"); }); @@ -284,12 +286,12 @@ test("Updating unrelated resource doesn't affect consistency", async (t) => { const tree2 = new HashTree(initialResources); // Update different resources - await tree1.updateResource(createMockResource("file1.js", "new-hash1", Date.now(), 1024, 789)); - await tree2.updateResource(createMockResource("file1.js", "new-hash1", Date.now(), 1024, 789)); + await tree1.updateResources([createMockResource("file1.js", "new-hash1", Date.now(), 1024, 789)]); + await tree2.updateResources([createMockResource("file1.js", "new-hash1", Date.now(), 1024, 789)]); // Update an unrelated resource in both - await tree1.updateResource(createMockResource("dir/file3.js", "new-hash3", Date.now(), 2048, 790)); - await tree2.updateResource(createMockResource("dir/file3.js", "new-hash3", Date.now(), 2048, 790)); + await tree1.updateResources([createMockResource("dir/file3.js", "new-hash3", Date.now(), 2048, 790)]); + await tree2.updateResources([createMockResource("dir/file3.js", "new-hash3", Date.now(), 2048, 790)]); t.is(tree1.getRootHash(), tree2.getRootHash(), "Trees should remain consistent after updating multiple resources"); @@ -534,9 +536,9 @@ test("deriveTree - changes propagate to derived trees (shared view)", async (t) // When tree1 is updated, tree2 sees the change (filtered view behavior) const indexTimestamp = tree1.getIndexTimestamp(); - await tree1.updateResource( + await tree1.updateResources([ createMockResource("shared/a.js", "new-hash-a", indexTimestamp + 1, 101, 1) - ); + ]); // Both trees see the update as per design const node1 = tree1.root.children.get("shared").children.get("a.js"); diff --git a/packages/project/test/lib/build/cache/index/TreeRegistry.js b/packages/project/test/lib/build/cache/index/TreeRegistry.js index 9dcbb0fd6d6..455c863ffa5 100644 --- a/packages/project/test/lib/build/cache/index/TreeRegistry.js +++ b/packages/project/test/lib/build/cache/index/TreeRegistry.js @@ -818,7 +818,8 @@ test("TreeRegistry - derived tree reflects base tree resource changes in statist // Derived tree statistics - CRITICAL: should reflect the same changes for shared resources // Note: resource4 shows as "updated" because it's added to an already-existing shared node that was modified - t.is(derivedStats.updated.length, 2, "Derived tree should have 2 updates (resource1 changed, resource4 added to shared dir)"); + t.is(derivedStats.updated.length, 2, + "Derived tree should have 2 updates (resource1 changed, resource4 added to shared dir)"); t.true(derivedStats.updated.includes("shared/resource1.js"), "Derived tree should have resource1 in updated"); t.true(derivedStats.updated.includes("shared/resource4.js"), "Derived tree should have resource4 in updated"); t.is(derivedStats.added.length, 0, "Derived tree should have 0 additions tracked separately"); @@ -826,8 +827,10 @@ test("TreeRegistry - derived tree reflects base tree resource changes in statist t.true(derivedStats.removed.includes("shared/resource2.js"), "Derived tree should have resource2 in removed"); // Verify the actual tree state - t.is(baseTree.getResourceByPath("shared/resource1.js").integrity, "new-hash1", "Base tree should have updated integrity"); - t.is(derivedTree.getResourceByPath("shared/resource1.js").integrity, "new-hash1", "Derived tree should have updated integrity (shared node)"); + t.is(baseTree.getResourceByPath("shared/resource1.js").integrity, "new-hash1", + "Base tree should have updated integrity"); + t.is(derivedTree.getResourceByPath("shared/resource1.js").integrity, "new-hash1", + "Derived tree should have updated integrity (shared node)"); t.truthy(baseTree.hasPath("shared/resource4.js"), "Base tree should have new resource"); t.truthy(derivedTree.hasPath("shared/resource4.js"), "Derived tree should have new resource (shared)"); t.false(baseTree.hasPath("shared/resource2.js"), "Base tree should not have removed resource"); From 9a0d9d32587f2c7c4f419dd54b74a3fea06c8ac8 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 7 Jan 2026 14:03:15 +0100 Subject: [PATCH 054/110] refactor(project): Make WatchHandler wait for build to finish before triggering again --- .../project/lib/build/helpers/WatchHandler.js | 31 +++++++++++++++---- 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/packages/project/lib/build/helpers/WatchHandler.js b/packages/project/lib/build/helpers/WatchHandler.js index a33012f0aaa..726d8b48c55 100644 --- a/packages/project/lib/build/helpers/WatchHandler.js +++ b/packages/project/lib/build/helpers/WatchHandler.js @@ -15,6 +15,7 @@ class WatchHandler extends EventEmitter { #updateBuildResult; #abortControllers = []; #sourceChanges = new Map(); + #updateInProgress = false; #fileChangeHandlerTimeout; constructor(buildContext, updateBuildResult) { @@ -64,7 +65,7 @@ class WatchHandler extends EventEmitter { } } - async #fileChanged(project, filePath) { + #fileChanged(project, filePath) { // Collect changes (grouped by project), then trigger callbacks const resourcePath = project.getVirtualPath(filePath); if (!this.#sourceChanges.has(project)) { @@ -72,20 +73,38 @@ class WatchHandler extends EventEmitter { } this.#sourceChanges.get(project).add(resourcePath); + this.#queueHandleResourceChanges(); + } + + #queueHandleResourceChanges() { + if (this.#updateInProgress) { + // Prevent concurrent updates + return; + } + // Trigger callbacks debounced if (this.#fileChangeHandlerTimeout) { clearTimeout(this.#fileChangeHandlerTimeout); } this.#fileChangeHandlerTimeout = setTimeout(async () => { - await this.#handleResourceChanges(); this.#fileChangeHandlerTimeout = null; + + const sourceChanges = this.#sourceChanges; + // Reset file changes before processing + this.#sourceChanges = new Map(); + + this.#updateInProgress = true; + await this.#handleResourceChanges(sourceChanges); + this.#updateInProgress = false; + + if (this.#sourceChanges.size > 0) { + // New changes have occurred during processing, trigger queue again + this.#queueHandleResourceChanges(); + } }, 100); } - async #handleResourceChanges() { - // Reset file changes before processing - const sourceChanges = this.#sourceChanges; - this.#sourceChanges = new Map(); + async #handleResourceChanges(sourceChanges) { const dependencyChanges = new Map(); let someProjectTasksInvalidated = false; From 51b6363925f6d2241d60fc4836c605b021bb765d Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 7 Jan 2026 14:42:27 +0100 Subject: [PATCH 055/110] refactor(project): Use cleanup hooks in update builds --- packages/project/lib/build/ProjectBuilder.js | 62 +++++++++++++------ packages/project/lib/build/TaskRunner.js | 8 +-- .../project/lib/build/cache/CacheManager.js | 20 ++++-- 3 files changed, 61 insertions(+), 29 deletions(-) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 8de36819e61..a94d87a262e 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -181,7 +181,6 @@ class ProjectBuilder { } const projectBuildContexts = await this._createRequiredBuildContexts(requestedProjects); - const cleanupSigHooks = this._registerCleanupSigHooks(); let fsTarget; if (destPath) { fsTarget = resourceFactory.createAdapter({ @@ -191,7 +190,6 @@ class ProjectBuilder { } const queue = []; - const alreadyBuilt = []; // Create build queue based on graph depth-first search to ensure correct build order await this._graph.traverseDepthFirst(async ({project}) => { @@ -202,15 +200,38 @@ class ProjectBuilder { // => This project needs to be built or, in case it has already // been built, it's build result needs to be written out (if requested) queue.push(projectBuildContext); - if (!await projectBuildContext.requiresBuild()) { - alreadyBuilt.push(projectName); - } } }); + if (destPath && cleanDest) { + this.#log.info(`Cleaning target directory...`); + await rmrf(destPath); + } + + await this.#build(queue, projectBuildContexts, requestedProjects, fsTarget); + + if (watch) { + const relevantProjects = queue.map((projectBuildContext) => { + return projectBuildContext.getProject(); + }); + return this._buildContext.initWatchHandler(relevantProjects, async () => { + await this.#updateBuild(projectBuildContexts, requestedProjects, fsTarget); + }); + } + } + + async #build(queue, projectBuildContexts, requestedProjects, fsTarget) { this.#log.setProjects(queue.map((projectBuildContext) => { return projectBuildContext.getProject().getName(); })); + + const alreadyBuilt = []; + for (const projectBuildContext of queue) { + if (!await projectBuildContext.requiresBuild()) { + const projectName = projectBuildContext.getProject().getName(); + alreadyBuilt.push(projectName); + } + } if (queue.length > 1) { // Do not log if only the root project is being built this.#log.info(`Processing ${queue.length} projects`); if (alreadyBuilt.length) { @@ -240,13 +261,9 @@ class ProjectBuilder { .join("\n ")}`); } } - - if (destPath && cleanDest) { - this.#log.info(`Cleaning target directory...`); - await rmrf(destPath); - } - const startTime = process.hrtime(); + const cleanupSigHooks = this._registerCleanupSigHooks(); try { + const startTime = process.hrtime(); const pWrites = []; for (const projectBuildContext of queue) { const project = projectBuildContext.getProject(); @@ -285,21 +302,26 @@ class ProjectBuilder { await Promise.all(pWrites); this.#log.info(`Build succeeded in ${this._getElapsedTime(startTime)}`); } catch (err) { - this.#log.error(`Build failed in ${this._getElapsedTime(startTime)}`); + this.#log.error(`Build failed`); throw err; } finally { this._deregisterCleanupSigHooks(cleanupSigHooks); await this._executeCleanupTasks(); } + } - if (watch) { - const relevantProjects = queue.map((projectBuildContext) => { - return projectBuildContext.getProject(); - }); - const watchHandler = this._buildContext.initWatchHandler(relevantProjects, async () => { - await this.#update(projectBuildContexts, requestedProjects, fsTarget); - }); - return watchHandler; + async #updateBuild(projectBuildContexts, requestedProjects, fsTarget) { + const cleanupSigHooks = this._registerCleanupSigHooks(); + try { + const startTime = process.hrtime(); + await this.#update(projectBuildContexts, requestedProjects, fsTarget); + this.#log.info(`Update succeeded in ${this._getElapsedTime(startTime)}`); + } catch (err) { + this.#log.error(`Update failed`); + this.#log.error(err); + } finally { + this._deregisterCleanupSigHooks(cleanupSigHooks); + await this._executeCleanupTasks(); } } diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index b23a80dd2dd..ea64c1643a4 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -205,8 +205,9 @@ class TaskRunner { } const usingCache = supportsDifferentialUpdates && cacheInfo; - this._log.info( - `Executing task ${taskName} for project ${this._project.getName()}`); + this._log.verbose( + `Executing task ${taskName} for project ${this._project.getName()}` + + (usingCache ? ` (using differential update)` : "")); const workspace = createMonitor(this._project.getWorkspace()); const params = { workspace, @@ -220,9 +221,6 @@ class TaskRunner { params.dependencies = dependencies; } if (usingCache) { - this._log.info( - `Using differential update for task ${taskName} of project ${this._project.getName()}`); - // workspace = params.changedProjectResourcePaths = Array.from(cacheInfo.changedProjectResourcePaths); if (requiresDependencies) { params.changedDependencyResourcePaths = Array.from(cacheInfo.changedDependencyResourcePaths); diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index 72fa6f17a3c..8499938e981 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -129,7 +129,10 @@ export default class CacheManager { // Cache miss return null; } - throw err; + throw new Error(`Failed to read build manifest for ` + + `${projectId} / ${buildSignature}: ${err.message}`, { + cause: err, + }); } } @@ -183,7 +186,10 @@ export default class CacheManager { // Cache miss return null; } - throw err; + throw new Error(`Failed to read resource index cache for ` + + `${projectId} / ${buildSignature}: ${err.message}`, { + cause: err, + }); } } @@ -243,7 +249,10 @@ export default class CacheManager { // Cache miss return null; } - throw err; + throw new Error(`Failed to read stage metadata from cache for ` + + `${projectId} / ${buildSignature} / ${stageId} / ${stageSignature}: ${err.message}`, { + cause: err, + }); } } @@ -302,7 +311,10 @@ export default class CacheManager { // Cache miss return null; } - throw err; + throw new Error(`Failed to read task metadata from cache for ` + + `${projectId} / ${buildSignature} / ${taskName}: ${err.message}`, { + cause: err, + }); } } From abf3aba3c1d7848e1ace6fb38582bbde717d9980 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 7 Jan 2026 14:43:09 +0100 Subject: [PATCH 056/110] refactor(logger): Log skipped projects/tasks info in grey color --- packages/logger/lib/writers/Console.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/logger/lib/writers/Console.js b/packages/logger/lib/writers/Console.js index 8243df7720c..61578b8e16f 100644 --- a/packages/logger/lib/writers/Console.js +++ b/packages/logger/lib/writers/Console.js @@ -334,7 +334,7 @@ class Console { } projectMetadata.buildSkipped = true; message = `${chalk.yellow(figures.tick)} ` + - `Skipping build of ${projectType} project ${chalk.bold(projectName)}`; + chalk.grey(`Skipping build of ${projectType} project ${chalk.bold(projectName)}`); // Update progress bar (if used) // All tasks of this projects are completed @@ -412,7 +412,7 @@ class Console { `Task execution already started`); } taskMetadata.executionEnded = true; - message = `${chalk.green(figures.tick)} Skipping task ${chalk.bold(taskName)}`; + message = chalk.yellow(figures.tick) + chalk.grey(` Skipping task ${chalk.bold(taskName)}`); // Update progress bar (if used) this._getProgressBar()?.increment(1); From dc3c03e3a775102986e0d217d8ff636c8fe4f83b Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 7 Jan 2026 16:17:21 +0100 Subject: [PATCH 057/110] refactor(project): Fix cache update mechanism --- packages/project/lib/build/cache/BuildTaskCache.js | 2 +- packages/project/lib/build/cache/ProjectBuildCache.js | 11 ++++++++--- .../project/lib/build/cache/index/ResourceIndex.js | 9 +++++++++ 3 files changed, 18 insertions(+), 4 deletions(-) diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index 70a9184e74f..7d87ccd168d 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -532,7 +532,7 @@ export default class BuildTaskCache { resourceIndex: resourceIndex.toCacheObject(), }); } else { - const rootResourceIndex = this.#resourceRequests.getMetadata(parentId); + const {resourceIndex: rootResourceIndex} = this.#resourceRequests.getMetadata(parentId); if (!rootResourceIndex) { throw new Error(`Missing root resource index for parent ID ${parentId}`); } diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 9a774e990d3..0f54d0da5e2 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -182,6 +182,9 @@ export default class ProjectBuildCache { const deltaStageCache = await this.#findStageCache(stageName, [deltaInfo.originalSignature]); if (deltaStageCache) { log.verbose(`Using delta cached stage for task ${taskName} in project ${this.#project.getName()}`); + + // Store current project reader for later use in recordTaskResult + this.#currentProjectReader = this.#project.getReader(); return { previousStageCache: deltaStageCache, newSignature: deltaInfo.newSignature, @@ -190,10 +193,12 @@ export default class ProjectBuildCache { }; } } + } else { + // Store current project reader for later use in recordTaskResult + this.#currentProjectReader = this.#project.getReader(); + + return false; // Task needs to be executed } - // No cached stage found, store current project reader for later use in recordTaskResult - this.#currentProjectReader = this.#project.getReader(); - return false; // Task needs to be executed } /** diff --git a/packages/project/lib/build/cache/index/ResourceIndex.js b/packages/project/lib/build/cache/index/ResourceIndex.js index 6256958d655..7b914b2d644 100644 --- a/packages/project/lib/build/cache/index/ResourceIndex.js +++ b/packages/project/lib/build/cache/index/ResourceIndex.js @@ -205,6 +205,15 @@ export default class ResourceIndex { return await this.#tree.upsertResources(resources); } + /** + * Removes resources from the index. + * + * @param {Array} resourcePaths - Paths of resources to remove + */ + async removeResources(resourcePaths) { + return await this.#tree.removeResources(resourcePaths); + } + /** * Computes the signature hash for this resource index. * From 7c9de68f6cf47a73eb98ffdf1d109d6ffa400a11 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 7 Jan 2026 16:30:37 +0100 Subject: [PATCH 058/110] refactor(project): WatchHandler emit error event --- packages/project/lib/build/ProjectBuilder.js | 2 +- packages/project/lib/build/helpers/WatchHandler.js | 9 +++++++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index a94d87a262e..68c911cd272 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -318,7 +318,7 @@ class ProjectBuilder { this.#log.info(`Update succeeded in ${this._getElapsedTime(startTime)}`); } catch (err) { this.#log.error(`Update failed`); - this.#log.error(err); + throw err; } finally { this._deregisterCleanupSigHooks(cleanupSigHooks); await this._executeCleanupTasks(); diff --git a/packages/project/lib/build/helpers/WatchHandler.js b/packages/project/lib/build/helpers/WatchHandler.js index 726d8b48c55..4984507c4cb 100644 --- a/packages/project/lib/build/helpers/WatchHandler.js +++ b/packages/project/lib/build/helpers/WatchHandler.js @@ -94,8 +94,13 @@ class WatchHandler extends EventEmitter { this.#sourceChanges = new Map(); this.#updateInProgress = true; - await this.#handleResourceChanges(sourceChanges); - this.#updateInProgress = false; + try { + await this.#handleResourceChanges(sourceChanges); + } catch (err) { + this.emit("error", err); + } finally { + this.#updateInProgress = false; + } if (this.#sourceChanges.size > 0) { // New changes have occurred during processing, trigger queue again From 4b780c5560dfee7184599d2d9921b725d8f5a6bb Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 7 Jan 2026 16:31:00 +0100 Subject: [PATCH 059/110] refactor(server): Exit process on rebuild error --- packages/server/lib/server.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/packages/server/lib/server.js b/packages/server/lib/server.js index 1934fe77565..1b898763e9b 100644 --- a/packages/server/lib/server.js +++ b/packages/server/lib/server.js @@ -180,6 +180,10 @@ export async function serve(graph, { resources.dependencies = newResources.dependencies; resources.all = newResources.all; }); + watchHandler.on("error", async (err) => { + log.error(`Watch handler error: ${err.message}`); + process.exit(1); + }); const middlewareManager = new MiddlewareManager({ graph, From 2d1288c220b81e090fcf95b22e5433005b435597 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 7 Jan 2026 21:12:23 +0100 Subject: [PATCH 060/110] refactor(project): Fix delta indices --- .../project/lib/build/cache/BuildTaskCache.js | 2 +- .../project/lib/build/cache/CacheManager.js | 5 +- .../lib/build/cache/ProjectBuildCache.js | 25 ++-- .../project/lib/build/cache/index/HashTree.js | 103 +++++++------- .../lib/build/cache/index/ResourceIndex.js | 14 +- packages/project/lib/build/cache/utils.js | 10 +- .../lib/specifications/types/ThemeLibrary.js | 6 +- .../test/lib/build/cache/index/HashTree.js | 128 ++++++++++++++++++ 8 files changed, 219 insertions(+), 74 deletions(-) diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index 7d87ccd168d..75f25717999 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -569,7 +569,7 @@ export default class BuildTaskCache { if (!registry) { throw new Error(`Missing tree registry for parent of node ID ${nodeId}`); } - const resourceIndex = parentResourceIndex.deriveTreeWithIndex(addedResourceIndex, registry); + const resourceIndex = parentResourceIndex.deriveTreeWithIndex(addedResourceIndex); resourceRequests.setMetadata(nodeId, { resourceIndex, diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index 8499938e981..596dbcbfdf6 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -47,6 +47,7 @@ export default class CacheManager { #casDir; #manifestDir; #stageMetadataDir; + #taskMetadataDir; #indexDir; /** @@ -63,6 +64,7 @@ export default class CacheManager { this.#casDir = path.join(cacheDir, "cas"); this.#manifestDir = path.join(cacheDir, "buildManifests"); this.#stageMetadataDir = path.join(cacheDir, "stageMetadata"); + this.#taskMetadataDir = path.join(cacheDir, "taskMetadata"); this.#indexDir = path.join(cacheDir, "index"); } @@ -222,6 +224,7 @@ export default class CacheManager { */ #getStageMetadataPath(packageName, buildSignature, stageId, stageSignature) { const pkgDir = getPathFromPackageName(packageName); + stageId = stageId.replace("/", "_"); return path.join(this.#stageMetadataDir, pkgDir, buildSignature, stageId, `${stageSignature}.json`); } @@ -287,7 +290,7 @@ export default class CacheManager { */ #getTaskMetadataPath(packageName, buildSignature, taskName) { const pkgDir = getPathFromPackageName(packageName); - return path.join(this.#stageMetadataDir, pkgDir, buildSignature, taskName, `metadata.json`); + return path.join(this.#taskMetadataDir, pkgDir, buildSignature, taskName, `metadata.json`); } /** diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 0f54d0da5e2..69930956b7b 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -45,6 +45,8 @@ export default class ProjectBuildCache { * @param {object} cacheManager - Cache manager instance for reading/writing cache data */ constructor(project, buildSignature, cacheManager) { + log.verbose( + `ProjectBuildCache for project ${project.getName()} uses build signature ${buildSignature}`); this.#project = project; this.#buildSignature = buildSignature; this.#cacheManager = cacheManager; @@ -140,18 +142,18 @@ export default class ProjectBuildCache { * 4. Returns whether the task needs to be executed * * @param {string} taskName - Name of the task to prepare - * @param {boolean} requiresDependencies - Whether the task requires dependency reader * @returns {Promise} True or object if task can use cache, false otherwise */ - async prepareTaskExecution(taskName, requiresDependencies) { + async prepareTaskExecution(taskName) { const stageName = this.#getStageNameForTask(taskName); const taskCache = this.#taskCache.get(taskName); // Switch project to new stage this.#project.useStage(stageName); - + log.verbose(`Preparing task execution for task ${taskName} in project ${this.#project.getName()}...`); if (taskCache) { let deltaInfo; if (this.#invalidatedTasks.has(taskName)) { + log.verbose(`Task cache for task ${taskName} has been invalidated, updating indices...`); const invalidationInfo = this.#invalidatedTasks.get(taskName); deltaInfo = await taskCache.updateIndices( @@ -181,7 +183,11 @@ export default class ProjectBuildCache { const deltaStageCache = await this.#findStageCache(stageName, [deltaInfo.originalSignature]); if (deltaStageCache) { - log.verbose(`Using delta cached stage for task ${taskName} in project ${this.#project.getName()}`); + log.verbose( + `Using delta cached stage for task ${taskName} in project ${this.#project.getName()} ` + + `with original signature ${deltaInfo.originalSignature} (now ${deltaInfo.newSignature}) ` + + `and ${deltaInfo.changedProjectResourcePaths.size} changed project resource paths and ` + + `${deltaInfo.changedDependencyResourcePaths.size} changed dependency resource paths.`); // Store current project reader for later use in recordTaskResult this.#currentProjectReader = this.#project.getReader(); @@ -194,11 +200,12 @@ export default class ProjectBuildCache { } } } else { - // Store current project reader for later use in recordTaskResult - this.#currentProjectReader = this.#project.getReader(); - - return false; // Task needs to be executed + log.verbose(`No task cache found`); } + // Store current project reader for later use in recordTaskResult + this.#currentProjectReader = this.#project.getReader(); + + return false; // Task needs to be executed } /** @@ -456,7 +463,7 @@ export default class ProjectBuildCache { * @returns {boolean} True if cache exists and is valid for this task */ isTaskCacheValid(taskName) { - return this.#taskCache.has(taskName) && !this.#invalidatedTasks.has(taskName); + return this.#taskCache.has(taskName) && !this.#invalidatedTasks.has(taskName) && !this.#requiresInitialBuild; } /** diff --git a/packages/project/lib/build/cache/index/HashTree.js b/packages/project/lib/build/cache/index/HashTree.js index fcb73b83232..d70a221817c 100644 --- a/packages/project/lib/build/cache/index/HashTree.js +++ b/packages/project/lib/build/cache/index/HashTree.js @@ -4,10 +4,11 @@ import {matchResourceMetadataStrict} from "../utils.js"; /** * @typedef {object} @ui5/project/build/cache/index/HashTree~ResourceMetadata - * @property {number} size - File size in bytes - * @property {number} lastModified - Last modification timestamp - * @property {number|undefined} inode - File inode identifier - * @property {string} integrity - Content hash + * @property {string} path Resource path using POSIX separators, prefixed with a slash (e.g. "/resources/file.js") + * @property {number} size File size in bytes + * @property {number} lastModified Last modification timestamp + * @property {number|undefined} inode File inode identifier + * @property {string} integrity Content hash */ /** @@ -219,30 +220,8 @@ export default class HashTree { _insertResourceWithSharing(resourcePath, resourceData) { const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); let current = this.root; - const pathToCopy = []; // Track path that needs copy-on-write - - // Phase 1: Navigate to find where we need to start copying - for (let i = 0; i < parts.length - 1; i++) { - const dirName = parts[i]; - - if (!current.children.has(dirName)) { - // New directory needed - we'll create from here - break; - } - - const existing = current.children.get(dirName); - if (existing.type !== "directory") { - throw new Error(`Path conflict: ${dirName} exists as resource but expected directory`); - } - - pathToCopy.push({parent: current, dirName, node: existing}); - current = existing; - } - - // Phase 2: Copy path from root down (copy-on-write) - // Only copy directories that will have their children modified - current = this.root; + // Navigate and copy-on-write for all directories in the path for (let i = 0; i < parts.length - 1; i++) { const dirName = parts[i]; @@ -251,17 +230,17 @@ export default class HashTree { const newDir = new TreeNode(dirName, "directory"); current.children.set(dirName, newDir); current = newDir; - } else if (i === parts.length - 2) { - // This is the parent directory that will get the new resource - // Copy it to avoid modifying shared structure + } else { + // Directory exists - need to copy it because we'll modify its children const existing = current.children.get(dirName); + if (existing.type !== "directory") { + throw new Error(`Path conflict: ${dirName} exists as resource but expected directory`); + } + + // Shallow copy to preserve copy-on-write semantics const copiedDir = this._shallowCopyDirectory(existing); current.children.set(dirName, copiedDir); current = copiedDir; - } else { - // Just traverse - don't copy intermediate directories - // They remain shared with the source tree (structural sharing) - current = current.children.get(dirName); } } @@ -958,30 +937,63 @@ export default class HashTree { * that were added compared to the base tree. * * @param {HashTree} rootTree - The base tree to compare against - * @returns {Array} Array of added resource nodes + * @returns {Array} + * Array of added resource metadata */ getAddedResources(rootTree) { const added = []; const traverse = (node, currentPath, implicitlyAdded = false) => { if (implicitlyAdded) { + // We're in a subtree that's entirely new - add all resources if (node.type === "resource") { - added.push(node); + added.push({ + path: currentPath, + integrity: node.integrity, + size: node.size, + lastModified: node.lastModified, + inode: node.inode + }); } } else { const baseNode = rootTree._findNode(currentPath); if (baseNode && baseNode === node) { - // Node exists in base tree and is the same (structural sharing) + // Node exists in base tree and is the same object (structural sharing) // Neither node nor children are added return; - } else { - // Node doesn't exist in base tree - it's added - if (node.type === "resource") { - added.push(node); - } else { - // Directory - all children are added - implicitlyAdded = true; + } else if (baseNode && node.type === "directory") { + // Directory exists in both trees but may have been shallow-copied + // Check children individually - only process children that differ + for (const [name, child] of node.children) { + const childPath = currentPath ? path.join(currentPath, name) : name; + const baseChild = baseNode.children.get(name); + + if (!baseChild || baseChild !== child) { + // Child doesn't exist in base or is different - determine if added + if (!baseChild) { + // Entirely new - all descendants are added + traverse(child, childPath, true); + } else { + // Child was modified/replaced - recurse normally + traverse(child, childPath, false); + } + } + // If baseChild === child, skip it (shared) } + return; // Don't continue with normal traversal + } else if (!baseNode && node.type === "resource") { + // Resource doesn't exist in base tree - it's added + added.push({ + path: currentPath, + integrity: node.integrity, + size: node.size, + lastModified: node.lastModified, + inode: node.inode + }); + return; + } else if (!baseNode && node.type === "directory") { + // Directory doesn't exist in base tree - all children are added + implicitlyAdded = true; } } @@ -992,8 +1004,7 @@ export default class HashTree { } } }; - - traverse(this.root, ""); + traverse(this.root, "/"); return added; } } diff --git a/packages/project/lib/build/cache/index/ResourceIndex.js b/packages/project/lib/build/cache/index/ResourceIndex.js index 7b914b2d644..fc866d0b7a3 100644 --- a/packages/project/lib/build/cache/index/ResourceIndex.js +++ b/packages/project/lib/build/cache/index/ResourceIndex.js @@ -151,7 +151,7 @@ export default class ResourceIndex { return new ResourceIndex(this.#tree.deriveTree(resourceIndex)); } - async deriveTreeWithIndex(resourceIndex) { + deriveTreeWithIndex(resourceIndex) { return new ResourceIndex(this.#tree.deriveTree(resourceIndex)); } @@ -174,18 +174,10 @@ export default class ResourceIndex { * for resources that have been added in this index. * * @param {ResourceIndex} baseIndex - The base resource index to compare against + * @returns {Array<@ui5/project/build/cache/index/HashTree~ResourceMetadata>} */ getAddedResourceIndex(baseIndex) { - const addedResources = this.#tree.getAddedResources(baseIndex.getTree()); - return addedResources.map(((resource) => { - return { - path: resource.path, - integrity: resource.integrity, - size: resource.size, - lastModified: resource.lastModified, - inode: resource.inode, - }; - })); + return this.#tree.getAddedResources(baseIndex.getTree()); } /** diff --git a/packages/project/lib/build/cache/utils.js b/packages/project/lib/build/cache/utils.js index 3925660e357..7bd41ac0b86 100644 --- a/packages/project/lib/build/cache/utils.js +++ b/packages/project/lib/build/cache/utils.js @@ -98,6 +98,15 @@ export async function matchResourceMetadataStrict(resource, cachedMetadata, inde return currentIntegrity === cachedMetadata.integrity; } + +/** + * Creates an index of resource metadata from an array of resources. + * + * @param {Array<@ui5/fs/Resource>} resources - Array of resources to index + * @param {boolean} [includeInode=false] - Whether to include inode information in the metadata + * @returns {Promise>} + * Array of resource metadata objects + */ export async function createResourceIndex(resources, includeInode = false) { return await Promise.all(resources.map(async (resource) => { const resourceMetadata = { @@ -105,7 +114,6 @@ export async function createResourceIndex(resources, includeInode = false) { integrity: await resource.getIntegrity(), lastModified: resource.getLastModified(), size: await resource.getSize(), - inode: await resource.getInode(), }; if (includeInode) { resourceMetadata.inode = resource.getInode(); diff --git a/packages/project/lib/specifications/types/ThemeLibrary.js b/packages/project/lib/specifications/types/ThemeLibrary.js index b9f352f0a6c..c9c00dc6cea 100644 --- a/packages/project/lib/specifications/types/ThemeLibrary.js +++ b/packages/project/lib/specifications/types/ThemeLibrary.js @@ -46,11 +46,7 @@ class ThemeLibrary extends Project { const sourcePath = this.getSourcePath(); if (sourceFilePath.startsWith(sourcePath)) { const relSourceFilePath = fsPath.relative(sourcePath, sourceFilePath); - let virBasePath = "/resources/"; - if (!this._isSourceNamespaced) { - virBasePath += `${this._namespace}/`; - } - return `${virBasePath}${relSourceFilePath}`; + return `/resources/${relSourceFilePath}`; } throw new Error( diff --git a/packages/project/test/lib/build/cache/index/HashTree.js b/packages/project/test/lib/build/cache/index/HashTree.js index 8b524b50fed..47d8c025e13 100644 --- a/packages/project/test/lib/build/cache/index/HashTree.js +++ b/packages/project/test/lib/build/cache/index/HashTree.js @@ -551,3 +551,131 @@ test("deriveTree - changes propagate to derived trees (shared view)", async (t) // This is the intended behavior: derived trees are views, not snapshots // Tree2 filters which resources it exposes, but underlying data is shared }); + +// ============================================================================ +// getAddedResources Tests +// ============================================================================ + +test("getAddedResources - returns empty array when no resources added", (t) => { + const baseTree = new HashTree([ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"} + ]); + + const derivedTree = baseTree.deriveTree([]); + + const added = derivedTree.getAddedResources(baseTree); + + t.deepEqual(added, [], "Should return empty array when no resources added"); +}); + +test("getAddedResources - returns added resources from derived tree", (t) => { + const baseTree = new HashTree([ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"} + ]); + + const derivedTree = baseTree.deriveTree([ + {path: "c.js", integrity: "hash-c", size: 100, lastModified: 1000, inode: 1}, + {path: "d.js", integrity: "hash-d", size: 200, lastModified: 2000, inode: 2} + ]); + + const added = derivedTree.getAddedResources(baseTree); + + t.is(added.length, 2, "Should return 2 added resources"); + t.deepEqual(added, [ + {path: "/c.js", integrity: "hash-c", size: 100, lastModified: 1000, inode: 1}, + {path: "/d.js", integrity: "hash-d", size: 200, lastModified: 2000, inode: 2} + ], "Should return correct added resources with metadata"); +}); + +test("getAddedResources - handles nested directory additions", (t) => { + const baseTree = new HashTree([ + {path: "root/a.js", integrity: "hash-a"} + ]); + + const derivedTree = baseTree.deriveTree([ + {path: "root/nested/b.js", integrity: "hash-b", size: 100, lastModified: 1000, inode: 1}, + {path: "root/nested/c.js", integrity: "hash-c", size: 200, lastModified: 2000, inode: 2} + ]); + + const added = derivedTree.getAddedResources(baseTree); + + t.is(added.length, 2, "Should return 2 added resources"); + t.true(added.some((r) => r.path === "/root/nested/b.js"), "Should include nested b.js"); + t.true(added.some((r) => r.path === "/root/nested/c.js"), "Should include nested c.js"); +}); + +test("getAddedResources - handles new directory with multiple resources", (t) => { + const baseTree = new HashTree([ + {path: "src/a.js", integrity: "hash-a"} + ]); + + const derivedTree = baseTree.deriveTree([ + {path: "lib/b.js", integrity: "hash-b", size: 100, lastModified: 1000, inode: 1}, + {path: "lib/c.js", integrity: "hash-c", size: 200, lastModified: 2000, inode: 2}, + {path: "lib/nested/d.js", integrity: "hash-d", size: 300, lastModified: 3000, inode: 3} + ]); + + const added = derivedTree.getAddedResources(baseTree); + + t.is(added.length, 3, "Should return 3 added resources"); + t.true(added.some((r) => r.path === "/lib/b.js"), "Should include lib/b.js"); + t.true(added.some((r) => r.path === "/lib/c.js"), "Should include lib/c.js"); + t.true(added.some((r) => r.path === "/lib/nested/d.js"), "Should include nested resource"); +}); + +test("getAddedResources - preserves metadata for added resources", (t) => { + const baseTree = new HashTree([ + {path: "a.js", integrity: "hash-a"} + ]); + + const derivedTree = baseTree.deriveTree([ + {path: "b.js", integrity: "hash-b", size: 12345, lastModified: 9999, inode: 7777} + ]); + + const added = derivedTree.getAddedResources(baseTree); + + t.is(added.length, 1, "Should return 1 added resource"); + t.is(added[0].path, "/b.js", "Should have correct path"); + t.is(added[0].integrity, "hash-b", "Should preserve integrity"); + t.is(added[0].size, 12345, "Should preserve size"); + t.is(added[0].lastModified, 9999, "Should preserve lastModified"); + t.is(added[0].inode, 7777, "Should preserve inode"); +}); + +test("getAddedResources - handles mixed shared and added resources", (t) => { + const baseTree = new HashTree([ + {path: "shared/a.js", integrity: "hash-a"}, + {path: "shared/b.js", integrity: "hash-b"} + ]); + + const derivedTree = baseTree.deriveTree([ + {path: "shared/c.js", integrity: "hash-c", size: 100, lastModified: 1000, inode: 1}, + {path: "unique/d.js", integrity: "hash-d", size: 200, lastModified: 2000, inode: 2} + ]); + + const added = derivedTree.getAddedResources(baseTree); + + t.is(added.length, 2, "Should return 2 added resources"); + t.true(added.some((r) => r.path === "/shared/c.js"), "Should include c.js in shared dir"); + t.true(added.some((r) => r.path === "/unique/d.js"), "Should include d.js in unique dir"); + t.false(added.some((r) => r.path === "/shared/a.js"), "Should not include shared a.js"); + t.false(added.some((r) => r.path === "/shared/b.js"), "Should not include shared b.js"); +}); + +test("getAddedResources - handles deeply nested additions", (t) => { + const baseTree = new HashTree([ + {path: "a.js", integrity: "hash-a"} + ]); + + const derivedTree = baseTree.deriveTree([ + {path: "dir1/dir2/dir3/dir4/deep.js", integrity: "hash-deep", size: 100, lastModified: 1000, inode: 1} + ]); + + const added = derivedTree.getAddedResources(baseTree); + + t.is(added.length, 1, "Should return 1 added resource"); + t.is(added[0].path, "/dir1/dir2/dir3/dir4/deep.js", "Should have correct deeply nested path"); + t.is(added[0].integrity, "hash-deep", "Should preserve integrity"); +}); From 2c451a30ebee1142ae1a733a29c55462058e2e76 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Thu, 8 Jan 2026 14:44:45 +0100 Subject: [PATCH 061/110] refactor(logger): Support differential update task logging --- packages/logger/lib/loggers/ProjectBuild.js | 6 ++++-- packages/logger/lib/writers/Console.js | 5 +++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/packages/logger/lib/loggers/ProjectBuild.js b/packages/logger/lib/loggers/ProjectBuild.js index 61c81115963..57856e211fe 100644 --- a/packages/logger/lib/loggers/ProjectBuild.js +++ b/packages/logger/lib/loggers/ProjectBuild.js @@ -48,7 +48,7 @@ class ProjectBuild extends Logger { }); } - startTask(taskName) { + startTask(taskName, isDifferentialBuild) { if (!this.#tasksToRun || !this.#tasksToRun.includes(taskName)) { throw new Error(`loggers/ProjectBuild#startTask: Unknown task ${taskName}`); } @@ -59,6 +59,7 @@ class ProjectBuild extends Logger { projectType: this.#projectType, taskName, status: "task-start", + isDifferentialBuild, }); if (!hasListeners) { @@ -66,7 +67,7 @@ class ProjectBuild extends Logger { } } - endTask(taskName) { + endTask(taskName, isDifferentialBuild) { if (!this.#tasksToRun || !this.#tasksToRun.includes(taskName)) { throw new Error(`loggers/ProjectBuild#endTask: Unknown task ${taskName}`); } @@ -77,6 +78,7 @@ class ProjectBuild extends Logger { projectType: this.#projectType, taskName, status: "task-end", + isDifferentialBuild, }); if (!hasListeners) { diff --git a/packages/logger/lib/writers/Console.js b/packages/logger/lib/writers/Console.js index 61578b8e16f..846701cf807 100644 --- a/packages/logger/lib/writers/Console.js +++ b/packages/logger/lib/writers/Console.js @@ -349,7 +349,7 @@ class Console { this.#writeMessage(level, `${chalk.grey(buildIndex)}: ${message}`); } - #handleProjectBuildStatusEvent({level, projectName, projectType, taskName, status}) { + #handleProjectBuildStatusEvent({level, projectName, projectType, taskName, status, isDifferentialBuild}) { const {projectTasks} = this.#getProjectMetadata(projectName); const taskMetadata = projectTasks.get(taskName); if (!taskMetadata) { @@ -382,7 +382,8 @@ class Console { `for project ${projectName}, task ${taskName}`); } taskMetadata.executionStarted = true; - message = `${chalk.blue(figures.pointerSmall)} Running task ${chalk.bold(taskName)}...`; + message = (isDifferentialBuild ? chalk.grey(figures.lozengeOutline) : chalk.blue(figures.pointerSmall)) + + ` Running task ${chalk.bold(taskName)}...`; break; case "task-end": if (taskMetadata.executionEnded) { From b8ada97dc4ac4c345d036f02dc2fb04acca61d6a Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Thu, 8 Jan 2026 14:45:02 +0100 Subject: [PATCH 062/110] refactor(project): Provide differential update flag to logger --- packages/project/lib/build/TaskRunner.js | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index ea64c1643a4..2c3b934bd4b 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -198,16 +198,12 @@ class TaskRunner { options.projectName = this._project.getName(); options.projectNamespace = this._project.getNamespace(); // TODO: Apply cache and stage handling for custom tasks as well - const cacheInfo = await this._buildCache.prepareTaskExecution(taskName, requiresDependencies); + const cacheInfo = await this._buildCache.prepareTaskExecution(taskName); if (cacheInfo === true) { this._log.skipTask(taskName); return; } const usingCache = supportsDifferentialUpdates && cacheInfo; - - this._log.verbose( - `Executing task ${taskName} for project ${this._project.getName()}` + - (usingCache ? ` (using differential update)` : "")); const workspace = createMonitor(this._project.getWorkspace()); const params = { workspace, @@ -230,7 +226,7 @@ class TaskRunner { const {task} = await this._taskRepository.getTask(taskName); taskFunction = task; } - this._log.startTask(taskName); + this._log.startTask(taskName, usingCache); this._taskStart = performance.now(); await taskFunction(params); if (this._log.isLevelEnabled("perf")) { From 56b4f1be51fa2cdc0177e4074feafd7d4f9c0238 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Thu, 8 Jan 2026 14:45:38 +0100 Subject: [PATCH 063/110] refactor(server): Log error stack on build error --- packages/server/lib/server.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/server/lib/server.js b/packages/server/lib/server.js index 1b898763e9b..eb0a6c600c1 100644 --- a/packages/server/lib/server.js +++ b/packages/server/lib/server.js @@ -182,6 +182,7 @@ export async function serve(graph, { }); watchHandler.on("error", async (err) => { log.error(`Watch handler error: ${err.message}`); + log.verbose(err.stack); process.exit(1); }); From 66cdbaebf9c559482be8259d5c7dd6d021cfecaf Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Thu, 8 Jan 2026 20:59:40 +0100 Subject: [PATCH 064/110] refactor(project): Add chokidar --- package-lock.json | 1 + packages/project/lib/build/ProjectBuilder.js | 13 +++- .../project/lib/build/helpers/BuildContext.js | 4 +- .../project/lib/build/helpers/WatchHandler.js | 74 ++++++++++--------- packages/project/package.json | 1 + 5 files changed, 52 insertions(+), 41 deletions(-) diff --git a/package-lock.json b/package-lock.json index 5b346d2bc71..7b31208054f 100644 --- a/package-lock.json +++ b/package-lock.json @@ -17576,6 +17576,7 @@ "ajv-errors": "^1.0.1", "cacache": "^20.0.3", "chalk": "^5.6.2", + "chokidar": "^3.6.0", "escape-string-regexp": "^5.0.0", "globby": "^14.1.0", "graceful-fs": "^4.2.11", diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 68c911cd272..774b31759b3 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -208,16 +208,23 @@ class ProjectBuilder { await rmrf(destPath); } - await this.#build(queue, projectBuildContexts, requestedProjects, fsTarget); - + let pWatchInit; if (watch) { const relevantProjects = queue.map((projectBuildContext) => { return projectBuildContext.getProject(); }); - return this._buildContext.initWatchHandler(relevantProjects, async () => { + // Start watching already while the initial build is running + pWatchInit = this._buildContext.initWatchHandler(relevantProjects, async () => { await this.#updateBuild(projectBuildContexts, requestedProjects, fsTarget); }); } + + const [, watchHandler] = await Promise.all([ + this.#build(queue, projectBuildContexts, requestedProjects, fsTarget), + pWatchInit + ]); + watchHandler.setReady(); + return watchHandler; } async #build(queue, projectBuildContexts, requestedProjects, fsTarget) { diff --git a/packages/project/lib/build/helpers/BuildContext.js b/packages/project/lib/build/helpers/BuildContext.js index bab2e2f0282..5b93cce062a 100644 --- a/packages/project/lib/build/helpers/BuildContext.js +++ b/packages/project/lib/build/helpers/BuildContext.js @@ -110,9 +110,9 @@ class BuildContext { return projectBuildContext; } - initWatchHandler(projects, updateBuildResult) { + async initWatchHandler(projects, updateBuildResult) { const watchHandler = new WatchHandler(this, updateBuildResult); - watchHandler.watch(projects); + await watchHandler.watch(projects); this.#watchHandler = watchHandler; return watchHandler; } diff --git a/packages/project/lib/build/helpers/WatchHandler.js b/packages/project/lib/build/helpers/WatchHandler.js index 4984507c4cb..f67cfc9cabe 100644 --- a/packages/project/lib/build/helpers/WatchHandler.js +++ b/packages/project/lib/build/helpers/WatchHandler.js @@ -1,6 +1,5 @@ import EventEmitter from "node:events"; -import path from "node:path"; -import {watch} from "node:fs/promises"; +import chokidar from "chokidar"; import {getLogger} from "@ui5/logger"; const log = getLogger("build:helpers:WatchHandler"); @@ -13,8 +12,9 @@ const log = getLogger("build:helpers:WatchHandler"); class WatchHandler extends EventEmitter { #buildContext; #updateBuildResult; - #abortControllers = []; + #closeCallbacks = []; #sourceChanges = new Map(); + #ready = false; #updateInProgress = false; #fileChangeHandlerTimeout; @@ -24,45 +24,47 @@ class WatchHandler extends EventEmitter { this.#updateBuildResult = updateBuildResult; } - watch(projects) { + setReady() { + this.#ready = true; + this.#processQueue(); + } + + async watch(projects) { + const readyPromises = []; for (const project of projects) { const paths = project.getSourcePaths(); log.verbose(`Watching source paths: ${paths.join(", ")}`); - for (const sourceDir of paths) { - const ac = new AbortController(); - const watcher = watch(sourceDir, { - persistent: true, - recursive: true, - signal: ac.signal, - }); - - this.#abortControllers.push(ac); - this.#handleWatchEvents(watcher, sourceDir, project); // Do not await as this would block the loop - } + const watcher = chokidar.watch(paths, { + ignoreInitial: true, + }); + this.#closeCallbacks.push(async () => { + await watcher.close(); + }); + watcher.on("all", (event, filePath) => { + this.#handleWatchEvents(event, filePath, project); + }); + const {promise, resolve} = Promise.withResolvers(); + readyPromises.push(promise); + watcher.on("ready", () => { + resolve(); + }); + watcher.on("error", (err) => { + this.emit("error", err); + }); } + return await Promise.all(readyPromises); } - stop() { - for (const ac of this.#abortControllers) { - ac.abort(); + async stop() { + for (const cb of this.#closeCallbacks) { + await cb(); } } - async #handleWatchEvents(watcher, basePath, project) { - try { - for await (const {eventType, filename} of watcher) { - log.verbose(`File changed: ${eventType} ${filename}`); - if (filename) { - await this.#fileChanged(project, path.join(basePath, filename.toString())); - } - } - } catch (err) { - if (err.name === "AbortError") { - return; - } - throw err; - } + async #handleWatchEvents(eventType, filePath, project) { + log.verbose(`File changed: ${eventType} ${filePath}`); + await this.#fileChanged(project, filePath); } #fileChanged(project, filePath) { @@ -73,11 +75,11 @@ class WatchHandler extends EventEmitter { } this.#sourceChanges.get(project).add(resourcePath); - this.#queueHandleResourceChanges(); + this.#processQueue(); } - #queueHandleResourceChanges() { - if (this.#updateInProgress) { + #processQueue() { + if (!this.#ready || this.#updateInProgress) { // Prevent concurrent updates return; } @@ -104,7 +106,7 @@ class WatchHandler extends EventEmitter { if (this.#sourceChanges.size > 0) { // New changes have occurred during processing, trigger queue again - this.#queueHandleResourceChanges(); + this.#processQueue(); } }, 100); } diff --git a/packages/project/package.json b/packages/project/package.json index a1b73ef2fc4..c1d0f555962 100644 --- a/packages/project/package.json +++ b/packages/project/package.json @@ -64,6 +64,7 @@ "ajv-errors": "^1.0.1", "cacache": "^20.0.3", "chalk": "^5.6.2", + "chokidar": "^3.6.0", "escape-string-regexp": "^5.0.0", "globby": "^14.1.0", "graceful-fs": "^4.2.11", From 407146052302fe66c63e9c30fe6ea5d6d88141a5 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Thu, 8 Jan 2026 21:45:24 +0100 Subject: [PATCH 065/110] refactor(project): Limit build signature to project name and config --- .../build/helpers/calculateBuildSignature.js | 83 +------------------ 1 file changed, 3 insertions(+), 80 deletions(-) diff --git a/packages/project/lib/build/helpers/calculateBuildSignature.js b/packages/project/lib/build/helpers/calculateBuildSignature.js index 6ca04986bf0..684ea0c4d17 100644 --- a/packages/project/lib/build/helpers/calculateBuildSignature.js +++ b/packages/project/lib/build/helpers/calculateBuildSignature.js @@ -1,8 +1,7 @@ -import {createRequire} from "node:module"; import crypto from "node:crypto"; // Using CommonsJS require since JSON module imports are still experimental -const require = createRequire(import.meta.url); +const BUILD_CACHE_VERSION = "0"; /** * The build signature is calculated based on the **build configuration and environment** of a project. @@ -17,86 +16,10 @@ const require = createRequire(import.meta.url); * versions of ui5-builder and ui5-fs) */ export default async function calculateBuildSignature(project, graph, buildConfig, taskRepository) { - const depInfo = collectDepInfo(graph, project); - const lockfileHash = await getLockfileHash(project); - const {builderVersion, fsVersion: builderFsVersion} = await taskRepository.getVersions(); - const projectVersion = await getVersion("@ui5/project"); - const fsVersion = await getVersion("@ui5/fs"); - - const key = project.getName() + project.getVersion() + - JSON.stringify(buildConfig) + JSON.stringify(depInfo) + - builderVersion + projectVersion + fsVersion + builderFsVersion + - lockfileHash; + const key = BUILD_CACHE_VERSION + project.getName() + + JSON.stringify(buildConfig); // Create a hash for all metadata const hash = crypto.createHash("sha256").update(key).digest("hex"); return hash; } - -async function getVersion(pkg) { - return require(`${pkg}/package.json`).version; -} - -async function getLockfileHash(project) { - const rootReader = project.getRootReader({useGitIgnore: false}); - const lockfiles = await Promise.all([ - // TODO: Search upward for lockfiles in parent directories? - // npm - await rootReader.byPath("/package-lock.json"), - await rootReader.byPath("/npm-shrinkwrap.json"), - // Yarn - await rootReader.byPath("/yarn.lock"), - // pnpm - await rootReader.byPath("/pnpm-lock.yaml"), - ]); - let hash = ""; - for (const lockfile of lockfiles) { - if (lockfile) { - const content = await lockfile.getBuffer(); - hash += crypto.createHash("sha256").update(content).digest("hex"); - } - } - return hash; -} - -function collectDepInfo(graph, project) { - let projects = []; - for (const depName of graph.getTransitiveDependencies(project.getName())) { - const dep = graph.getProject(depName); - projects.push({ - name: dep.getName(), - version: dep.getVersion() - }); - } - projects = projects.sort((a, b) => { - return a.name.localeCompare(b.name); - }); - - // Collect relevant extensions - let extensions = []; - if (graph.getRoot() === project) { - // Custom middleware is only relevant for root project - project.getCustomMiddleware().forEach((middlewareDef) => { - const extension = graph.getExtension(middlewareDef.name); - if (extension) { - extensions.push({ - name: extension.getName(), - version: extension.getVersion() - }); - } - }); - } - project.getCustomTasks().forEach((taskDef) => { - const extension = graph.getExtension(taskDef.name); - if (extension) { - extensions.push({ - name: extension.getName(), - version: extension.getVersion() - }); - } - }); - extensions = extensions.sort((a, b) => { - return a.name.localeCompare(b.name); - }); - return {projects, extensions}; -} From 400158f68dc9402cb23a91122c8f28029a91286a Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Thu, 8 Jan 2026 21:52:05 +0100 Subject: [PATCH 066/110] refactor(project): Improve ResourceRequestGraph handling --- .../project/lib/build/cache/BuildTaskCache.js | 22 +++- .../lib/build/cache/ProjectBuildCache.js | 1 + .../lib/build/cache/ResourceRequestGraph.js | 116 ++++-------------- .../lib/build/cache/ResourceRequestGraph.js | 36 +++--- .../test/lib/build/cache/index/HashTree.js | 4 - 5 files changed, 60 insertions(+), 119 deletions(-) diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index 75f25717999..290b7bf2d89 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -282,6 +282,7 @@ export default class BuildTaskCache { requests.push(new Request("dep-patterns", patterns)); } } + // Try to find an existing request set that we can reuse let setId = this.#resourceRequests.findExactMatch(requests); let resourceIndex; if (setId) { @@ -301,8 +302,14 @@ export default class BuildTaskCache { const addedRequests = requestSet.getAddedRequests(); const resourcesToAdd = await this.#getResourcesForRequests(addedRequests, projectReader, dependencyReader); + if (!resourcesToAdd.length) { + throw new Error(`Unexpected empty added resources for request set ID ${setId} ` + + `of task '${this.#taskName}' of project '${this.#projectName}'`); + } + log.verbose(`Task '${this.#taskName}' of project '${this.#projectName}' ` + + `created derived resource index for request set ID ${setId} ` + + `based on parent ID ${parentId} with ${resourcesToAdd.length} additional resources`); resourceIndex = await parentResourceIndex.deriveTree(resourcesToAdd); - // await newIndex.add(resourcesToAdd); } else { const resourcesRead = await this.#getResourcesForRequests(requests, projectReader, dependencyReader); @@ -438,7 +445,7 @@ export default class BuildTaskCache { * @param {Request[]|Array<{type: string, value: string|string[]}>} resourceRequests - Resource requests to process * @param {module:@ui5/fs.AbstractReader} projectReader - Reader for project resources * @param {module:@ui5/fs.AbstractReader} dependencyReder - Reader for dependency resources - * @returns {Promise>} Iterator of retrieved resources + * @returns {Promise>} Iterator of retrieved resources * @throws {Error} If an unknown request type is encountered */ async #getResourcesForRequests(resourceRequests, projectReader, dependencyReder) { @@ -477,7 +484,7 @@ export default class BuildTaskCache { throw new Error(`Unknown request type: ${type}`); } } - return resourcesMap.values(); + return Array.from(resourcesMap.values()); } /** @@ -519,6 +526,10 @@ export default class BuildTaskCache { * @returns {TaskCacheMetadata} Serialized cache metadata containing the request set graph */ toCacheObject() { + if (!this.#resourceRequests) { + throw new Error("BuildTaskCache#toCacheObject: Resource requests not initialized for task " + + `'${this.#taskName}' of project '${this.#projectName}'`); + } const rootIndices = []; const deltaIndices = []; for (const {nodeId, parentId} of this.#resourceRequests.traverseByDepth()) { @@ -536,6 +547,8 @@ export default class BuildTaskCache { if (!rootResourceIndex) { throw new Error(`Missing root resource index for parent ID ${parentId}`); } + // Store the metadata for all added resources. Note: Those resources might not be available + // in the current tree. In that case we store an empty array. const addedResourceIndex = resourceIndex.getAddedResourceIndex(rootResourceIndex); deltaIndices.push({ nodeId, @@ -567,7 +580,8 @@ export default class BuildTaskCache { const {resourceIndex: parentResourceIndex} = resourceRequests.getMetadata(node.getParentId()); const registry = registries.get(node.getParentId()); if (!registry) { - throw new Error(`Missing tree registry for parent of node ID ${nodeId}`); + throw new Error(`Missing tree registry for parent of node ID ${nodeId} of task ` + + `'${this.#taskName}' of project '${this.#projectName}'`); } const resourceIndex = parentResourceIndex.deriveTreeWithIndex(addedResourceIndex); diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 69930956b7b..31a86938de1 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -235,6 +235,7 @@ export default class ProjectBuildCache { const stageMetadata = await this.#cacheManager.readStageCache( this.#project.getId(), this.#buildSignature, stageName, stageSignature); if (stageMetadata) { + log.verbose(`Found cached stage with signature ${stageSignature}`); const reader = await this.#createReaderForStageCache( stageName, stageSignature, stageMetadata.resourceMetadata); return { diff --git a/packages/project/lib/build/cache/ResourceRequestGraph.js b/packages/project/lib/build/cache/ResourceRequestGraph.js index aac512d24b7..65366ac3885 100644 --- a/packages/project/lib/build/cache/ResourceRequestGraph.js +++ b/packages/project/lib/build/cache/ResourceRequestGraph.js @@ -187,55 +187,6 @@ export default class ResourceRequestGraph { return Array.from(this.nodes.keys()); } - /** - * Find the best parent for a new request set using greedy selection - * - * @param {Request[]} requestSet - Array of Request objects - * @returns {{parentId: number, deltaSize: number}|null} Parent info or null if no suitable parent - */ - findBestParent(requestSet) { - if (this.nodes.size === 0) { - return null; - } - - const requestKeys = new Set(requestSet.map((r) => r.toKey())); - let bestParent = null; - let smallestDelta = Infinity; - - // Compare against all existing nodes - for (const [nodeId, node] of this.nodes) { - const nodeSet = node.getMaterializedSet(this); - - // Calculate how many new requests would need to be added - const delta = this._calculateDelta(requestKeys, nodeSet); - - // We want the parent that minimizes the delta (maximum overlap) - if (delta < smallestDelta) { - smallestDelta = delta; - bestParent = nodeId; - } - } - - return bestParent !== null ? {parentId: bestParent, deltaSize: smallestDelta} : null; - } - - /** - * Calculate the size of the delta (requests in newSet not in existingSet) - * - * @param {Set} newSetKeys - Set of request keys - * @param {Set} existingSetKeys - Set of existing request keys - * @returns {number} Number of requests in newSet not in existingSet - */ - _calculateDelta(newSetKeys, existingSetKeys) { - let deltaCount = 0; - for (const key of newSetKeys) { - if (!existingSetKeys.has(key)) { - deltaCount++; - } - } - return deltaCount; - } - /** * Calculate which requests need to be added (delta) * @@ -245,15 +196,9 @@ export default class ResourceRequestGraph { */ _calculateAddedRequests(newRequestSet, parentSet) { const newKeys = new Set(newRequestSet.map((r) => r.toKey())); - const addedKeys = []; + const addedKeys = newKeys.difference(parentSet); - for (const key of newKeys) { - if (!parentSet.has(key)) { - addedKeys.push(key); - } - } - - return addedKeys.map((key) => Request.fromKey(key)); + return Array.from(addedKeys).map((key) => Request.fromKey(key)); } /** @@ -267,9 +212,9 @@ export default class ResourceRequestGraph { const nodeId = this.nextId++; // Find best parent - const parentInfo = this.findBestParent(requests); + const parentId = this.findBestParent(requests); - if (parentInfo === null) { + if (parentId === null) { // No existing nodes, or no suitable parent - create root node const node = new RequestSetNode(nodeId, null, requests, metadata); this.nodes.set(nodeId, node); @@ -277,43 +222,46 @@ export default class ResourceRequestGraph { } // Create node with delta from best parent - const parentNode = this.getNode(parentInfo.parentId); + const parentNode = this.getNode(parentId); const parentSet = parentNode.getMaterializedSet(this); const addedRequests = this._calculateAddedRequests(requests, parentSet); - const node = new RequestSetNode(nodeId, parentInfo.parentId, addedRequests, metadata); + const node = new RequestSetNode(nodeId, parentId, addedRequests, metadata); this.nodes.set(nodeId, node); return nodeId; } /** - * Find the best matching node for a query request set - * Returns the node ID where the node's set is a subset of the query - * and is maximal (largest subset match) + * Find the best parent for a new request set. That is, the largest subset of the new request set. * - * @param {Request[]} queryRequests - Array of Request objects to match - * @returns {number|null} Node ID of best match, or null if no match found + * @param {Request[]} requestSet - Array of Request objects + * @returns {{parentId: number, deltaSize: number}|null} Parent info or null if no suitable parent */ - findBestMatch(queryRequests) { - const queryKeys = new Set(queryRequests.map((r) => r.toKey())); + findBestParent(requestSet) { + if (this.nodes.size === 0) { + return null; + } - let bestMatch = null; - let bestMatchSize = -1; + const queryKeys = new Set(requestSet.map((r) => r.toKey())); + let bestParent = null; + let greatestSubset = -1; + // Compare against all existing nodes for (const [nodeId, node] of this.nodes) { const nodeSet = node.getMaterializedSet(this); // Check if nodeSet is a subset of queryKeys - const isSubset = this._isSubset(nodeSet, queryKeys); + const isSubset = nodeSet.isSubsetOf(queryKeys); - if (isSubset && nodeSet.size > bestMatchSize) { - bestMatch = nodeId; - bestMatchSize = nodeSet.size; + // We want the parent the greatest overlap + if (isSubset && nodeSet.size > greatestSubset) { + bestParent = nodeId; + greatestSubset = nodeSet.size; } } - return bestMatch; + return bestParent; } /** @@ -338,7 +286,7 @@ export default class ResourceRequestGraph { } // Check if sets are identical (same size + subset = equality) - if (this._isSubset(nodeSet, queryKeys)) { + if (nodeSet.isSubsetOf(queryKeys)) { return nodeId; } } @@ -346,22 +294,6 @@ export default class ResourceRequestGraph { return null; } - /** - * Check if setA is a subset of setB - * - * @param {Set} setA - First set - * @param {Set} setB - Second set - * @returns {boolean} True if setA is a subset of setB - */ - _isSubset(setA, setB) { - for (const item of setA) { - if (!setB.has(item)) { - return false; - } - } - return true; - } - /** * Get metadata associated with a node * diff --git a/packages/project/test/lib/build/cache/ResourceRequestGraph.js b/packages/project/test/lib/build/cache/ResourceRequestGraph.js index 2a410cc7567..b705c96625c 100644 --- a/packages/project/test/lib/build/cache/ResourceRequestGraph.js +++ b/packages/project/test/lib/build/cache/ResourceRequestGraph.js @@ -155,18 +155,17 @@ test("ResourceRequestGraph: Add request set with parent relationship", (t) => { t.true(node2Data.addedRequests.has("path:c.js")); }); -test("ResourceRequestGraph: Add request set with no overlap creates parent", (t) => { +test("ResourceRequestGraph: Add request set with no overlap", (t) => { const graph = new ResourceRequestGraph(); const set1 = [new Request("path", "a.js")]; - const node1 = graph.addRequestSet(set1); + graph.addRequestSet(set1); const set2 = [new Request("path", "x.js")]; const node2 = graph.addRequestSet(set2); const node2Data = graph.getNode(node2); - // Even with no overlap, greedy algorithm will select best parent - t.is(node2Data.parent, node1); + t.falsy(node2Data.parent); t.is(node2Data.addedRequests.size, 1); t.true(node2Data.addedRequests.has("path:x.js")); }); @@ -218,7 +217,7 @@ test("ResourceRequestGraph: getAddedRequests returns only delta", (t) => { t.is(added[0].toKey(), "path:c.js"); }); -test("ResourceRequestGraph: findBestMatch returns node with largest subset", (t) => { +test("ResourceRequestGraph: findBestParent returns node with largest subset", (t) => { const graph = new ResourceRequestGraph(); // Add first request set @@ -243,13 +242,13 @@ test("ResourceRequestGraph: findBestMatch returns node with largest subset", (t) new Request("path", "c.js"), new Request("path", "x.js") ]; - const match = graph.findBestMatch(query); + const match = graph.findBestParent(query); // Should return node2 (largest subset: 3 items) t.is(match, node2); }); -test("ResourceRequestGraph: findBestMatch returns null when no subset found", (t) => { +test("ResourceRequestGraph: findBestParent returns null when no subset found", (t) => { const graph = new ResourceRequestGraph(); const set1 = [ @@ -263,7 +262,7 @@ test("ResourceRequestGraph: findBestMatch returns null when no subset found", (t new Request("path", "x.js"), new Request("path", "y.js") ]; - const match = graph.findBestMatch(query); + const match = graph.findBestParent(query); t.is(match, null); }); @@ -416,7 +415,7 @@ test("ResourceRequestGraph: getStats returns correct statistics", (t) => { t.is(stats.compressionRatio, 0.6); // 3 stored / 5 total }); -test("ResourceRequestGraph: toMetadataObject exports graph structure", (t) => { +test("ResourceRequestGraph: toCacheObject exports graph structure", (t) => { const graph = new ResourceRequestGraph(); const set1 = [new Request("path", "a.js")]; @@ -428,7 +427,7 @@ test("ResourceRequestGraph: toMetadataObject exports graph structure", (t) => { ]; const node2 = graph.addRequestSet(set2); - const exported = graph.toMetadataObject(); + const exported = graph.toCacheObject(); t.is(exported.nodes.length, 2); t.is(exported.nextId, 3); @@ -444,7 +443,7 @@ test("ResourceRequestGraph: toMetadataObject exports graph structure", (t) => { t.deepEqual(exportedNode2.addedRequests, ["path:b.js"]); }); -test("ResourceRequestGraph: fromMetadataObject reconstructs graph", (t) => { +test("ResourceRequestGraph: fromCacheObject reconstructs graph", (t) => { const graph1 = new ResourceRequestGraph(); const set1 = [new Request("path", "a.js")]; @@ -457,8 +456,8 @@ test("ResourceRequestGraph: fromMetadataObject reconstructs graph", (t) => { const node2 = graph1.addRequestSet(set2); // Export and reconstruct - const exported = graph1.toMetadataObject(); - const graph2 = ResourceRequestGraph.fromMetadataObject(exported); + const exported = graph1.toCacheObject(); + const graph2 = ResourceRequestGraph.fromCacheObject(exported); // Verify reconstruction t.is(graph2.nodes.size, 2); @@ -542,15 +541,15 @@ test("ResourceRequestGraph: findBestParent chooses optimal parent", (t) => { // Create two potential parents const set1 = [ - new Request("path", "a.js"), - new Request("path", "b.js") + new Request("path", "x.js"), + new Request("path", "y.js") ]; graph.addRequestSet(set1); const set2 = [ new Request("path", "x.js"), new Request("path", "y.js"), - new Request("path", "z.js") + new Request("path", "z.js"), ]; const node2 = graph.addRequestSet(set2); @@ -607,7 +606,7 @@ test("ResourceRequestGraph: Caching works correctly", (t) => { t.deepEqual(Array.from(materialized1).sort(), Array.from(materialized2).sort()); }); -test("ResourceRequestGraph: Usage example from documentation", (t) => { +test("ResourceRequestGraph: Integration", (t) => { // Create graph const graph = new ResourceRequestGraph(); @@ -637,9 +636,8 @@ test("ResourceRequestGraph: Usage example from documentation", (t) => { const query = [ new Request("path", "a.js"), new Request("path", "b.js"), - new Request("path", "x.js") ]; - const match = graph.findBestMatch(query); + const match = graph.findExactMatch(query); t.is(match, node1); // Get metadata diff --git a/packages/project/test/lib/build/cache/index/HashTree.js b/packages/project/test/lib/build/cache/index/HashTree.js index 47d8c025e13..3d9711962a0 100644 --- a/packages/project/test/lib/build/cache/index/HashTree.js +++ b/packages/project/test/lib/build/cache/index/HashTree.js @@ -452,10 +452,6 @@ test("removeResources - remove from nested directory", async (t) => { t.truthy(tree.hasPath("dir1/c.js"), "Should still have dir1/c.js"); }); -// ============================================================================ -// Critical Flaw Tests -// ============================================================================ - test("deriveTree - copies only modified directories (copy-on-write)", (t) => { const tree1 = new HashTree([ {path: "shared/a.js", integrity: "hash-a"}, From dd566ccfe556d96b42087712d1e1a552496dffa7 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Thu, 8 Jan 2026 16:35:47 +0100 Subject: [PATCH 067/110] refactor(server): Remove obsolete code from serveResources middleware --- .../lib/middleware/MiddlewareManager.js | 1 + .../server/lib/middleware/serveResources.js | 114 ++---------------- 2 files changed, 13 insertions(+), 102 deletions(-) diff --git a/packages/server/lib/middleware/MiddlewareManager.js b/packages/server/lib/middleware/MiddlewareManager.js index a06a2475300..475dbec2420 100644 --- a/packages/server/lib/middleware/MiddlewareManager.js +++ b/packages/server/lib/middleware/MiddlewareManager.js @@ -218,6 +218,7 @@ class MiddlewareManager { }); await this.addMiddleware("serveResources"); await this.addMiddleware("testRunner"); + // TODO: Allow to still reference 'serveThemes' middleware in custom middleware // await this.addMiddleware("serveThemes"); await this.addMiddleware("versionInfo", { mountPath: "/resources/sap-ui-version.json" diff --git a/packages/server/lib/middleware/serveResources.js b/packages/server/lib/middleware/serveResources.js index 3e6c1d0ac63..74528972ada 100644 --- a/packages/server/lib/middleware/serveResources.js +++ b/packages/server/lib/middleware/serveResources.js @@ -1,15 +1,5 @@ -import {getLogger} from "@ui5/logger"; -const log = getLogger("server:middleware:serveResources"); -import replaceStream from "replacestream"; import etag from "etag"; import fresh from "fresh"; -import fsInterface from "@ui5/fs/fsInterface"; - -const rProperties = /\.properties$/i; -const rReplaceVersion = /\.(library|js|json)$/i; -const rManifest = /\/manifest\.json$/i; -const rResourcesPrefix = /^\/resources\//i; -const rTestResourcesPrefix = /^\/test-resources\//i; function isFresh(req, res) { return fresh(req.headers, { @@ -18,7 +8,7 @@ function isFresh(req, res) { } /** - * Creates and returns the middleware to serve application resources. + * Creates and returns the middleware to serve project resources. * * @module @ui5/server/middleware/serveResources * @param {object} parameters Parameters @@ -30,90 +20,23 @@ function createMiddleware({resources, middlewareUtil}) { return async function serveResources(req, res, next) { try { const pathname = middlewareUtil.getPathname(req); - let resource = await resources.all.byPath(pathname); - if (!resource) { // Not found - if (!rManifest.test(pathname) || !rResourcesPrefix.test(pathname)) { - next(); - return; - } - log.verbose(`Could not find manifest.json for ${pathname}. ` + - `Checking for .library file to generate manifest.json from.`); - const {default: generateLibraryManifest} = await import("./helper/generateLibraryManifest.js"); - // Attempt to find a .library file, which is required for generating a manifest.json - const dotLibraryPath = pathname.replace(rManifest, "/.library"); - const dotLibraryResource = await resources.all.byPath(dotLibraryPath); - if (dotLibraryResource && dotLibraryResource.getProject()?.getType() === "library") { - resource = await generateLibraryManifest(middlewareUtil, dotLibraryResource); - } - if (!resource) { - // Not a library project, missing .library file or other reason for failed manifest.json generation - next(); - return; - } - } else if ( - rManifest.test(pathname) && !rTestResourcesPrefix.test(pathname) && - resource.getProject()?.getNamespace() - ) { - // Special handling for manifest.json file by adding additional content to the served manifest.json - // NOTE: This should only be done for manifest.json files that exist in the sources, - // not in test-resources. - // Files created by generateLibraryManifest (see above) should not be handled in here. - // Only manifest.json files in library / application projects should be handled. - // resource.getProject.getNamespace() returns null for all other kind of projects. - const {default: manifestEnhancer} = await import("@ui5/builder/processors/manifestEnhancer"); - await manifestEnhancer({ - resources: [resource], - // Ensure that only files within the manifest's project are accessible - // Using the "runtime" style to match the style used by the UI5 server - fs: fsInterface(resource.getProject().getReader({style: "runtime"})) - }); + const resource = await resources.all.byPath(pathname); + if (!resource) { + // Not found + next(); + return; } const resourcePath = resource.getPath(); - if (rProperties.test(resourcePath)) { - // Special handling for *.properties files escape non ascii characters. - const {default: nonAsciiEscaper} = await import("@ui5/builder/processors/nonAsciiEscaper"); - const project = resource.getProject(); - let propertiesFileSourceEncoding = project?.getPropertiesFileSourceEncoding?.(); - - if (!propertiesFileSourceEncoding) { - if (project && project.getSpecVersion().lte("1.1")) { - // default encoding to "ISO-8859-1" for old specVersions - propertiesFileSourceEncoding = "ISO-8859-1"; - } else { - // default encoding to "UTF-8" for all projects starting with specVersion 2.0 - propertiesFileSourceEncoding = "UTF-8"; - } - } - const encoding = nonAsciiEscaper.getEncodingFromAlias(propertiesFileSourceEncoding); - await nonAsciiEscaper({ - resources: [resource], options: { - encoding - } - }); - } - const {contentType, charset} = middlewareUtil.getMimeInfo(resourcePath); + const {contentType} = middlewareUtil.getMimeInfo(resourcePath); if (!res.getHeader("Content-Type")) { res.setHeader("Content-Type", contentType); } // Enable ETag caching - const statInfo = resource.getStatInfo(); - if (statInfo?.size !== undefined && !resource.isModified()) { - let etagHeader = etag(statInfo); - if (resource.getProject()) { - // Add project version to ETag to invalidate cache when project version changes. - // This is necessary to invalidate files with ${version} placeholders. - etagHeader = etagHeader.slice(0, -1) + `-${resource.getProject().getVersion()}"`; - } - res.setHeader("ETag", etagHeader); - } else { - // Fallback to buffer if stats are not available or insufficient or resource is modified. - // Modified resources must use the buffer for cache invalidation so that UI5 CLI changes - // invalidate the cache even when the original resource is not modified. - res.setHeader("ETag", etag(await resource.getBuffer())); - } + const resourceIntegrity = await resource.getIntegrity(); + res.setHeader("ETag", etag(resourceIntegrity)); if (isFresh(req, res)) { // client has a fresh copy of the resource @@ -122,22 +45,9 @@ function createMiddleware({resources, middlewareUtil}) { return; } - let stream = resource.getStream(); - - // Only execute version replacement for UTF-8 encoded resources because replaceStream will always output - // UTF-8 anyways. - // Also, only process .library, *.js and *.json files. Just like it's done in Application- - // and LibraryBuilder - if ((!charset || charset === "UTF-8") && rReplaceVersion.test(resourcePath)) { - if (resource.getProject()) { - stream.setEncoding("utf8"); - stream = stream.pipe(replaceStream("${version}", resource.getProject().getVersion())); - } else { - log.verbose(`Project missing from resource ${pathname}"`); - } - } - - stream.pipe(res); + // Pipe resource stream to response + // TODO: Check whether we can optimize this for small or even all resources by using getBuffer() + resource.getStream().pipe(res); } catch (err) { next(err); } From 3dfe66e084fe66a8f30ebf15c763e32949412ae9 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Fri, 9 Jan 2026 10:40:00 +0100 Subject: [PATCH 068/110] refactor(project): Add env variable to skip cache update For debugging and testing --- packages/project/lib/build/ProjectBuilder.js | 5 ++++- packages/project/lib/build/cache/ProjectBuildCache.js | 4 +++- packages/project/lib/build/helpers/WatchHandler.js | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 774b31759b3..81995e6be56 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -297,7 +297,7 @@ class ProjectBuilder { pWrites.push(this._writeResults(projectBuildContext, fsTarget)); } - if (!alreadyBuilt.includes(projectName)) { + if (!alreadyBuilt.includes(projectName) && !process.env.UI5_BUILD_NO_CACHE_UPDATE) { this.#log.verbose(`Saving cache...`); const buildManifest = await createBuildManifest( project, @@ -375,6 +375,9 @@ class ProjectBuilder { pWrites.push(this._writeResults(projectBuildContext, fsTarget)); } + if (process.env.UI5_BUILD_NO_CACHE_UPDATE) { + continue; + } this.#log.verbose(`Updating cache...`); const buildManifest = await createBuildManifest( project, diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 31a86938de1..7fd747ff7ec 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -153,9 +153,11 @@ export default class ProjectBuildCache { if (taskCache) { let deltaInfo; if (this.#invalidatedTasks.has(taskName)) { - log.verbose(`Task cache for task ${taskName} has been invalidated, updating indices...`); const invalidationInfo = this.#invalidatedTasks.get(taskName); + log.verbose(`Task cache for task ${taskName} has been invalidated, updating indices ` + + `with ${invalidationInfo.changedProjectResourcePaths.size} changed project resource paths and ` + + `${invalidationInfo.changedDependencyResourcePaths.size} changed dependency resource paths...`); deltaInfo = await taskCache.updateIndices( invalidationInfo.changedProjectResourcePaths, invalidationInfo.changedDependencyResourcePaths, diff --git a/packages/project/lib/build/helpers/WatchHandler.js b/packages/project/lib/build/helpers/WatchHandler.js index f67cfc9cabe..2d55d7b1237 100644 --- a/packages/project/lib/build/helpers/WatchHandler.js +++ b/packages/project/lib/build/helpers/WatchHandler.js @@ -79,8 +79,8 @@ class WatchHandler extends EventEmitter { } #processQueue() { - if (!this.#ready || this.#updateInProgress) { - // Prevent concurrent updates + if (!this.#ready || this.#updateInProgress || !this.#sourceChanges.size) { + // Prevent concurrent or premature processing return; } From 6b6ba858e790938b48c6fbdf98f1696e37fedb05 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Fri, 9 Jan 2026 11:49:47 +0100 Subject: [PATCH 069/110] refactor(project): Fix hash tree updates * Removing resources now properly cleans empty parent directories * Use correct reader for stage signature creation --- .../project/lib/build/cache/BuildTaskCache.js | 9 +- .../lib/build/cache/ProjectBuildCache.js | 12 +- .../project/lib/build/cache/index/HashTree.js | 205 ++++++++++-------- .../lib/build/cache/index/ResourceIndex.js | 49 ++--- .../lib/build/cache/index/TreeRegistry.js | 76 +++++-- packages/project/lib/build/cache/utils.js | 18 +- .../test/lib/build/cache/index/HashTree.js | 123 ++++++++--- .../lib/build/cache/index/TreeRegistry.js | 156 +++++++++++-- 8 files changed, 435 insertions(+), 213 deletions(-) diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index 290b7bf2d89..4ccaf0126f3 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -228,12 +228,10 @@ export default class BuildTaskCache { * a unique combination of resources that were accessed during task execution. * Used to look up cached build stages. * - * @param {module:@ui5/fs.AbstractReader} [projectReader] - Reader for project resources (currently unused) - * @param {module:@ui5/fs.AbstractReader} [dependencyReader] - Reader for dependency resources (currently unused) * @returns {Promise} Array of stage signature strings * @throws {Error} If resource index is missing for any request set */ - async getPossibleStageSignatures(projectReader, dependencyReader) { + async getPossibleStageSignatures() { await this.#initResourceRequests(); const requestSetIds = this.#resourceRequests.getAllNodeIds(); const signatures = requestSetIds.map((requestSetId) => { @@ -287,7 +285,7 @@ export default class BuildTaskCache { let resourceIndex; if (setId) { resourceIndex = this.#resourceRequests.getMetadata(setId).resourceIndex; - // await resourceIndex.updateResources(resourcesRead); // Index was already updated before the task executed + // Index was already updated before the task executed } else { // New request set, check whether we can create a delta const metadata = {}; // Will populate with resourceIndex below @@ -384,7 +382,8 @@ export default class BuildTaskCache { for (const {treeStats} of res) { for (const [tree, stats] of treeStats) { if (stats.removed.length > 0) { - // If resources have been removed, we currently decide to not rely on any cache + // If the update process removed resources from that tree, this means that using it in a + // differential build might lead to stale removed resources return; } const numberOfChanges = stats.added.length + stats.updated.length; diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 7fd747ff7ec..4eacd5d81e8 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -78,7 +78,9 @@ export default class ProjectBuildCache { async #init() { this.#resourceIndex = await this.#initResourceIndex(); this.#buildManifest = await this.#loadBuildManifest(); - this.#requiresInitialBuild = !(await this.#loadIndexCache()); + const hasIndexCache = await this.#loadIndexCache(); + const requiresDepdendencyResources = true; // TODO: Determine dynamically using task caches + this.#requiresInitialBuild = !hasIndexCache || requiresDepdendencyResources; } /** @@ -147,6 +149,8 @@ export default class ProjectBuildCache { async prepareTaskExecution(taskName) { const stageName = this.#getStageNameForTask(taskName); const taskCache = this.#taskCache.get(taskName); + // Store current project reader (= state of the previous stage) for later use (e.g. in recordTaskResult) + this.#currentProjectReader = this.#project.getReader(); // Switch project to new stage this.#project.useStage(stageName); log.verbose(`Preparing task execution for task ${taskName} in project ${this.#project.getName()}...`); @@ -161,7 +165,7 @@ export default class ProjectBuildCache { deltaInfo = await taskCache.updateIndices( invalidationInfo.changedProjectResourcePaths, invalidationInfo.changedDependencyResourcePaths, - this.#project.getReader(), this.#dependencyReader); + this.#currentProjectReader, this.#dependencyReader); } // else: Index will be created upon task completion // After index update, try to find cached stages for the new signatures @@ -191,8 +195,6 @@ export default class ProjectBuildCache { `and ${deltaInfo.changedProjectResourcePaths.size} changed project resource paths and ` + `${deltaInfo.changedDependencyResourcePaths.size} changed dependency resource paths.`); - // Store current project reader for later use in recordTaskResult - this.#currentProjectReader = this.#project.getReader(); return { previousStageCache: deltaStageCache, newSignature: deltaInfo.newSignature, @@ -204,8 +206,6 @@ export default class ProjectBuildCache { } else { log.verbose(`No task cache found`); } - // Store current project reader for later use in recordTaskResult - this.#currentProjectReader = this.#project.getReader(); return false; // Task needs to be executed } diff --git a/packages/project/lib/build/cache/index/HashTree.js b/packages/project/lib/build/cache/index/HashTree.js index d70a221817c..4b4bd264a01 100644 --- a/packages/project/lib/build/cache/index/HashTree.js +++ b/packages/project/lib/build/cache/index/HashTree.js @@ -138,13 +138,13 @@ export default class HashTree { * Initial resources to populate the tree. Each resource should have a path and optional metadata. * @param {object} options * @param {TreeRegistry} [options.registry] Optional registry for coordinated batch updates across multiple trees - * @param {number} [options.indexTimestamp] Timestamp when the resource index was created (for metadata comparison) + * @param {number} [options.indexTimestamp] Timestamp of the latest resource metadata update * @param {TreeNode} [options._root] Internal: pre-existing root node for derived trees (enables structural sharing) */ constructor(resources = null, options = {}) { this.registry = options.registry || null; this.root = options._root || new TreeNode("", "directory"); - this.#indexTimestamp = options.indexTimestamp || Date.now(); + this.#indexTimestamp = options.indexTimestamp; // Register with registry if provided if (this.registry) { @@ -380,8 +380,10 @@ export default class HashTree { return this.#indexTimestamp; } - _updateIndexTimestamp() { - this.#indexTimestamp = Date.now(); + setIndexTimestamp(timestamp) { + if (timestamp) { + this.#indexTimestamp = timestamp; + } } /** @@ -434,86 +436,86 @@ export default class HashTree { return derived; } - /** - * Update multiple resources efficiently. - * - * When a registry is attached, schedules updates for batch processing. - * Otherwise, updates all resources immediately, collecting affected directories - * and recomputing hashes bottom-up for optimal performance. - * - * Skips resources whose metadata hasn't changed (optimization). - * - * @param {Array<@ui5/fs/Resource>} resources - Array of Resource instances to update - * @returns {Promise>} Paths of resources that actually changed - */ - async updateResources(resources) { - if (!resources || resources.length === 0) { - return []; - } - - const changedResources = []; - const affectedPaths = new Set(); - - // Update all resources and collect affected directory paths - for (const resource of resources) { - const resourcePath = resource.getOriginalPath(); - const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); - - // Find the resource node - const node = this._findNode(resourcePath); - if (!node || node.type !== "resource") { - throw new Error(`Resource not found: ${resourcePath}`); - } - - // Create metadata object from current node state - const currentMetadata = { - integrity: node.integrity, - lastModified: node.lastModified, - size: node.size, - inode: node.inode - }; - - // Check whether resource actually changed - const isUnchanged = await matchResourceMetadataStrict(resource, currentMetadata, this.#indexTimestamp); - if (isUnchanged) { - continue; // Skip unchanged resources - } - - // Update resource metadata - node.integrity = await resource.getIntegrity(); - node.lastModified = resource.getLastModified(); - node.size = await resource.getSize(); - node.inode = resource.getInode(); - changedResources.push(resourcePath); - - // Recompute resource hash - this._computeHash(node); - - // Mark all ancestor directories as needing recomputation - for (let i = 0; i < parts.length; i++) { - affectedPaths.add(parts.slice(0, i).join(path.sep)); - } - } - - // Recompute directory hashes bottom-up - const sortedPaths = Array.from(affectedPaths).sort((a, b) => { - // Sort by depth (deeper first) and then alphabetically - const depthA = a.split(path.sep).length; - const depthB = b.split(path.sep).length; - if (depthA !== depthB) return depthB - depthA; - return a.localeCompare(b); - }); - - for (const dirPath of sortedPaths) { - const node = this._findNode(dirPath); - if (node && node.type === "directory") { - this._computeHash(node); - } - } - - this._updateIndexTimestamp(); - return changedResources; - } + // /** + // * Update multiple resources efficiently. + // * + // * When a registry is attached, schedules updates for batch processing. + // * Otherwise, updates all resources immediately, collecting affected directories + // * and recomputing hashes bottom-up for optimal performance. + // * + // * Skips resources whose metadata hasn't changed (optimization). + // * + // * @param {Array<@ui5/fs/Resource>} resources - Array of Resource instances to update + // * @returns {Promise>} Paths of resources that actually changed + // */ + // async updateResources(resources) { + // if (!resources || resources.length === 0) { + // return []; + // } + + // const changedResources = []; + // const affectedPaths = new Set(); + + // // Update all resources and collect affected directory paths + // for (const resource of resources) { + // const resourcePath = resource.getOriginalPath(); + // const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); + + // // Find the resource node + // const node = this._findNode(resourcePath); + // if (!node || node.type !== "resource") { + // throw new Error(`Resource not found: ${resourcePath}`); + // } + + // // Create metadata object from current node state + // const currentMetadata = { + // integrity: node.integrity, + // lastModified: node.lastModified, + // size: node.size, + // inode: node.inode + // }; + + // // Check whether resource actually changed + // const isUnchanged = await matchResourceMetadataStrict(resource, currentMetadata, this.#indexTimestamp); + // if (isUnchanged) { + // continue; // Skip unchanged resources + // } + + // // Update resource metadata + // node.integrity = await resource.getIntegrity(); + // node.lastModified = resource.getLastModified(); + // node.size = await resource.getSize(); + // node.inode = resource.getInode(); + // changedResources.push(resourcePath); + + // // Recompute resource hash + // this._computeHash(node); + + // // Mark all ancestor directories as needing recomputation + // for (let i = 0; i < parts.length; i++) { + // affectedPaths.add(parts.slice(0, i).join(path.sep)); + // } + // } + + // // Recompute directory hashes bottom-up + // const sortedPaths = Array.from(affectedPaths).sort((a, b) => { + // // Sort by depth (deeper first) and then alphabetically + // const depthA = a.split(path.sep).length; + // const depthB = b.split(path.sep).length; + // if (depthA !== depthB) return depthB - depthA; + // return a.localeCompare(b); + // }); + + // for (const dirPath of sortedPaths) { + // const node = this._findNode(dirPath); + // if (node && node.type === "directory") { + // this._computeHash(node); + // } + // } + + // this._updateIndexTimestamp(); + // return changedResources; + // } /** * Upsert multiple resources (insert if new, update if exists). @@ -526,18 +528,19 @@ export default class HashTree { * Skips resources whose metadata hasn't changed (optimization). * * @param {Array<@ui5/fs/Resource>} resources - Array of Resource instances to upsert + * @param {number} newIndexTimestamp Timestamp at which the provided resources have been indexed * @returns {Promise<{added: Array, updated: Array, unchanged: Array}|undefined>} * Status report: arrays of paths by operation type. * Undefined if using registry (results determined during flush). */ - async upsertResources(resources) { + async upsertResources(resources, newIndexTimestamp) { if (!resources || resources.length === 0) { return {added: [], updated: [], unchanged: []}; } if (this.registry) { for (const resource of resources) { - this.registry.scheduleUpsert(resource); + this.registry.scheduleUpsert(resource, newIndexTimestamp); } // When using registry, actual results are determined during flush return; @@ -619,8 +622,7 @@ export default class HashTree { this._computeHash(node); } } - - this._updateIndexTimestamp(); + this.setIndexTimestamp(newIndexTimestamp); return {added, updated, unchanged}; } @@ -662,15 +664,18 @@ export default class HashTree { throw new Error("Cannot remove root"); } - // Navigate to parent + // Navigate to parent, keeping track of the path + const pathNodes = [this.root]; let current = this.root; let pathExists = true; + for (let i = 0; i < parts.length - 1; i++) { if (!current.children.has(parts[i])) { pathExists = false; break; } current = current.children.get(parts[i]); + pathNodes.push(current); } if (!pathExists) { @@ -684,9 +689,26 @@ export default class HashTree { if (wasRemoved) { removed.push(resourcePath); - // Mark ancestors for recomputation + + // Clean up empty parent directories bottom-up + for (let i = parts.length - 1; i > 0; i--) { + const parentNode = pathNodes[i]; + if (parentNode.children.size === 0) { + // Directory is empty, remove it from its parent + const grandparentNode = pathNodes[i - 1]; + grandparentNode.children.delete(parts[i - 1]); + } else { + // Directory still has children, stop cleanup + break; + } + } + + // Mark ancestors for recomputation (only up to where directories still exist) for (let i = 0; i < parts.length; i++) { - affectedPaths.add(parts.slice(0, i).join(path.sep)); + const ancestorPath = parts.slice(0, i).join(path.sep); + if (this._findNode(ancestorPath)) { + affectedPaths.add(ancestorPath); + } } } else { notFound.push(resourcePath); @@ -708,7 +730,6 @@ export default class HashTree { } } - this._updateIndexTimestamp(); return {removed, notFound}; } diff --git a/packages/project/lib/build/cache/index/ResourceIndex.js b/packages/project/lib/build/cache/index/ResourceIndex.js index fc866d0b7a3..18f64371d62 100644 --- a/packages/project/lib/build/cache/index/ResourceIndex.js +++ b/packages/project/lib/build/cache/index/ResourceIndex.js @@ -30,18 +30,15 @@ import {createResourceIndex} from "../utils.js"; */ export default class ResourceIndex { #tree; - #indexTimestamp; /** * Creates a new ResourceIndex instance. * * @param {HashTree} tree - The hash tree containing resource metadata - * @param {number} [indexTimestamp] - Timestamp when the index was created (defaults to current time) * @private */ - constructor(tree, indexTimestamp) { + constructor(tree) { this.#tree = tree; - this.#indexTimestamp = indexTimestamp || Date.now(); } /** @@ -53,12 +50,13 @@ export default class ResourceIndex { * * @param {Array<@ui5/fs/Resource>} resources - Resources to index * @param {TreeRegistry} [registry] - Optional tree registry for structural sharing within trees + * @param {number} indexTimestamp Timestamp at which the provided resources have been indexed * @returns {Promise} A new resource index * @public */ - static async create(resources, registry) { + static async create(resources, registry, indexTimestamp) { const resourceIndex = await createResourceIndex(resources); - const tree = new HashTree(resourceIndex, {registry}); + const tree = new HashTree(resourceIndex, {registry, indexTimestamp}); return new ResourceIndex(tree); } @@ -77,20 +75,21 @@ export default class ResourceIndex { * @param {number} indexCache.indexTimestamp - Timestamp of cached index * @param {object} indexCache.indexTree - Cached hash tree structure * @param {Array<@ui5/fs/Resource>} resources - Current resources to compare against cache + * @param {number} newIndexTimestamp Timestamp at which the provided resources have been indexed * @param {TreeRegistry} [registry] - Optional tree registry for structural sharing within trees * @returns {Promise<{changedPaths: string[], resourceIndex: ResourceIndex}>} * Object containing array of all changed resource paths and the updated index * @public */ - static async fromCacheWithDelta(indexCache, resources, registry) { + static async fromCacheWithDelta(indexCache, resources, newIndexTimestamp, registry) { const {indexTimestamp, indexTree} = indexCache; const tree = HashTree.fromCache(indexTree, {indexTimestamp, registry}); const currentResourcePaths = new Set(resources.map((resource) => resource.getOriginalPath())); - const removed = tree.getResourcePaths().filter((resourcePath) => { + const removedPaths = tree.getResourcePaths().filter((resourcePath) => { return !currentResourcePaths.has(resourcePath); }); - await tree.removeResources(removed); - const {added, updated} = await tree.upsertResources(resources); + const {removed} = await tree.removeResources(removedPaths); + const {added, updated} = await tree.upsertResources(resources, newIndexTimestamp); return { changedPaths: [...added, ...updated, ...removed], resourceIndex: new ResourceIndex(tree), @@ -131,7 +130,7 @@ export default class ResourceIndex { * @public */ clone() { - const cloned = new ResourceIndex(this.#tree.clone(), this.#indexTimestamp); + const cloned = new ResourceIndex(this.#tree.clone()); return cloned; } @@ -155,19 +154,19 @@ export default class ResourceIndex { return new ResourceIndex(this.#tree.deriveTree(resourceIndex)); } - /** - * Updates existing resources in the index. - * - * Updates metadata for resources that already exist in the index. - * Resources not present in the index are ignored. - * - * @param {Array<@ui5/fs/Resource>} resources - Resources to update - * @returns {Promise} Array of paths for resources that were updated - * @public - */ - async updateResources(resources) { - return await this.#tree.updateResources(resources); - } + // /** + // * Updates existing resources in the index. + // * + // * Updates metadata for resources that already exist in the index. + // * Resources not present in the index are ignored. + // * + // * @param {Array<@ui5/fs/Resource>} resources - Resources to update + // * @returns {Promise} Array of paths for resources that were updated + // * @public + // */ + // async updateResources(resources) { + // return await this.#tree.updateResources(resources); + // } /** * Compares this index against a base index and returns metadata @@ -234,7 +233,7 @@ export default class ResourceIndex { */ toCacheObject() { return { - indexTimestamp: this.#indexTimestamp, + indexTimestamp: this.#tree.getIndexTimestamp(), indexTree: this.#tree.toCacheObject(), }; } diff --git a/packages/project/lib/build/cache/index/TreeRegistry.js b/packages/project/lib/build/cache/index/TreeRegistry.js index 1831d5753e0..cba02d73729 100644 --- a/packages/project/lib/build/cache/index/TreeRegistry.js +++ b/packages/project/lib/build/cache/index/TreeRegistry.js @@ -23,6 +23,7 @@ export default class TreeRegistry { trees = new Set(); pendingUpserts = new Map(); pendingRemovals = new Set(); + pendingTimestampUpdate; /** * Register a HashTree instance with this registry for coordinated updates. @@ -48,18 +49,6 @@ export default class TreeRegistry { this.trees.delete(tree); } - /** - * Schedule a resource update to be applied during flush(). - * - * This method delegates to scheduleUpsert() for backward compatibility. - * Prefer using scheduleUpsert() directly for new code. - * - * @param {@ui5/fs/Resource} resource - Resource instance to update - */ - scheduleUpdate(resource) { - this.scheduleUpsert(resource); - } - /** * Schedule a resource upsert (insert or update) to be applied during flush(). * @@ -68,12 +57,14 @@ export default class TreeRegistry { * Scheduling an upsert cancels any pending removal for the same resource path. * * @param {@ui5/fs/Resource} resource - Resource instance to upsert + * @param {number} newIndexTimestamp Timestamp at which the provided resources have been indexed */ - scheduleUpsert(resource) { + scheduleUpsert(resource, newIndexTimestamp) { const resourcePath = resource.getOriginalPath(); this.pendingUpserts.set(resourcePath, resource); // Cancel any pending removal for this path this.pendingRemovals.delete(resourcePath); + this.pendingTimestampUpdate = newIndexTimestamp; } /** @@ -160,7 +151,7 @@ export default class TreeRegistry { for (const tree of this.trees) { const parentNode = tree._findNode(parentPath); if (parentNode && parentNode.type === "directory" && parentNode.children.has(resourceName)) { - treesWithResource.push({tree, parentNode}); + treesWithResource.push({tree, parentNode, pathNodes: this._getPathNodes(tree, parts)}); } } @@ -169,12 +160,34 @@ export default class TreeRegistry { const {parentNode} = treesWithResource[0]; parentNode.children.delete(resourceName); - for (const {tree} of treesWithResource) { + // Clean up empty parent directories in all affected trees + for (const {tree, pathNodes} of treesWithResource) { + // Clean up empty parent directories bottom-up + for (let i = parts.length - 1; i > 0; i--) { + const currentDirNode = pathNodes[i]; + if (currentDirNode && currentDirNode.children.size === 0) { + // Directory is empty, remove it from its parent + const parentDirNode = pathNodes[i - 1]; + if (parentDirNode) { + parentDirNode.children.delete(parts[i - 1]); + } + } else { + // Directory still has children, stop cleanup for this tree + break; + } + } + if (!affectedTrees.has(tree)) { affectedTrees.set(tree, new Set()); } - this._markAncestorsAffected(tree, parts.slice(0, -1), affectedTrees); + // Mark ancestors for recomputation (only up to where directories still exist) + for (let i = 0; i < parts.length; i++) { + const ancestorPath = parts.slice(0, i).join(path.sep); + if (tree._findNode(ancestorPath)) { + affectedTrees.get(tree).add(ancestorPath); + } + } // Track per-tree removal treeStats.get(tree).removed.push(resourcePath); @@ -320,12 +333,15 @@ export default class TreeRegistry { tree._computeHash(node); } } - tree._updateIndexTimestamp(); + if (this.pendingTimestampUpdate) { + tree.setIndexTimestamp(this.pendingTimestampUpdate); + } } // Clear all pending operations this.pendingUpserts.clear(); this.pendingRemovals.clear(); + this.pendingTimestampUpdate = null; return { added: addedResources, @@ -336,6 +352,32 @@ export default class TreeRegistry { }; } + /** + * Get all nodes along a path from root to the target. + * + * Returns an array of TreeNode objects representing the full path, + * starting with root at index 0 and ending with the target node. + * + * @param {import('./HashTree.js').default} tree - Tree to traverse + * @param {string[]} pathParts - Path components to follow + * @returns {Array} Array of TreeNode objects along the path + * @private + */ + _getPathNodes(tree, pathParts) { + const nodes = [tree.root]; + let current = tree.root; + + for (let i = 0; i < pathParts.length - 1; i++) { + if (!current.children.has(pathParts[i])) { + break; + } + current = current.children.get(pathParts[i]); + nodes.push(current); + } + + return nodes; + } + /** * Mark all ancestor directories in a tree as requiring hash recomputation. * diff --git a/packages/project/lib/build/cache/utils.js b/packages/project/lib/build/cache/utils.js index 7bd41ac0b86..2b16d6105ca 100644 --- a/packages/project/lib/build/cache/utils.js +++ b/packages/project/lib/build/cache/utils.js @@ -13,7 +13,7 @@ * * @param {object} resource Resource instance to compare * @param {ResourceMetadata} resourceMetadata Resource metadata to compare against - * @param {number} indexTimestamp Timestamp of the metadata creation + * @param {number} [indexTimestamp] Timestamp of the metadata creation * @returns {Promise} True if resource is found to match the metadata * @throws {Error} If resource or metadata is undefined */ @@ -23,7 +23,7 @@ export async function matchResourceMetadata(resource, resourceMetadata, indexTim } const currentLastModified = resource.getLastModified(); - if (currentLastModified > indexTimestamp) { + if (indexTimestamp && currentLastModified > indexTimestamp) { // Resource modified after index was created, no need for further checks return false; } @@ -59,7 +59,7 @@ export async function matchResourceMetadata(resource, resourceMetadata, indexTim * * @param {object} resource - Resource instance with methods: getInode(), getSize(), getLastModified(), getIntegrity() * @param {ResourceMetadata} cachedMetadata - Cached metadata from the tree - * @param {number} indexTimestamp - Timestamp when the tree state was created + * @param {number} [indexTimestamp] - Timestamp when the tree state was created * @returns {Promise} True if resource content is unchanged * @throws {Error} If resource or metadata is undefined */ @@ -69,16 +69,16 @@ export async function matchResourceMetadataStrict(resource, cachedMetadata, inde } // Check 1: Inode mismatch would indicate file replacement (comparison only if inodes are provided) - const currentInode = resource.getInode(); - if (cachedMetadata.inode !== undefined && currentInode !== undefined && - currentInode !== cachedMetadata.inode) { - return false; - } + // const currentInode = resource.getInode(); + // if (cachedMetadata.inode !== undefined && currentInode !== undefined && + // currentInode !== cachedMetadata.inode) { + // return false; + // } // Check 2: Modification time unchanged would suggest no update needed const currentLastModified = resource.getLastModified(); if (currentLastModified === cachedMetadata.lastModified) { - if (currentLastModified !== indexTimestamp) { + if (indexTimestamp && currentLastModified !== indexTimestamp) { // File has not been modified since last indexing. No update needed return true; } // else: Edge case. File modified exactly at index time diff --git a/packages/project/test/lib/build/cache/index/HashTree.js b/packages/project/test/lib/build/cache/index/HashTree.js index 3d9711962a0..7617852893c 100644 --- a/packages/project/test/lib/build/cache/index/HashTree.js +++ b/packages/project/test/lib/build/cache/index/HashTree.js @@ -69,8 +69,8 @@ test("Updating resources in two trees produces same root hash", async (t) => { // Update same resource in both trees const resource = createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1); - await tree1.updateResources([resource]); - await tree2.updateResources([resource]); + await tree1.upsertResources([resource]); + await tree2.upsertResources([resource]); t.is(tree1.getRootHash(), tree2.getRootHash(), "Trees should have same root hash after identical updates"); @@ -89,13 +89,13 @@ test("Multiple updates in same order produce same root hash", async (t) => { const indexTimestamp = tree1.getIndexTimestamp(); // Update multiple resources in same order - await tree1.updateResources([createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)]); - await tree1.updateResources([createMockResource("dir/d.js", "new-hash-d", indexTimestamp + 1, 401, 4)]); - await tree1.updateResources([createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)]); + await tree1.upsertResources([createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)]); + await tree1.upsertResources([createMockResource("dir/d.js", "new-hash-d", indexTimestamp + 1, 401, 4)]); + await tree1.upsertResources([createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)]); - await tree2.updateResources([createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)]); - await tree2.updateResources([createMockResource("dir/d.js", "new-hash-d", indexTimestamp + 1, 401, 4)]); - await tree2.updateResources([createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)]); + await tree2.upsertResources([createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)]); + await tree2.upsertResources([createMockResource("dir/d.js", "new-hash-d", indexTimestamp + 1, 401, 4)]); + await tree2.upsertResources([createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)]); t.is(tree1.getRootHash(), tree2.getRootHash(), "Trees should have same root hash after same sequence of updates"); @@ -113,13 +113,13 @@ test("Multiple updates in different order produce same root hash", async (t) => const indexTimestamp = tree1.getIndexTimestamp(); // Update in different orders - await tree1.updateResources([createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)]); - await tree1.updateResources([createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)]); - await tree1.updateResources([createMockResource("c.js", "new-hash-c", indexTimestamp + 1, 301, 3)]); + await tree1.upsertResources([createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)]); + await tree1.upsertResources([createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)]); + await tree1.upsertResources([createMockResource("c.js", "new-hash-c", indexTimestamp + 1, 301, 3)]); - await tree2.updateResources([createMockResource("c.js", "new-hash-c", indexTimestamp + 1, 301, 3)]); - await tree2.updateResources([createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)]); - await tree2.updateResources([createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)]); + await tree2.upsertResources([createMockResource("c.js", "new-hash-c", indexTimestamp + 1, 301, 3)]); + await tree2.upsertResources([createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)]); + await tree2.upsertResources([createMockResource("b.js", "new-hash-b", indexTimestamp + 1, 201, 2)]); t.is(tree1.getRootHash(), tree2.getRootHash(), "Trees should have same root hash regardless of update order"); @@ -137,15 +137,15 @@ test("Batch updates produce same hash as individual updates", async (t) => { const indexTimestamp = tree1.getIndexTimestamp(); // Individual updates - await tree1.updateResources([createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)]); - await tree1.updateResources([createMockResource("file2.js", "new-hash2", indexTimestamp + 1, 201, 2)]); + await tree1.upsertResources([createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)]); + await tree1.upsertResources([createMockResource("file2.js", "new-hash2", indexTimestamp + 1, 201, 2)]); // Batch update const resources = [ createMockResource("file1.js", "new-hash1", 1001, 101, 1), createMockResource("file2.js", "new-hash2", 2001, 201, 2) ]; - await tree2.updateResources(resources); + await tree2.upsertResources(resources); t.is(tree1.getRootHash(), tree2.getRootHash(), "Batch updates should produce same hash as individual updates"); @@ -161,7 +161,7 @@ test("Updating resource changes root hash", async (t) => { const originalHash = tree.getRootHash(); const indexTimestamp = tree.getIndexTimestamp(); - await tree.updateResources([createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)]); + await tree.upsertResources([createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)]); const newHash = tree.getRootHash(); t.not(originalHash, newHash, @@ -179,8 +179,8 @@ test("Updating resource back to original value restores original hash", async (t const indexTimestamp = tree.getIndexTimestamp(); // Update and then revert - await tree.updateResources([createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)]); - await tree.updateResources([createMockResource("file1.js", "hash1", 1000, 100, 1)]); + await tree.upsertResources([createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1)]); + await tree.upsertResources([createMockResource("file1.js", "hash1", 1000, 100, 1)]); t.is(tree.getRootHash(), originalHash, "Root hash should be restored when resource is reverted to original value"); @@ -193,11 +193,11 @@ test("updateResource returns changed resource path", async (t) => { const tree = new HashTree(resources); const indexTimestamp = tree.getIndexTimestamp(); - const changed = await tree.updateResources([ + const {updated} = await tree.upsertResources([ createMockResource("file1.js", "new-hash1", indexTimestamp + 1, 101, 1) ]); - t.deepEqual(changed, ["file1.js"], "Should return path of changed resource"); + t.deepEqual(updated, ["file1.js"], "Should return path of changed resource"); }); test("updateResource returns empty array when integrity unchanged", async (t) => { @@ -206,9 +206,9 @@ test("updateResource returns empty array when integrity unchanged", async (t) => ]; const tree = new HashTree(resources); - const changed = await tree.updateResources([createMockResource("file1.js", "hash1", 1000, 100, 1)]); + const {updated} = await tree.upsertResources([createMockResource("file1.js", "hash1", 1000, 100, 1)]); - t.deepEqual(changed, [], "Should return empty array when integrity unchanged"); + t.deepEqual(updated, [], "Should return empty array when integrity unchanged"); }); test("updateResource does not change hash when integrity unchanged", async (t) => { @@ -218,12 +218,12 @@ test("updateResource does not change hash when integrity unchanged", async (t) = const tree = new HashTree(resources); const originalHash = tree.getRootHash(); - await tree.updateResources([createMockResource("file1.js", "hash1", 1000, 100, 1)]); + await tree.upsertResources([createMockResource("file1.js", "hash1", 1000, 100, 1)]); t.is(tree.getRootHash(), originalHash, "Hash should not change when integrity unchanged"); }); -test("updateResources returns changed resource paths", async (t) => { +test("upsertResources returns changed resource paths", async (t) => { const resources = [ {path: "file1.js", integrity: "hash1", lastModified: 1000, size: 100}, {path: "file2.js", integrity: "hash2", lastModified: 2000, size: 200}, @@ -238,12 +238,12 @@ test("updateResources returns changed resource paths", async (t) => { createMockResource("file2.js", "hash2", 2000, 200, 2), // unchanged createMockResource("file3.js", "new-hash3", indexTimestamp + 1, 301, 3) // Changed ]; - const changed = await tree.updateResources(resourceUpdates); + const {updated} = await tree.upsertResources(resourceUpdates); - t.deepEqual(changed, ["file1.js", "file3.js"], "Should return only changed paths"); + t.deepEqual(updated, ["file1.js", "file3.js"], "Should return only updated paths"); }); -test("updateResources returns empty array when no changes", async (t) => { +test("upsertResources returns empty array when no changes", async (t) => { const resources = [ {path: "file1.js", integrity: "hash1", lastModified: 1000, size: 100}, {path: "file2.js", integrity: "hash2", lastModified: 2000, size: 200} @@ -254,9 +254,9 @@ test("updateResources returns empty array when no changes", async (t) => { createMockResource("file1.js", "hash1", 1000, 100, 1), createMockResource("file2.js", "hash2", 2000, 200, 2) ]; - const changed = await tree.updateResources(resourceUpdates); + const {updated} = await tree.upsertResources(resourceUpdates); - t.deepEqual(changed, [], "Should return empty array when no changes"); + t.deepEqual(updated, [], "Should return empty array when no changes"); }); test("Different nested structures with same resources produce different hashes", (t) => { @@ -286,12 +286,12 @@ test("Updating unrelated resource doesn't affect consistency", async (t) => { const tree2 = new HashTree(initialResources); // Update different resources - await tree1.updateResources([createMockResource("file1.js", "new-hash1", Date.now(), 1024, 789)]); - await tree2.updateResources([createMockResource("file1.js", "new-hash1", Date.now(), 1024, 789)]); + await tree1.upsertResources([createMockResource("file1.js", "new-hash1", Date.now(), 1024, 789)]); + await tree2.upsertResources([createMockResource("file1.js", "new-hash1", Date.now(), 1024, 789)]); // Update an unrelated resource in both - await tree1.updateResources([createMockResource("dir/file3.js", "new-hash3", Date.now(), 2048, 790)]); - await tree2.updateResources([createMockResource("dir/file3.js", "new-hash3", Date.now(), 2048, 790)]); + await tree1.upsertResources([createMockResource("dir/file3.js", "new-hash3", Date.now(), 2048, 790)]); + await tree2.upsertResources([createMockResource("dir/file3.js", "new-hash3", Date.now(), 2048, 790)]); t.is(tree1.getRootHash(), tree2.getRootHash(), "Trees should remain consistent after updating multiple resources"); @@ -452,6 +452,57 @@ test("removeResources - remove from nested directory", async (t) => { t.truthy(tree.hasPath("dir1/c.js"), "Should still have dir1/c.js"); }); +test("removeResources - removing last resource in directory cleans up directory", async (t) => { + const tree = new HashTree([ + {path: "dir1/dir2/only.js", integrity: "hash-only"}, + {path: "dir1/other.js", integrity: "hash-other"} + ]); + + // Verify structure before removal + t.truthy(tree.hasPath("dir1/dir2/only.js"), "Should have dir1/dir2/only.js"); + t.truthy(tree._findNode("dir1/dir2"), "Directory dir1/dir2 should exist"); + + // Remove the only resource in dir2 + const result = await tree.removeResources(["dir1/dir2/only.js"]); + + t.deepEqual(result.removed, ["dir1/dir2/only.js"], "Should remove resource"); + t.false(tree.hasPath("dir1/dir2/only.js"), "Should not have dir1/dir2/only.js"); + + // Check if empty directory is cleaned up + const dir2Node = tree._findNode("dir1/dir2"); + t.is(dir2Node, null, "Empty directory dir1/dir2 should be removed"); + + // Parent directory should still exist with other.js + t.truthy(tree.hasPath("dir1/other.js"), "Should still have dir1/other.js"); + t.truthy(tree._findNode("dir1"), "Parent directory dir1 should still exist"); +}); + +test("removeResources - cleans up deeply nested empty directories", async (t) => { + const tree = new HashTree([ + {path: "a/b/c/d/e/deep.js", integrity: "hash-deep"}, + {path: "a/sibling.js", integrity: "hash-sibling"} + ]); + + // Verify structure before removal + t.truthy(tree.hasPath("a/b/c/d/e/deep.js"), "Should have deeply nested file"); + t.truthy(tree._findNode("a/b/c/d/e"), "Deep directory should exist"); + + // Remove the only resource in the deep hierarchy + const result = await tree.removeResources(["a/b/c/d/e/deep.js"]); + + t.deepEqual(result.removed, ["a/b/c/d/e/deep.js"], "Should remove resource"); + + // All empty directories in the chain should be removed + t.is(tree._findNode("a/b/c/d/e"), null, "Directory e should be removed"); + t.is(tree._findNode("a/b/c/d"), null, "Directory d should be removed"); + t.is(tree._findNode("a/b/c"), null, "Directory c should be removed"); + t.is(tree._findNode("a/b"), null, "Directory b should be removed"); + + // Parent directory with sibling should still exist + t.truthy(tree._findNode("a"), "Directory a should still exist (has sibling.js)"); + t.truthy(tree.hasPath("a/sibling.js"), "Sibling file should still exist"); +}); + test("deriveTree - copies only modified directories (copy-on-write)", (t) => { const tree1 = new HashTree([ {path: "shared/a.js", integrity: "hash-a"}, @@ -532,7 +583,7 @@ test("deriveTree - changes propagate to derived trees (shared view)", async (t) // When tree1 is updated, tree2 sees the change (filtered view behavior) const indexTimestamp = tree1.getIndexTimestamp(); - await tree1.updateResources([ + await tree1.upsertResources([ createMockResource("shared/a.js", "new-hash-a", indexTimestamp + 1, 101, 1) ]); diff --git a/packages/project/test/lib/build/cache/index/TreeRegistry.js b/packages/project/test/lib/build/cache/index/TreeRegistry.js index 455c863ffa5..41e8f1ece93 100644 --- a/packages/project/test/lib/build/cache/index/TreeRegistry.js +++ b/packages/project/test/lib/build/cache/index/TreeRegistry.js @@ -38,7 +38,7 @@ test("TreeRegistry - schedule and flush updates", async (t) => { const originalHash = tree.getRootHash(); const resource = createMockResource("file.js", "hash2", Date.now(), 2048, 456); - registry.scheduleUpdate(resource); + registry.scheduleUpsert(resource); t.is(registry.getPendingUpdateCount(), 1, "Should have one pending update"); const result = await registry.flush(); @@ -58,8 +58,8 @@ test("TreeRegistry - flush returns only changed resources", async (t) => { ]; new HashTree(resources, {registry}); - registry.scheduleUpdate(createMockResource("file1.js", "new-hash1", timestamp, 1024, 123)); - registry.scheduleUpdate(createMockResource("file2.js", "hash2", timestamp, 2048, 124)); // unchanged + registry.scheduleUpsert(createMockResource("file1.js", "new-hash1", timestamp, 1024, 123)); + registry.scheduleUpsert(createMockResource("file2.js", "hash2", timestamp, 2048, 124)); // unchanged const result = await registry.flush(); t.deepEqual(result.updated, ["file1.js"], "Should return only changed resource"); @@ -71,7 +71,7 @@ test("TreeRegistry - flush returns empty array when no changes", async (t) => { const resources = [{path: "file.js", integrity: "hash1", lastModified: timestamp, size: 1024, inode: 123}]; new HashTree(resources, {registry}); - registry.scheduleUpdate(createMockResource("file.js", "hash1", timestamp, 1024, 123)); // same value + registry.scheduleUpsert(createMockResource("file.js", "hash1", timestamp, 1024, 123)); // same value const result = await registry.flush(); t.deepEqual(result.updated, [], "Should return empty array when no actual changes"); @@ -98,7 +98,7 @@ test("TreeRegistry - batch updates affect all trees sharing nodes", async (t) => t.is(sharedDir1, sharedDir2, "Should share the same 'shared' directory node"); // Update shared resource - registry.scheduleUpdate(createMockResource("shared/a.js", "new-hash-a", Date.now(), 2048, 999)); + registry.scheduleUpsert(createMockResource("shared/a.js", "new-hash-a", Date.now(), 2048, 999)); const result = await registry.flush(); t.deepEqual(result.updated, ["shared/a.js"], "Should report the updated resource"); @@ -123,7 +123,7 @@ test("TreeRegistry - handles missing resources gracefully during flush", async ( new HashTree([{path: "exists.js", integrity: "hash1"}], {registry}); // Schedule update for non-existent resource - registry.scheduleUpdate(createMockResource("missing.js", "hash2", Date.now(), 1024, 444)); + registry.scheduleUpsert(createMockResource("missing.js", "hash2", Date.now(), 1024, 444)); // Should not throw await t.notThrows(async () => await registry.flush(), "Should handle missing resources gracefully"); @@ -134,9 +134,9 @@ test("TreeRegistry - multiple updates to same resource", async (t) => { const tree = new HashTree([{path: "file.js", integrity: "v1"}], {registry}); const timestamp = Date.now(); - registry.scheduleUpdate(createMockResource("file.js", "v2", timestamp, 1024, 100)); - registry.scheduleUpdate(createMockResource("file.js", "v3", timestamp + 1, 1024, 100)); - registry.scheduleUpdate(createMockResource("file.js", "v4", timestamp + 2, 1024, 100)); + registry.scheduleUpsert(createMockResource("file.js", "v2", timestamp, 1024, 100)); + registry.scheduleUpsert(createMockResource("file.js", "v3", timestamp + 1, 1024, 100)); + registry.scheduleUpsert(createMockResource("file.js", "v4", timestamp + 2, 1024, 100)); t.is(registry.getPendingUpdateCount(), 1, "Should consolidate updates to same path"); @@ -159,7 +159,7 @@ test("TreeRegistry - updates without changes lead to same hash", async (t) => { const initialHash = tree.getRootHash(); const file2Hash = tree.getResourceByPath("/src/foo/file2.js").hash; - registry.scheduleUpdate(createMockResource("/src/foo/file2.js", "v1", timestamp, 1024, 200)); + registry.scheduleUpsert(createMockResource("/src/foo/file2.js", "v1", timestamp, 1024, 200)); t.is(registry.getPendingUpdateCount(), 1, "Should have one pending update"); @@ -182,7 +182,7 @@ test("TreeRegistry - unregister tree", async (t) => { t.is(registry.getTreeCount(), 1); // Flush should only affect tree2 - registry.scheduleUpdate(createMockResource("b.js", "new-hash2", Date.now(), 1024, 777)); + registry.scheduleUpsert(createMockResource("b.js", "new-hash2", Date.now(), 1024, 777)); await registry.flush(); t.notThrows(() => tree2.getRootHash(), "Tree2 should still work"); @@ -247,7 +247,7 @@ test("deriveTree - updates to shared nodes visible in all trees", async (t) => { t.is(node1Before.integrity, "original", "Original integrity"); // Update via registry - registry.scheduleUpdate(createMockResource("shared/file.js", "updated", Date.now(), 1024, 555)); + registry.scheduleUpsert(createMockResource("shared/file.js", "updated", Date.now(), 1024, 555)); await registry.flush(); // Both should see the update (same node) @@ -267,7 +267,7 @@ test("deriveTree - multiple levels of derivation", async (t) => { t.truthy(tree3.hasPath("c.js"), "Should have its own resources"); // Update shared resource - registry.scheduleUpdate(createMockResource("a.js", "new-hash-a", Date.now(), 1024, 111)); + registry.scheduleUpsert(createMockResource("a.js", "new-hash-a", Date.now(), 1024, 111)); await registry.flush(); // All trees should see the update @@ -292,7 +292,7 @@ test("deriveTree - efficient hash recomputation", async (t) => { const compute2Spy = sinon.spy(tree2, "_computeHash"); // Update resource in shared directory - registry.scheduleUpdate(createMockResource("dir1/a.js", "new-hash-a", Date.now(), 2048, 222)); + registry.scheduleUpsert(createMockResource("dir1/a.js", "new-hash-a", Date.now(), 2048, 222)); await registry.flush(); // Each affected directory should be hashed once per tree @@ -314,7 +314,7 @@ test("deriveTree - independent updates to different directories", async (t) => { const hash2Before = tree2.getRootHash(); // Update only in tree2's unique directory - registry.scheduleUpdate(createMockResource("dir2/b.js", "new-hash-b", Date.now(), 1024, 333)); + registry.scheduleUpsert(createMockResource("dir2/b.js", "new-hash-b", Date.now(), 1024, 333)); await registry.flush(); const hash1After = tree1.getRootHash(); @@ -383,7 +383,7 @@ test("deriveTree - complex shared structure", async (t) => { ]); // Update deeply nested shared file - registry.scheduleUpdate(createMockResource("shared/deep/nested/file1.js", "new-hash1", Date.now(), 2048, 666)); + registry.scheduleUpsert(createMockResource("shared/deep/nested/file1.js", "new-hash1", Date.now(), 2048, 666)); await registry.flush(); // Both trees should reflect the change @@ -516,6 +516,116 @@ test("removeResources - with derived trees propagates removal", async (t) => { t.truthy(tree2.hasPath("unique/c.js"), "Tree2 should still have unique/c.js"); }); +test("removeResources - with registry cleans up empty directories", async (t) => { + const registry = new TreeRegistry(); + const tree = new HashTree([ + {path: "dir1/dir2/only.js", integrity: "hash-only"}, + {path: "dir1/other.js", integrity: "hash-other"} + ], {registry}); + + // Verify structure before removal + t.truthy(tree.hasPath("dir1/dir2/only.js"), "Should have dir1/dir2/only.js"); + t.truthy(tree._findNode("dir1/dir2"), "Directory dir1/dir2 should exist"); + + // Remove the only resource in dir2 + await tree.removeResources(["dir1/dir2/only.js"]); + const result = await registry.flush(); + + t.true(result.removed.includes("dir1/dir2/only.js"), "Should report resource as removed"); + t.false(tree.hasPath("dir1/dir2/only.js"), "Should not have dir1/dir2/only.js"); + + // Check if empty directory is cleaned up + const dir2Node = tree._findNode("dir1/dir2"); + t.is(dir2Node, null, "Empty directory dir1/dir2 should be removed"); + + // Parent directory should still exist with other.js + t.truthy(tree.hasPath("dir1/other.js"), "Should still have dir1/other.js"); + t.truthy(tree._findNode("dir1"), "Parent directory dir1 should still exist"); +}); + +test("removeResources - with registry cleans up deeply nested empty directories", async (t) => { + const registry = new TreeRegistry(); + const tree = new HashTree([ + {path: "a/b/c/d/e/deep.js", integrity: "hash-deep"}, + {path: "a/sibling.js", integrity: "hash-sibling"} + ], {registry}); + + // Verify structure before removal + t.truthy(tree.hasPath("a/b/c/d/e/deep.js"), "Should have deeply nested file"); + t.truthy(tree._findNode("a/b/c/d/e"), "Deep directory should exist"); + + // Remove the only resource in the deep hierarchy + await tree.removeResources(["a/b/c/d/e/deep.js"]); + const result = await registry.flush(); + + t.true(result.removed.includes("a/b/c/d/e/deep.js"), "Should report resource as removed"); + + // All empty directories in the chain should be removed + t.is(tree._findNode("a/b/c/d/e"), null, "Directory e should be removed"); + t.is(tree._findNode("a/b/c/d"), null, "Directory d should be removed"); + t.is(tree._findNode("a/b/c"), null, "Directory c should be removed"); + t.is(tree._findNode("a/b"), null, "Directory b should be removed"); + + // Parent directory with sibling should still exist + t.truthy(tree._findNode("a"), "Directory a should still exist (has sibling.js)"); + t.truthy(tree.hasPath("a/sibling.js"), "Sibling file should still exist"); +}); + +test("removeResources - with derived trees cleans up empty directories in both trees", async (t) => { + const registry = new TreeRegistry(); + const tree1 = new HashTree([ + {path: "shared/dir/only.js", integrity: "hash-only"}, + {path: "shared/other.js", integrity: "hash-other"} + ], {registry}); + const tree2 = tree1.deriveTree([{path: "unique/file.js", integrity: "hash-unique"}]); + + // Verify both trees share the directory structure + const sharedDirBefore = tree1.root.children.get("shared").children.get("dir"); + const sharedDirBefore2 = tree2.root.children.get("shared").children.get("dir"); + t.is(sharedDirBefore, sharedDirBefore2, "Should share the same 'shared/dir' node"); + + // Remove the only resource in shared/dir + await tree1.removeResources(["shared/dir/only.js"]); + await registry.flush(); + + // Both trees should see empty directory removal + t.is(tree1._findNode("shared/dir"), null, "Tree1: empty directory should be removed"); + t.is(tree2._findNode("shared/dir"), null, "Tree2: empty directory should be removed"); + + // Shared parent directory should still exist with other.js + t.truthy(tree1._findNode("shared"), "Tree1: shared directory should still exist"); + t.truthy(tree2._findNode("shared"), "Tree2: shared directory should still exist"); + t.truthy(tree1.hasPath("shared/other.js"), "Tree1 should still have shared/other.js"); + t.truthy(tree2.hasPath("shared/other.js"), "Tree2 should still have shared/other.js"); + + // Tree2's unique content should be unaffected + t.truthy(tree2.hasPath("unique/file.js"), "Tree2 should still have unique file"); +}); + +test("removeResources - multiple removals with registry clean up shared empty directories", async (t) => { + const registry = new TreeRegistry(); + const tree = new HashTree([ + {path: "dir1/sub1/file1.js", integrity: "hash1"}, + {path: "dir1/sub2/file2.js", integrity: "hash2"}, + {path: "dir2/file3.js", integrity: "hash3"} + ], {registry}); + + // Remove both files from dir1 (making both sub1 and sub2 empty) + await tree.removeResources(["dir1/sub1/file1.js", "dir1/sub2/file2.js"]); + await registry.flush(); + + // Both subdirectories should be cleaned up + t.is(tree._findNode("dir1/sub1"), null, "sub1 should be removed"); + t.is(tree._findNode("dir1/sub2"), null, "sub2 should be removed"); + + // dir1 should also be removed since it's now empty + const dir1 = tree._findNode("dir1"); + t.is(dir1, null, "dir1 should be removed (now empty)"); + + // dir2 should be unaffected + t.truthy(tree.hasPath("dir2/file3.js"), "dir2/file3.js should still exist"); +}); + // ============================================================================ // Combined upsert and remove operations with Registry // ============================================================================ @@ -573,7 +683,7 @@ test("TreeRegistry - flush returns per-tree statistics", async (t) => { const tree2 = new HashTree([{path: "b.js", integrity: "hash-b"}], {registry}); // Update tree1 resource - registry.scheduleUpdate(createMockResource("a.js", "new-hash-a", Date.now(), 1024, 1)); + registry.scheduleUpsert(createMockResource("a.js", "new-hash-a", Date.now(), 1024, 1)); // Add new resource - gets added to all trees registry.scheduleUpsert(createMockResource("c.js", "hash-c", Date.now(), 2048, 2)); @@ -626,7 +736,7 @@ test("TreeRegistry - per-tree statistics with shared nodes", async (t) => { t.is(sharedDir1, sharedDir2, "Should share the same 'shared' directory node"); // Update shared resource - registry.scheduleUpdate(createMockResource("shared/a.js", "new-hash-a", Date.now(), 1024, 1)); + registry.scheduleUpsert(createMockResource("shared/a.js", "new-hash-a", Date.now(), 1024, 1)); const result = await registry.flush(); @@ -660,13 +770,13 @@ test("TreeRegistry - per-tree statistics with mixed operations", async (t) => { const tree2 = tree1.deriveTree([{path: "d.js", integrity: "hash-d"}]); // Update a.js (affects both trees - shared) - registry.scheduleUpdate(createMockResource("a.js", "new-hash-a", Date.now(), 1024, 1)); + registry.scheduleUpsert(createMockResource("a.js", "new-hash-a", Date.now(), 1024, 1)); // Remove b.js (affects both trees - shared) registry.scheduleRemoval("b.js"); // Add e.js (affects both trees) registry.scheduleUpsert(createMockResource("e.js", "hash-e", Date.now(), 2048, 5)); // Update d.js (exists in tree2, will be added to tree1) - registry.scheduleUpdate(createMockResource("d.js", "new-hash-d", Date.now(), 1024, 4)); + registry.scheduleUpsert(createMockResource("d.js", "new-hash-d", Date.now(), 1024, 4)); const result = await registry.flush(); @@ -715,8 +825,8 @@ test("TreeRegistry - per-tree statistics with no changes", async (t) => { // Schedule updates with unchanged metadata // Note: These will add missing resources to the other tree - registry.scheduleUpdate(createMockResource("a.js", "hash-a", timestamp, 1024, 100)); - registry.scheduleUpdate(createMockResource("b.js", "hash-b", timestamp, 2048, 200)); + registry.scheduleUpsert(createMockResource("a.js", "hash-a", timestamp, 1024, 100)); + registry.scheduleUpsert(createMockResource("b.js", "hash-b", timestamp, 2048, 200)); const result = await registry.flush(); @@ -788,7 +898,7 @@ test("TreeRegistry - derived tree reflects base tree resource changes in statist t.is(sharedDir1, sharedDir2, "Both trees should share the 'shared' directory node"); // Update a resource that exists in base tree (and is shared with derived tree) - registry.scheduleUpdate(createMockResource("shared/resource1.js", "new-hash1", Date.now(), 2048, 100)); + registry.scheduleUpsert(createMockResource("shared/resource1.js", "new-hash1", Date.now(), 2048, 100)); // Add a new resource to the shared path registry.scheduleUpsert(createMockResource("shared/resource4.js", "hash4", Date.now(), 1024, 200)); From f3dbb50a2a9dcd6f962c7baff300605147bdce42 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Fri, 9 Jan 2026 15:00:48 +0100 Subject: [PATCH 070/110] refactor(project): Remove unused 'cacheDir' param --- packages/project/lib/graph/ProjectGraph.js | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/packages/project/lib/graph/ProjectGraph.js b/packages/project/lib/graph/ProjectGraph.js index c673734d1de..5a3b4576bcf 100644 --- a/packages/project/lib/graph/ProjectGraph.js +++ b/packages/project/lib/graph/ProjectGraph.js @@ -632,7 +632,6 @@ class ProjectGraph { * @param {Array.} [parameters.excludedTasks=[]] List of tasks to be excluded. * @param {module:@ui5/project/build/ProjectBuilderOutputStyle} [parameters.outputStyle=Default] * Processes build results into a specific directory structure. - * @param {string} [parameters.cacheDir] Path to the cache directory * @param {boolean} [parameters.watch] Whether to watch for file changes and re-execute the build automatically * @returns {Promise} Promise resolving to undefined once build has finished */ @@ -643,7 +642,7 @@ class ProjectGraph { selfContained = false, cssVariables = false, jsdoc = false, createBuildManifest = false, includedTasks = [], excludedTasks = [], outputStyle = OutputStyleEnum.Default, - cacheDir, watch, + watch, }) { this.seal(); // Do not allow further changes to the graph if (this._built) { @@ -668,7 +667,6 @@ class ProjectGraph { destPath, cleanDest, includedDependencies, excludedDependencies, dependencyIncludes, - // cacheDir, // FIXME/TODO: Not implemented yet watch, }); } From 0d96ab39082284757c0ec39b077a018a487e0e1c Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Fri, 9 Jan 2026 18:10:40 +0100 Subject: [PATCH 071/110] fix(project): Prevent projects from being always invalidated --- packages/project/lib/build/cache/ProjectBuildCache.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 4eacd5d81e8..3bf2a683bc6 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -147,6 +147,8 @@ export default class ProjectBuildCache { * @returns {Promise} True or object if task can use cache, false otherwise */ async prepareTaskExecution(taskName) { + // Remove initial build requirement once first task is prepared + this.#requiresInitialBuild = false; const stageName = this.#getStageNameForTask(taskName); const taskCache = this.#taskCache.get(taskName); // Store current project reader (= state of the previous stage) for later use (e.g. in recordTaskResult) From 39f6fb013e37d3f9c519d97e961f214174896444 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Mon, 12 Jan 2026 12:01:39 +0100 Subject: [PATCH 072/110] fix(project): Prevent exception when not building in watch mode --- packages/project/lib/build/ProjectBuilder.js | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 81995e6be56..5610899bff3 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -219,12 +219,15 @@ class ProjectBuilder { }); } - const [, watchHandler] = await Promise.all([ - this.#build(queue, projectBuildContexts, requestedProjects, fsTarget), - pWatchInit - ]); - watchHandler.setReady(); - return watchHandler; + await this.#build(queue, projectBuildContexts, requestedProjects, fsTarget); + + if (watch) { + const watchHandler = await pWatchInit; + watchHandler.setReady(); + return watchHandler; + } else { + return null; + } } async #build(queue, projectBuildContexts, requestedProjects, fsTarget) { From 218280e7ea69f471b82d5176038009a4b0e7a611 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Fri, 9 Jan 2026 15:27:08 +0100 Subject: [PATCH 073/110] refactor(project): Only store new or modified cache entries --- .../project/lib/build/cache/BuildTaskCache.js | 13 +++++++++-- .../lib/build/cache/ProjectBuildCache.js | 23 +++++++++++++++---- 2 files changed, 30 insertions(+), 6 deletions(-) diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index 4ccaf0126f3..b9220376d19 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -43,6 +43,7 @@ export default class BuildTaskCache { #readTaskMetadataCache; #treeRegistries = []; #useDifferentialUpdate = true; + #isNewOrModified; // ===== LIFECYCLE ===== @@ -66,6 +67,7 @@ export default class BuildTaskCache { if (!this.#readTaskMetadataCache) { // No cache reader provided, start with empty graph this.#resourceRequests = new ResourceRequestGraph(); + this.#isNewOrModified = true; return; } @@ -76,6 +78,7 @@ export default class BuildTaskCache { `of project '${this.#projectName}'`); } this.#resourceRequests = this.#restoreGraphFromCache(taskMetadata); + this.#isNewOrModified = false; } // ===== METADATA ACCESS ===== @@ -89,6 +92,10 @@ export default class BuildTaskCache { return this.#taskName; } + isNewOrModified() { + return this.#isNewOrModified; + } + /** * Updates resource indices for request sets affected by changed resources * @@ -284,14 +291,14 @@ export default class BuildTaskCache { let setId = this.#resourceRequests.findExactMatch(requests); let resourceIndex; if (setId) { + // Reuse existing resource index. + // Note: This index has already been updated before the task executed, so no update is necessary here resourceIndex = this.#resourceRequests.getMetadata(setId).resourceIndex; - // Index was already updated before the task executed } else { // New request set, check whether we can create a delta const metadata = {}; // Will populate with resourceIndex below setId = this.#resourceRequests.addRequestSet(requests, metadata); - const requestSet = this.#resourceRequests.getNode(setId); const parentId = requestSet.getParentId(); if (parentId) { @@ -398,6 +405,8 @@ export default class BuildTaskCache { if (!relevantTree) { return; } + this.#isNewOrModified = true; + // Update signatures for affected request sets const {requestSetId, signature: originalSignature} = trees.get(relevantTree); const newSignature = relevantTree.getRootHash(); diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 3bf2a683bc6..46d20b53534 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -33,6 +33,7 @@ export default class ProjectBuildCache { #dependencyReader; #resourceIndex; #requiresInitialBuild; + #isNewOrModified; #invalidatedTasks = new Map(); @@ -332,6 +333,7 @@ export default class ProjectBuildCache { } // Reset current project reader this.#currentProjectReader = null; + this.#isNewOrModified = true; } /** @@ -579,6 +581,7 @@ export default class ProjectBuildCache { stageId, stageSignature, stageCache.resourceMetadata); this.#project.setResultStage(reader); this.#project.useResultStage(); + this.#isNewOrModified = false; return true; } @@ -695,9 +698,10 @@ export default class ProjectBuildCache { * @returns {Promise} */ async storeCache(buildManifest) { - log.verbose(`Storing build cache for project ${this.#project.getName()} ` + - `with build signature ${this.#buildSignature}`); if (!this.#buildManifest) { + log.verbose(`Storing build manifest for project ${this.#project.getName()} ` + + `with build signature ${this.#buildSignature}`); + // Write build manifest if it wasn't loaded from cache before this.#buildManifest = buildManifest; await this.#cacheManager.writeBuildManifest(this.#project.getId(), this.#buildSignature, buildManifest); } @@ -707,11 +711,20 @@ export default class ProjectBuildCache { // Store task caches for (const [taskName, taskCache] of this.#taskCache) { - await this.#cacheManager.writeTaskMetadata(this.#project.getId(), this.#buildSignature, taskName, - taskCache.toCacheObject()); + if (taskCache.isNewOrModified()) { + log.verbose(`Storing task cache metadata for task ${taskName} in project ${this.#project.getName()} ` + + `with build signature ${this.#buildSignature}`); + await this.#cacheManager.writeTaskMetadata(this.#project.getId(), this.#buildSignature, taskName, + taskCache.toCacheObject()); + } } + if (!this.#isNewOrModified) { + return; + } // Store stage caches + log.verbose(`Storing stage caches for project ${this.#project.getName()} ` + + `with build signature ${this.#buildSignature}`); const stageQueue = this.#stageCache.flushCacheQueue(); await Promise.all(stageQueue.map(async ([stageId, stageSignature]) => { const {stage} = this.#stageCache.getCacheForSignature(stageId, stageSignature); @@ -739,6 +752,8 @@ export default class ProjectBuildCache { })); // Finally store index cache + log.verbose(`Storing resource index cache for project ${this.#project.getName()} ` + + `with build signature ${this.#buildSignature}`); const indexMetadata = this.#resourceIndex.toCacheObject(); await this.#cacheManager.writeIndexCache(this.#project.getId(), this.#buildSignature, { ...indexMetadata, From 793183638e6b206cd3284b94aa6f00c1e1dcca06 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Sun, 11 Jan 2026 23:53:32 +0100 Subject: [PATCH 074/110] refactor(project): Refactor project cache validation --- packages/project/lib/build/ProjectBuilder.js | 86 ++- packages/project/lib/build/TaskRunner.js | 16 +- .../project/lib/build/cache/BuildTaskCache.js | 38 +- .../project/lib/build/cache/CacheManager.js | 15 +- .../lib/build/cache/ProjectBuildCache.js | 617 ++++++++++++------ .../project/lib/build/helpers/BuildContext.js | 27 +- .../lib/build/helpers/ProjectBuildContext.js | 64 +- .../project/lib/build/helpers/WatchHandler.js | 46 +- ...BuildSignature.js => getBuildSignature.js} | 16 +- .../lib/specifications/Specification.js | 4 + 10 files changed, 630 insertions(+), 299 deletions(-) rename packages/project/lib/build/helpers/{calculateBuildSignature.js => getBuildSignature.js} (60%) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 5610899bff3..c07e36a9991 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -180,7 +180,7 @@ class ProjectBuilder { } } - const projectBuildContexts = await this._createRequiredBuildContexts(requestedProjects); + const projectBuildContexts = await this._buildContext.createRequiredProjectContexts(requestedProjects); let fsTarget; if (destPath) { fsTarget = resourceFactory.createAdapter({ @@ -236,7 +236,16 @@ class ProjectBuilder { })); const alreadyBuilt = []; + const changedDependencyResources = []; for (const projectBuildContext of queue) { + if (changedDependencyResources.length) { + // Notify build cache of changed resources from dependencies + projectBuildContext.dependencyResourcesChanged(changedDependencyResources); + } + const changedResources = await projectBuildContext.determineChangedResources(); + for (const resourcePath of changedResources) { + changedDependencyResources.push(resourcePath); + } if (!await projectBuildContext.requiresBuild()) { const projectName = projectBuildContext.getProject().getName(); alreadyBuilt.push(projectName); @@ -275,19 +284,24 @@ class ProjectBuilder { try { const startTime = process.hrtime(); const pWrites = []; - for (const projectBuildContext of queue) { + while (queue.length) { + const projectBuildContext = queue.shift(); const project = projectBuildContext.getProject(); const projectName = project.getName(); const projectType = project.getType(); this.#log.verbose(`Processing project ${projectName}...`); // Only build projects that are not already build (i.e. provide a matching build manifest) - if (alreadyBuilt.includes(projectName)) { + if (alreadyBuilt.includes(projectName) || !(await projectBuildContext.requiresBuild())) { this.#log.skipProjectBuild(projectName, projectType); } else { this.#log.startProjectBuild(projectName, projectType); - await projectBuildContext.getTaskRunner().runTasks(); + const changedResources = await projectBuildContext.runTasks(); this.#log.endProjectBuild(projectName, projectType); + for (const pbc of queue) { + // Propagate resource changes to following projects + pbc.getBuildCache().dependencyResourcesChanged(changedResources); + } } if (!requestedProjects.includes(projectName)) { // Project has not been requested @@ -306,7 +320,7 @@ class ProjectBuilder { project, this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), projectBuildContext.getBuildSignature()); - pWrites.push(projectBuildContext.getBuildCache().storeCache(buildManifest)); + pWrites.push(projectBuildContext.getBuildCache().writeCache(buildManifest)); } } await Promise.all(pWrites); @@ -337,6 +351,7 @@ class ProjectBuilder { async #update(projectBuildContexts, requestedProjects, fsTarget) { const queue = []; + const changedDependencyResources = []; await this._graph.traverseDepthFirst(async ({project}) => { const projectName = project.getName(); const projectBuildContext = projectBuildContexts.get(projectName); @@ -345,6 +360,15 @@ class ProjectBuilder { // => This project needs to be built or, in case it has already // been built, it's build result needs to be written out (if requested) queue.push(projectBuildContext); + + if (changedDependencyResources.length) { + // Notify build cache of changed resources from dependencies + await projectBuildContext.dependencyResourcesChanged(changedDependencyResources); + } + const changedResources = await projectBuildContext.determineChangedResources(); + for (const resourcePath of changedResources) { + changedDependencyResources.push(resourcePath); + } } }); @@ -353,7 +377,8 @@ class ProjectBuilder { })); const pWrites = []; - for (const projectBuildContext of queue) { + while (queue.length) { + const projectBuildContext = queue.shift(); const project = projectBuildContext.getProject(); const projectName = project.getName(); const projectType = project.getType(); @@ -365,8 +390,12 @@ class ProjectBuilder { } this.#log.startProjectBuild(projectName, projectType); - await projectBuildContext.runTasks(); + const changedResources = await projectBuildContext.runTasks(); this.#log.endProjectBuild(projectName, projectType); + for (const pbc of queue) { + // Propagate resource changes to following projects + pbc.getBuildCache().dependencyResourcesChanged(changedResources); + } if (!requestedProjects.includes(projectName)) { // Project has not been requested // => Its resources shall not be part of the build result @@ -386,52 +415,11 @@ class ProjectBuilder { project, this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), projectBuildContext.getBuildSignature()); - pWrites.push(projectBuildContext.getBuildCache().storeCache(buildManifest)); + pWrites.push(projectBuildContext.getBuildCache().writeCache(buildManifest)); } await Promise.all(pWrites); } - async _createRequiredBuildContexts(requestedProjects) { - const requiredProjects = new Set(this._graph.getProjectNames().filter((projectName) => { - return requestedProjects.includes(projectName); - })); - - const projectBuildContexts = new Map(); - - for (const projectName of requiredProjects) { - this.#log.verbose(`Creating build context for project ${projectName}...`); - const projectBuildContext = await this._buildContext.createProjectContext({ - project: this._graph.getProject(projectName) - }); - - projectBuildContexts.set(projectName, projectBuildContext); - - if (await projectBuildContext.requiresBuild()) { - const taskRunner = projectBuildContext.getTaskRunner(); - const requiredDependencies = await taskRunner.getRequiredDependencies(); - - if (requiredDependencies.size === 0) { - continue; - } - // This project needs to be built and required dependencies to be built as well - this._graph.getDependencies(projectName).forEach((depName) => { - if (projectBuildContexts.has(depName)) { - // Build context already exists - // => Dependency will be built - return; - } - if (!requiredDependencies.has(depName)) { - return; - } - // Add dependency to list of projects to build - requiredProjects.add(depName); - }); - } - } - - return projectBuildContexts; - } - async _getProjectFilter({ dependencyIncludes, explicitIncludes, diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index 2c3b934bd4b..d9b4d227134 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -131,7 +131,7 @@ class TaskRunner { await this._executeTask(taskName, taskFunction); } } - this._buildCache.allTasksCompleted(); + return await this._buildCache.allTasksCompleted(); } /** @@ -485,13 +485,13 @@ class TaskRunner { * @returns {Promise} Resolves when task has finished */ async _executeTask(taskName, taskFunction, taskParams) { - if (this._buildCache.isTaskCacheValid(taskName)) { - // Immediately skip task if cache is valid - // Continue if cache is (potentially) invalid, in which case taskFunction will - // validate the cache thoroughly - this._log.skipTask(taskName); - return; - } + // if (this._buildCache.isTaskCacheValid(taskName)) { + // // Immediately skip task if cache is valid + // // Continue if cache is (potentially) invalid, in which case taskFunction will + // // validate the cache thoroughly + // this._log.skipTask(taskName); + // return; + // } this._taskStart = performance.now(); await taskFunction(taskParams, this._log); if (this._log.isLevelEnabled("perf")) { diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index b9220376d19..8168c27c62a 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -43,7 +43,7 @@ export default class BuildTaskCache { #readTaskMetadataCache; #treeRegistries = []; #useDifferentialUpdate = true; - #isNewOrModified; + #hasNewOrModifiedCacheEntries = true; // ===== LIFECYCLE ===== @@ -67,7 +67,7 @@ export default class BuildTaskCache { if (!this.#readTaskMetadataCache) { // No cache reader provided, start with empty graph this.#resourceRequests = new ResourceRequestGraph(); - this.#isNewOrModified = true; + this.#hasNewOrModifiedCacheEntries = true; return; } @@ -78,7 +78,7 @@ export default class BuildTaskCache { `of project '${this.#projectName}'`); } this.#resourceRequests = this.#restoreGraphFromCache(taskMetadata); - this.#isNewOrModified = false; + this.#hasNewOrModifiedCacheEntries = false; // Using cache } // ===== METADATA ACCESS ===== @@ -92,8 +92,8 @@ export default class BuildTaskCache { return this.#taskName; } - isNewOrModified() { - return this.#isNewOrModified; + hasNewOrModifiedCacheEntries() { + return this.#hasNewOrModifiedCacheEntries; } /** @@ -405,7 +405,7 @@ export default class BuildTaskCache { if (!relevantTree) { return; } - this.#isNewOrModified = true; + this.#hasNewOrModifiedCacheEntries = true; // Update signatures for affected request sets const {requestSetId, signature: originalSignature} = trees.get(relevantTree); @@ -525,6 +525,32 @@ export default class BuildTaskCache { }); } + async isAffectedByProjectChanges(changedPaths) { + await this.#initResourceRequests(); + const resourceRequests = this.#resourceRequests.getAllRequests(); + return resourceRequests.some(({type, value}) => { + if (type === "path") { + return changedPaths.includes(value); + } + if (type === "patterns") { + return micromatch(changedPaths, value).length > 0; + } + }); + } + + async isAffectedByDependencyChanges(changedPaths) { + await this.#initResourceRequests(); + const resourceRequests = this.#resourceRequests.getAllRequests(); + return resourceRequests.some(({type, value}) => { + if (type === "dep-path") { + return changedPaths.includes(value); + } + if (type === "dep-patterns") { + return micromatch(changedPaths, value).length > 0; + } + }); + } + /** * Serializes the task cache to a plain object for persistence * diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index 596dbcbfdf6..28a91425305 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -161,11 +161,12 @@ export default class CacheManager { * @private * @param {string} packageName - Package/project identifier * @param {string} buildSignature - Build signature hash + * @param {string} kind "source" or "result" * @returns {string} Absolute path to the index metadata file */ - #getIndexCachePath(packageName, buildSignature) { + #getIndexCachePath(packageName, buildSignature, kind) { const pkgDir = getPathFromPackageName(packageName); - return path.join(this.#indexDir, pkgDir, `${buildSignature}.json`); + return path.join(this.#indexDir, pkgDir, `${kind}-${buildSignature}.json`); } /** @@ -176,12 +177,13 @@ export default class CacheManager { * * @param {string} projectId - Project identifier (typically package name) * @param {string} buildSignature - Build signature hash + * @param {string} kind "source" or "result" * @returns {Promise} Parsed index cache object or null if not found * @throws {Error} If file read fails for reasons other than file not existing */ - async readIndexCache(projectId, buildSignature) { + async readIndexCache(projectId, buildSignature, kind) { try { - const metadata = await readFile(this.#getIndexCachePath(projectId, buildSignature), "utf8"); + const metadata = await readFile(this.#getIndexCachePath(projectId, buildSignature, kind), "utf8"); return JSON.parse(metadata); } catch (err) { if (err.code === "ENOENT") { @@ -203,11 +205,12 @@ export default class CacheManager { * * @param {string} projectId - Project identifier (typically package name) * @param {string} buildSignature - Build signature hash + * @param {string} kind "source" or "result" * @param {object} index - Index object containing resource tree and task metadata * @returns {Promise} */ - async writeIndexCache(projectId, buildSignature, index) { - const indexPath = this.#getIndexCachePath(projectId, buildSignature); + async writeIndexCache(projectId, buildSignature, kind, index) { + const indexPath = this.#getIndexCachePath(projectId, buildSignature, kind); await mkdir(path.dirname(indexPath), {recursive: true}); await writeFile(indexPath, JSON.stringify(index, null, 2), "utf8"); } diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 46d20b53534..46971cebbb2 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -2,6 +2,7 @@ import {createResource, createProxy} from "@ui5/fs/resourceFactory"; import {getLogger} from "@ui5/logger"; import fs from "graceful-fs"; import {promisify} from "node:util"; +import crypto from "node:crypto"; import {gunzip, createGunzip} from "node:zlib"; const readFile = promisify(fs.readFile); import BuildTaskCache from "./BuildTaskCache.js"; @@ -27,13 +28,23 @@ export default class ProjectBuildCache { #project; #buildSignature; - #buildManifest; + // #buildManifest; #cacheManager; #currentProjectReader; #dependencyReader; - #resourceIndex; - #requiresInitialBuild; - #isNewOrModified; + #sourceIndex; + #cachedSourceSignature; + #resultIndex; + #cachedResultSignature; + #currentResultSignature; + + #usingResultStage = false; + + // Pending changes + #changedProjectSourcePaths = new Set(); + #changedProjectResourcePaths = new Set(); + #changedDependencyResourcePaths = new Set(); + #changedResultResourcePaths = new Set(); #invalidatedTasks = new Map(); @@ -77,11 +88,72 @@ export default class ProjectBuildCache { * @returns {Promise} */ async #init() { - this.#resourceIndex = await this.#initResourceIndex(); - this.#buildManifest = await this.#loadBuildManifest(); - const hasIndexCache = await this.#loadIndexCache(); - const requiresDepdendencyResources = true; // TODO: Determine dynamically using task caches - this.#requiresInitialBuild = !hasIndexCache || requiresDepdendencyResources; + // this.#buildManifest = await this.#loadBuildManifest(); + // this.#sourceIndex = await this.#initResourceIndex(); + // const hasIndexCache = await this.#loadIndexCache(); + // const requiresDepdendencyResources = true; // TODO: Determine dynamically using task caches + // this.#requiresInitialBuild = !hasIndexCache || requiresDepdendencyResources; + } + + /** + * Determines changed resources since last build + * + * This is expected to be the first method called on the cache. + * Hence it will perform some initialization and deserialization tasks as needed. + */ + async determineChangedResources() { + // TODO: Start detached initializations in constructor and await them here? + let changedSourcePaths; + if (!this.#sourceIndex) { + changedSourcePaths = await this.#initSourceIndex(); + for (const resourcePath of changedSourcePaths) { + this.#changedProjectSourcePaths.add(resourcePath); + } + } else if (this.#changedProjectSourcePaths.size) { + changedSourcePaths = await this._updateSourceIndex(this.#changedProjectSourcePaths); + } else { + changedSourcePaths = []; + } + + if (!this.#resultIndex) { + await this.#initResultIndex(); + } + + await this.#flushPendingInputChanges(); + return changedSourcePaths; + } + + /** + * Determines whether a rebuild is needed. + * + * A rebuild is required if: + * - No task cache exists + * - Any tasks have been invalidated + * - Initial build is required (e.g., cache couldn't be loaded) + * + * @param {string[]} dependencySignatures - Sorted by name of the dependency project + * @returns {boolean} True if rebuild is needed, false if cache can be fully utilized + */ + async requiresBuild(dependencySignatures) { + if (this.#invalidatedTasks.size > 0) { + this.#usingResultStage = false; + return true; + } + + if (this.#usingResultStage && this.#invalidatedTasks.size === 0) { + return false; + } + + if (await this.#hasValidResultCache(dependencySignatures)) { + return false; + } + return true; + } + + async getResultSignature() { + // Do not include dependency signatures here. They are not relevant to consumers of this project and would + // unnecessarily invalidate their caches. + return this.#resultIndex.getSignature(); } /** @@ -92,14 +164,13 @@ export default class ProjectBuildCache { * resources have changed. If no cache exists, creates a fresh index. * * @private - * @returns {Promise} The initialized resource index * @throws {Error} If cached index signature doesn't match computed signature */ - async #initResourceIndex() { + async #initSourceIndex() { const sourceReader = this.#project.getSourceReader(); const [resources, indexCache] = await Promise.all([ await sourceReader.byGlob("/**/*"), - await this.#cacheManager.readIndexCache(this.#project.getId(), this.#buildSignature), + await this.#cacheManager.readIndexCache(this.#project.getId(), this.#buildSignature, "source"), ]); if (indexCache) { log.verbose(`Using cached resource index for project ${this.#project.getName()}`); @@ -120,17 +191,109 @@ export default class ProjectBuildCache { // Since no tasks have been invalidated, a rebuild is still necessary in this case, so that // each task can find and use its individual stage cache. // Hence requiresInitialBuild will be set to true in this case (and others. - await this.resourceChanged(changedPaths, []); + const tasksInvalidated = await this._invalidateTasks(changedPaths, []); + if (!tasksInvalidated) { + this.#cachedSourceSignature = resourceIndex.getSignature(); + } + // for (const resourcePath of changedPaths) { + // this.#changedProjectResourcePaths.add(resourcePath); + // } } else if (indexCache.indexTree.root.hash !== resourceIndex.getSignature()) { // Validate index signature matches with cached signature throw new Error( `Resource index signature mismatch for project ${this.#project.getName()}: ` + `expected ${indexCache.indexTree.root.hash}, got ${resourceIndex.getSignature()}`); + } else { + log.verbose( + `Resource index signature for project ${this.#project.getName()} matches cached signature: ` + + `${resourceIndex.getSignature()}`); + this.#cachedSourceSignature = resourceIndex.getSignature(); } - return resourceIndex; + this.#sourceIndex = resourceIndex; + return changedPaths; + } else { + // No index cache found, create new index + this.#sourceIndex = await ResourceIndex.create(resources); + return []; + } + } + + async _updateSourceIndex(resourcePaths) { + if (resourcePaths.size === 0) { + return []; } - // No index cache found, create new index - return await ResourceIndex.create(resources); + const sourceReader = this.#project.getSourceReader(); + const resources = await Promise.all(Array.from(resourcePaths).map(async (resourcePath) => { + const resource = await sourceReader.byPath(resourcePath); + if (!resource) { + throw new Error( + `Failed to update source index for project ${this.#project.getName()}: ` + + `resource at path ${resourcePath} not found in source reader`); + } + return resource; + })); + const res = await this.#sourceIndex.upsertResources(resources); + return [...res.added, ...res.updated]; + } + + async #initResultIndex() { + const indexCache = await this.#cacheManager.readIndexCache( + this.#project.getId(), this.#buildSignature, "result"); + + if (indexCache) { + log.verbose(`Using cached result resource index for project ${this.#project.getName()}`); + this.#resultIndex = await ResourceIndex.fromCache(indexCache); + this.#cachedResultSignature = this.#resultIndex.getSignature(); + } else { + this.#resultIndex = await ResourceIndex.create([]); + } + } + + #getResultStageSignature(sourceSignature, dependencySignatures) { + // Different from the project cache's "result signature", the "result stage signature" includes the + // signatures of dependencies, since they possibly affect the result stage's content. + const stageSignature = `${sourceSignature}|${dependencySignatures.join("|")}`; + return crypto.createHash("sha256").update(stageSignature).digest("hex"); + } + + /** + * Loads the cached result stage from persistent storage + * + * Attempts to load a cached result stage using the resource index signature. + * If found, creates a reader for the cached stage and sets it as the project's + * result stage. + * + * @param {string[]} dependencySignatures + * @private + * @returns {Promise} True if cache was loaded successfully, false otherwise + */ + async #hasValidResultCache(dependencySignatures) { + const stageSignature = this.#getResultStageSignature(this.#sourceIndex.getSignature(), dependencySignatures); + if (this.#currentResultSignature === stageSignature) { + // log.verbose( + // `Project ${this.#project.getName()} result stage signature unchanged: ${stageSignature}`); + // TODO: Requires setResultStage again? + return this.#usingResultStage; + } + this.#currentResultSignature = stageSignature; + const stageId = "result"; + log.verbose(`Project ${this.#project.getName()} resource index signature: ${stageSignature}`); + const stageCache = await this.#cacheManager.readStageCache( + this.#project.getId(), this.#buildSignature, stageId, stageSignature); + + if (!stageCache) { + log.verbose( + `No cached stage found for project ${this.#project.getName()} with index signature ${stageSignature}`); + return false; + } + log.verbose( + `Using cached result stage for project ${this.#project.getName()} with index signature ${stageSignature}`); + const reader = await this.#createReaderForStageCache( + stageId, stageSignature, stageCache.resourceMetadata); + this.#project.setResultStage(reader); + this.#project.useResultStage(); + this.#usingResultStage = true; + return true; } // ===== TASK MANAGEMENT ===== @@ -148,8 +311,6 @@ export default class ProjectBuildCache { * @returns {Promise} True or object if task can use cache, false otherwise */ async prepareTaskExecution(taskName) { - // Remove initial build requirement once first task is prepared - this.#requiresInitialBuild = false; const stageName = this.#getStageNameForTask(taskName); const taskCache = this.#taskCache.get(taskName); // Store current project reader (= state of the previous stage) for later use (e.g. in recordTaskResult) @@ -184,7 +345,7 @@ export default class ProjectBuildCache { if (!stageChanged && stageCache.writtenResourcePaths.size) { // Invalidate following tasks - this.#invalidateFollowingTasks(taskName, stageCache.writtenResourcePaths); + this.#invalidateFollowingTasks(taskName, Array.from(stageCache.writtenResourcePaths)); } return true; // No need to execute the task } else if (deltaInfo) { @@ -327,13 +488,12 @@ export default class ProjectBuildCache { } // Update task cache with new metadata - if (writtenResourcePaths.size) { - log.verbose(`Task ${taskName} produced ${writtenResourcePaths.size} resources`); + if (writtenResourcePaths.length) { + log.verbose(`Task ${taskName} produced ${writtenResourcePaths.length} resources`); this.#invalidateFollowingTasks(taskName, writtenResourcePaths); } // Reset current project reader this.#currentProjectReader = null; - this.#isNewOrModified = true; } /** @@ -344,17 +504,15 @@ export default class ProjectBuildCache { * * @private * @param {string} taskName - Name of the task that wrote resources - * @param {Set} writtenResourcePaths - Paths of resources written by the task + * @param {string[]} writtenResourcePaths - Paths of resources written by the task */ async #invalidateFollowingTasks(taskName, writtenResourcePaths) { - const writtenPathsArray = Array.from(writtenResourcePaths); - // Check whether following tasks need to be invalidated const allTasks = Array.from(this.#taskCache.keys()); const taskIdx = allTasks.indexOf(taskName); for (let i = taskIdx + 1; i < allTasks.length; i++) { const nextTaskName = allTasks[i]; - if (!await this.#taskCache.get(nextTaskName).matchesChangedResources(writtenPathsArray, [])) { + if (!await this.#taskCache.get(nextTaskName).matchesChangedResources(writtenResourcePaths, [])) { continue; } if (this.#invalidatedTasks.has(nextTaskName)) { @@ -370,6 +528,27 @@ export default class ProjectBuildCache { }); } } + + for (const resourcePath of writtenResourcePaths) { + this.#changedResultResourcePaths.add(resourcePath); + } + } + + async #updateResultIndex(resourcePaths) { + const deltaReader = this.#project.getReader({excludeSourceReader: true}); + + const resources = await Promise.all(Array.from(resourcePaths).map(async (resourcePath) => { + const resource = await deltaReader.byPath(resourcePath); + if (!resource) { + throw new Error( + `Failed to update result index for project ${this.#project.getName()}: ` + + `resource at path ${resourcePath} not found in result reader`); + } + return resource; + })); + + const res = await this.#resultIndex.upsertResources(resources); + return [...res.added, ...res.updated]; } /** @@ -382,6 +561,77 @@ export default class ProjectBuildCache { return this.#taskCache.get(taskName); } + async projectSourcesChanged(changedPaths) { + for (const resourcePath of changedPaths) { + this.#changedProjectSourcePaths.add(resourcePath); + } + } + + /** + * Handles resource changes + * + * Iterates through all cached tasks and checks if any match the changed resources. + * Matching tasks are marked as invalidated and will need to be re-executed. + * Changed resource paths are accumulated if a task is already invalidated. + * + * @param {string[]} changedPaths - Changed project resource paths + * @returns {boolean} True if any task was invalidated, false otherwise + */ + // async projectResourcesChanged(changedPaths) { + // let taskInvalidated = false; + // for (const taskCache of this.#taskCache.values()) { + // if (await taskCache.isAffectedByProjectChanges(changedPaths)) { + // taskInvalidated = true; + // break; + // } + // } + // if (taskInvalidated) { + // for (const resourcePath of changedPaths) { + // this.#changedProjectResourcePaths.add(resourcePath); + // } + // } + // return taskInvalidated; + // } + + /** + * Handles resource changes and invalidates affected tasks + * + * Iterates through all cached tasks and checks if any match the changed resources. + * Matching tasks are marked as invalidated and will need to be re-executed. + * Changed resource paths are accumulated if a task is already invalidated. + * + * @param {string[]} changedPaths - Changed dependency resource paths + * @returns {boolean} True if any task was invalidated, false otherwise + */ + async dependencyResourcesChanged(changedPaths) { + // let taskInvalidated = false; + // for (const taskCache of this.#taskCache.values()) { + // if (await taskCache.isAffectedByDependencyChanges(changedPaths)) { + // taskInvalidated = true; + // break; + // } + // } + // if (taskInvalidated) { + for (const resourcePath of changedPaths) { + this.#changedDependencyResourcePaths.add(resourcePath); + } + // } + // return taskInvalidated; + } + + async #flushPendingInputChanges() { + if (this.#changedProjectSourcePaths.size === 0 && + this.#changedDependencyResourcePaths.size === 0) { + return []; + } + await this._invalidateTasks( + Array.from(this.#changedProjectSourcePaths), + Array.from(this.#changedDependencyResourcePaths)); + + // Reset pending changes + this.#changedProjectSourcePaths = new Set(); + this.#changedDependencyResourcePaths = new Set(); + } /** * Handles resource changes and invalidates affected tasks @@ -394,7 +644,7 @@ export default class ProjectBuildCache { * @param {string[]} dependencyResourcePaths - Changed dependency resource paths * @returns {boolean} True if any task was invalidated, false otherwise */ - async resourceChanged(projectResourcePaths, dependencyResourcePaths) { + async _invalidateTasks(projectResourcePaths, dependencyResourcePaths) { let taskInvalidated = false; for (const [taskName, taskCache] of this.#taskCache) { if (!await taskCache.matchesChangedResources(projectResourcePaths, dependencyResourcePaths)) { @@ -420,6 +670,14 @@ export default class ProjectBuildCache { return taskInvalidated; } + // async areTasksAffectedByResource(projectResourcePaths, dependencyResourcePaths) { + // for (const taskCache of this.#taskCache.values()) { + // if (await taskCache.matchesChangedResources(projectResourcePaths, dependencyResourcePaths)) { + // return true; + // } + // } + // } + /** * Gets the set of changed project resource paths for a task * @@ -447,7 +705,7 @@ export default class ProjectBuildCache { * * @returns {boolean} True if at least one task has been cached */ - hasAnyCache() { + hasAnyTaskCache() { return this.#taskCache.size > 0; } @@ -470,21 +728,7 @@ export default class ProjectBuildCache { * @returns {boolean} True if cache exists and is valid for this task */ isTaskCacheValid(taskName) { - return this.#taskCache.has(taskName) && !this.#invalidatedTasks.has(taskName) && !this.#requiresInitialBuild; - } - - /** - * Determines whether a rebuild is needed - * - * A rebuild is required if: - * - No task cache exists - * - Any tasks have been invalidated - * - Initial build is required (e.g., cache couldn't be loaded) - * - * @returns {boolean} True if rebuild is needed, false if cache can be fully utilized - */ - requiresBuild() { - return !this.hasAnyCache() || this.#invalidatedTasks.size > 0 || this.#requiresInitialBuild; + return this.#taskCache.has(taskName) && !this.#invalidatedTasks.has(taskName); } /** @@ -521,11 +765,18 @@ export default class ProjectBuildCache { * * This finalizes the build process by switching the project to use the * final result stage containing all build outputs. + * Also updates the result resource index accordingly. * - * @returns {void} + * @returns {Promise} Resolves with list of changed resources since the last build */ - allTasksCompleted() { + async allTasksCompleted() { this.#project.useResultStage(); + this.#usingResultStage = true; + const changedPaths = await this.#updateResultIndex(this.#changedResultResourcePaths); + + // Reset updated resource paths + this.#changedResultResourcePaths = new Set(); + return changedPaths; } /** @@ -551,38 +802,63 @@ export default class ProjectBuildCache { return `task/${taskName}`; } - // ===== SERIALIZATION ===== + // ===== CACHE SERIALIZATION ===== /** - * Loads the cached result stage from persistent storage + * Stores all cache data to persistent storage * - * Attempts to load a cached result stage using the resource index signature. - * If found, creates a reader for the cached stage and sets it as the project's - * result stage. + * This method: + * 1. Writes the build manifest (if not already written) + * 2. Stores the result stage with all resources + * 3. Writes the resource index and task metadata + * 4. Stores all stage caches from the queue * - * @private - * @returns {Promise} True if cache was loaded successfully, false otherwise + * @param {object} buildManifest - Build manifest containing metadata about the build + * @param {string} buildManifest.manifestVersion - Version of the manifest format + * @param {string} buildManifest.signature - Build signature + * @returns {Promise} */ - async #loadIndexCache() { - const stageSignature = this.#resourceIndex.getSignature(); - const stageId = "result"; - log.verbose(`Project ${this.#project.getName()} resource index signature: ${stageSignature}`); - const stageCache = await this.#cacheManager.readStageCache( - this.#project.getId(), this.#buildSignature, stageId, stageSignature); + async writeCache(buildManifest) { + // if (!this.#buildManifest) { + // log.verbose(`Storing build manifest for project ${this.#project.getName()} ` + + // `with build signature ${this.#buildSignature}`); + // // Write build manifest if it wasn't loaded from cache before + // this.#buildManifest = buildManifest; + // await this.#cacheManager.writeBuildManifest(this.#project.getId(), this.#buildSignature, buildManifest); + // } - if (!stageCache) { - log.verbose( - `No cached stage found for project ${this.#project.getName()} with index signature ${stageSignature}`); - return false; + // Store result stage + await this.#writeResultIndex(); + + // Store task caches + for (const [taskName, taskCache] of this.#taskCache) { + if (taskCache.hasNewOrModifiedCacheEntries()) { + log.verbose(`Storing task cache metadata for task ${taskName} in project ${this.#project.getName()} ` + + `with build signature ${this.#buildSignature}`); + await this.#cacheManager.writeTaskMetadata(this.#project.getId(), this.#buildSignature, taskName, + taskCache.toCacheObject()); + } } - log.verbose( - `Using cached result stage for project ${this.#project.getName()} with index signature ${stageSignature}`); - const reader = await this.#createReaderForStageCache( - stageId, stageSignature, stageCache.resourceMetadata); - this.#project.setResultStage(reader); - this.#project.useResultStage(); - this.#isNewOrModified = false; - return true; + + await this.#writeStageCaches(); + + await this.#writeSourceIndex(); + } + + async #writeSourceIndex() { + if (this.#cachedSourceSignature === this.#sourceIndex.getSignature()) { + // No changes to already cached result index + return; + } + + // Finally store index cache + log.verbose(`Storing resource index cache for project ${this.#project.getName()} ` + + `with build signature ${this.#buildSignature}`); + const sourceIndexObject = this.#sourceIndex.toCacheObject(); + await this.#cacheManager.writeIndexCache(this.#project.getId(), this.#buildSignature, "source", { + ...sourceIndexObject, + taskList: Array.from(this.#taskCache.keys()), + }); } /** @@ -595,8 +871,12 @@ export default class ProjectBuildCache { * @private * @returns {Promise} */ - async #writeResultStage() { - const stageSignature = this.#resourceIndex.getSignature(); + async #writeResultIndex() { + if (this.#cachedResultSignature === this.#resultIndex.getSignature()) { + // No changes to already cached result index + return; + } + const stageSignature = this.#currentResultSignature; const stageId = "result"; const deltaReader = this.#project.getReader({excludeSourceReader: true}); @@ -622,6 +902,49 @@ export default class ProjectBuildCache { }; await this.#cacheManager.writeStageCache( this.#project.getId(), this.#buildSignature, stageId, stageSignature, metadata); + + // After all resources have been stored, write updated result index hash tree + const resultIndexObject = this.#resultIndex.toCacheObject(); + await this.#cacheManager.writeIndexCache(this.#project.getId(), this.#buildSignature, "result", { + ...resultIndexObject + }); + } + + async #writeStageCaches() { + // Store stage caches + log.verbose(`Storing stage caches for project ${this.#project.getName()} ` + + `with build signature ${this.#buildSignature}`); + const stageQueue = this.#stageCache.flushCacheQueue(); + await Promise.all(stageQueue.map(async ([stageId, stageSignature]) => { + const {stage} = this.#stageCache.getCacheForSignature(stageId, stageSignature); + const writer = stage.getWriter(); + const reader = writer.collection ? writer.collection : writer; + const resources = await reader.byGlob("/**/*"); + const resourceMetadata = Object.create(null); + await Promise.all(resources.map(async (res) => { + // Store resource content in cacache via CacheManager + await this.#cacheManager.writeStageResource(this.#buildSignature, stageId, stageSignature, res); + + resourceMetadata[res.getOriginalPath()] = { + inode: res.getInode(), + lastModified: res.getLastModified(), + size: await res.getSize(), + integrity: await res.getIntegrity(), + }; + })); + + const metadata = { + resourceMetadata, + }; + await this.#cacheManager.writeStageCache( + this.#project.getId(), this.#buildSignature, stageId, stageSignature, metadata); + })); + } + + #createBuildTaskCacheMetadataReader(taskName) { + return () => { + return this.#cacheManager.readTaskMetadata(this.#project.getId(), this.#buildSignature, taskName); + }; } /** @@ -682,85 +1005,6 @@ export default class ProjectBuildCache { } }); } - - /** - * Stores all cache data to persistent storage - * - * This method: - * 1. Writes the build manifest (if not already written) - * 2. Stores the result stage with all resources - * 3. Writes the resource index and task metadata - * 4. Stores all stage caches from the queue - * - * @param {object} buildManifest - Build manifest containing metadata about the build - * @param {string} buildManifest.manifestVersion - Version of the manifest format - * @param {string} buildManifest.signature - Build signature - * @returns {Promise} - */ - async storeCache(buildManifest) { - if (!this.#buildManifest) { - log.verbose(`Storing build manifest for project ${this.#project.getName()} ` + - `with build signature ${this.#buildSignature}`); - // Write build manifest if it wasn't loaded from cache before - this.#buildManifest = buildManifest; - await this.#cacheManager.writeBuildManifest(this.#project.getId(), this.#buildSignature, buildManifest); - } - - // Store result stage - await this.#writeResultStage(); - - // Store task caches - for (const [taskName, taskCache] of this.#taskCache) { - if (taskCache.isNewOrModified()) { - log.verbose(`Storing task cache metadata for task ${taskName} in project ${this.#project.getName()} ` + - `with build signature ${this.#buildSignature}`); - await this.#cacheManager.writeTaskMetadata(this.#project.getId(), this.#buildSignature, taskName, - taskCache.toCacheObject()); - } - } - - if (!this.#isNewOrModified) { - return; - } - // Store stage caches - log.verbose(`Storing stage caches for project ${this.#project.getName()} ` + - `with build signature ${this.#buildSignature}`); - const stageQueue = this.#stageCache.flushCacheQueue(); - await Promise.all(stageQueue.map(async ([stageId, stageSignature]) => { - const {stage} = this.#stageCache.getCacheForSignature(stageId, stageSignature); - const writer = stage.getWriter(); - const reader = writer.collection ? writer.collection : writer; - const resources = await reader.byGlob("/**/*"); - const resourceMetadata = Object.create(null); - await Promise.all(resources.map(async (res) => { - // Store resource content in cacache via CacheManager - await this.#cacheManager.writeStageResource(this.#buildSignature, stageId, stageSignature, res); - - resourceMetadata[res.getOriginalPath()] = { - inode: res.getInode(), - lastModified: res.getLastModified(), - size: await res.getSize(), - integrity: await res.getIntegrity(), - }; - })); - - const metadata = { - resourceMetadata, - }; - await this.#cacheManager.writeStageCache( - this.#project.getId(), this.#buildSignature, stageId, stageSignature, metadata); - })); - - // Finally store index cache - log.verbose(`Storing resource index cache for project ${this.#project.getName()} ` + - `with build signature ${this.#buildSignature}`); - const indexMetadata = this.#resourceIndex.toCacheObject(); - await this.#cacheManager.writeIndexCache(this.#project.getId(), this.#buildSignature, { - ...indexMetadata, - taskList: Array.from(this.#taskCache.keys()), - }); - } - /** * Loads and validates the build manifest from persistent storage * @@ -770,46 +1014,41 @@ export default class ProjectBuildCache { * * If validation fails, the cache is considered invalid and will be ignored. * + * @param taskName * @private * @returns {Promise} Build manifest object or undefined if not found/invalid * @throws {Error} If build signature mismatch or cache restoration fails */ - async #loadBuildManifest() { - const manifest = await this.#cacheManager.readBuildManifest(this.#project.getId(), this.#buildSignature); - if (!manifest) { - log.verbose(`No build manifest found for project ${this.#project.getName()} ` + - `with build signature ${this.#buildSignature}`); - return; - } - - try { - // Check build manifest version - const {buildManifest} = manifest; - if (buildManifest.manifestVersion !== "1.0") { - log.verbose(`Incompatible build manifest version ${manifest.version} found for project ` + - `${this.#project.getName()} with build signature ${this.#buildSignature}. Ignoring cache.`); - return; - } - // TODO: Validate manifest against a schema - - // Validate build signature match - if (this.#buildSignature !== manifest.buildManifest.signature) { - throw new Error( - `Build manifest signature ${manifest.buildManifest.signature} does not match expected ` + - `build signature ${this.#buildSignature} for project ${this.#project.getName()}`); - } - return buildManifest; - } catch (err) { - throw new Error( - `Failed to restore cache from disk for project ${this.#project.getName()}: ${err.message}`, { - cause: err - }); - } - } - - #createBuildTaskCacheMetadataReader(taskName) { - return () => { - return this.#cacheManager.readTaskMetadata(this.#project.getId(), this.#buildSignature, taskName); - }; - } + // async #loadBuildManifest() { + // const manifest = await this.#cacheManager.readBuildManifest(this.#project.getId(), this.#buildSignature); + // if (!manifest) { + // log.verbose(`No build manifest found for project ${this.#project.getName()} ` + + // `with build signature ${this.#buildSignature}`); + // return; + // } + + // try { + // // Check build manifest version + // const {buildManifest} = manifest; + // if (buildManifest.manifestVersion !== "1.0") { + // log.verbose(`Incompatible build manifest version ${manifest.version} found for project ` + + // `${this.#project.getName()} with build signature ${this.#buildSignature}. Ignoring cache.`); + // return; + // } + // // TODO: Validate manifest against a schema + + // // Validate build signature match + // if (this.#buildSignature !== manifest.buildManifest.signature) { + // throw new Error( + // `Build manifest signature ${manifest.buildManifest.signature} does not match expected ` + + // `build signature ${this.#buildSignature} for project ${this.#project.getName()}`); + // } + // return buildManifest; + // } catch (err) { + // throw new Error( + // `Failed to restore cache from disk for project ${this.#project.getName()}: ${err.message}`, { + // cause: err + // }); + // } + // } } diff --git a/packages/project/lib/build/helpers/BuildContext.js b/packages/project/lib/build/helpers/BuildContext.js index 5b93cce062a..a4ec790f48f 100644 --- a/packages/project/lib/build/helpers/BuildContext.js +++ b/packages/project/lib/build/helpers/BuildContext.js @@ -2,6 +2,7 @@ import ProjectBuildContext from "./ProjectBuildContext.js"; import OutputStyleEnum from "./ProjectBuilderOutputStyle.js"; import WatchHandler from "./WatchHandler.js"; import CacheManager from "../cache/CacheManager.js"; +import {getBaseSignature} from "./getBuildSignature.js"; /** * Context of a build process @@ -75,6 +76,7 @@ class BuildContext { excludedTasks, useCache, }; + this._buildSignatureBase = getBaseSignature(this._buildConfig); this._taskRepository = taskRepository; @@ -105,11 +107,34 @@ class BuildContext { } async createProjectContext({project}) { - const projectBuildContext = await ProjectBuildContext.create(this, project); + const projectBuildContext = await ProjectBuildContext.create( + this, project, await this.getCacheManager(), this._buildSignatureBase); this._projectBuildContexts.push(projectBuildContext); return projectBuildContext; } + async createRequiredProjectContexts(requestedProjects) { + const projectBuildContexts = new Map(); + const requiredProjects = new Set(requestedProjects); + + for (const projectName of requiredProjects) { + const projectBuildContext = await this.createProjectContext({ + project: this._graph.getProject(projectName) + }); + + projectBuildContexts.set(projectName, projectBuildContext); + + // Collect all direct dependencies of the project that are required to build the project + const requiredDependencies = await projectBuildContext.getRequiredDependencies(); + + for (const depName of requiredDependencies) { + // Add dependency to list of required projects + requiredProjects.add(depName); + } + } + return projectBuildContexts; + } + async initWatchHandler(projects, updateBuildResult) { const watchHandler = new WatchHandler(this, updateBuildResult); await watchHandler.watch(projects); diff --git a/packages/project/lib/build/helpers/ProjectBuildContext.js b/packages/project/lib/build/helpers/ProjectBuildContext.js index bcb3c5f12f6..15f3567cbd2 100644 --- a/packages/project/lib/build/helpers/ProjectBuildContext.js +++ b/packages/project/lib/build/helpers/ProjectBuildContext.js @@ -2,7 +2,7 @@ import ResourceTagCollection from "@ui5/fs/internal/ResourceTagCollection"; import ProjectBuildLogger from "@ui5/logger/internal/loggers/ProjectBuild"; import TaskUtil from "./TaskUtil.js"; import TaskRunner from "../TaskRunner.js"; -import calculateBuildSignature from "./calculateBuildSignature.js"; +import {getProjectSignature} from "./getBuildSignature.js"; import ProjectBuildCache from "../cache/ProjectBuildCache.js"; /** @@ -47,11 +47,11 @@ class ProjectBuildContext { }); } - static async create(buildContext, project) { - const buildSignature = await calculateBuildSignature(project, buildContext.getGraph(), - buildContext.getBuildConfig(), buildContext.getTaskRepository()); + static async create(buildContext, project, cacheManager, baseSignature) { + const buildSignature = getProjectSignature( + baseSignature, project, buildContext.getGraph(), buildContext.getTaskRepository()); const buildCache = await ProjectBuildCache.create( - project, buildSignature, await buildContext.getCacheManager()); + project, buildSignature, cacheManager); return new ProjectBuildContext( buildContext, project, @@ -104,6 +104,16 @@ class ProjectBuildContext { return this._buildContext.getGraph().getDependencies(projectName || this._project.getName()); } + async getRequiredDependencies() { + if (this._requiredDependencies) { + return this._requiredDependencies; + } + const taskRunner = this.getTaskRunner(); + this._requiredDependencies = Array.from(await taskRunner.getRequiredDependencies()) + .sort((a, b) => a.localeCompare(b)); + return this._requiredDependencies; + } + getResourceTagCollection(resource, tag) { if (!resource.hasProject()) { this._log.silly(`Associating resource ${resource.getPath()} with project ${this._project.getName()}`); @@ -155,14 +165,54 @@ class ProjectBuildContext { */ async requiresBuild() { if (this.#getBuildManifest()) { + // Build manifest present -> No build required return false; } - return this._buildCache.requiresBuild(); + // Check whether all required dependencies are built and collect their signatures so that + // we can validate our build cache (keyed using the project's sources and relevant dependency signatures) + const depSignatures = []; + const requiredDependencyNames = await this.getRequiredDependencies(); + for (const depName of requiredDependencyNames) { + const depCtx = this._buildContext.getBuildContext(depName); + if (!depCtx) { + throw new Error(`Unexpected missing build context for project '${depName}', dependency of ` + + `project '${this._project.getName()}'`); + } + const signature = await depCtx.getBuildResultSignature(); + if (!signature) { + // Dependency is unable to provide a signature, likely because it needs to be built itself + // Until then, we assume this project requires a build as well and return here + return true; + } + // Collect signatures + depSignatures.push(signature); + } + + return this._buildCache.requiresBuild(depSignatures); + } + + async getBuildResultSignature() { + if (await this.requiresBuild()) { + return null; + } + return await this._buildCache.getResultSignature(); + } + + async determineChangedResources() { + return this._buildCache.determineChangedResources(); } async runTasks() { - await this.getTaskRunner().runTasks(); + return await this.getTaskRunner().runTasks(); + } + + async projectResourcesChanged(changedPaths) { + return this._buildCache.projectResourcesChanged(changedPaths); + } + + async dependencyResourcesChanged(changedPaths) { + return this._buildCache.dependencyResourcesChanged(changedPaths); } #getBuildManifest() { diff --git a/packages/project/lib/build/helpers/WatchHandler.js b/packages/project/lib/build/helpers/WatchHandler.js index 2d55d7b1237..17d1e6504dd 100644 --- a/packages/project/lib/build/helpers/WatchHandler.js +++ b/packages/project/lib/build/helpers/WatchHandler.js @@ -70,10 +70,11 @@ class WatchHandler extends EventEmitter { #fileChanged(project, filePath) { // Collect changes (grouped by project), then trigger callbacks const resourcePath = project.getVirtualPath(filePath); - if (!this.#sourceChanges.has(project)) { - this.#sourceChanges.set(project, new Set()); + const projectName = project.getName(); + if (!this.#sourceChanges.has(projectName)) { + this.#sourceChanges.set(projectName, new Set()); } - this.#sourceChanges.get(project).add(resourcePath); + this.#sourceChanges.get(projectName).add(resourcePath); this.#processQueue(); } @@ -113,43 +114,34 @@ class WatchHandler extends EventEmitter { async #handleResourceChanges(sourceChanges) { const dependencyChanges = new Map(); - let someProjectTasksInvalidated = false; const graph = this.#buildContext.getGraph(); - for (const [project, changedResourcePaths] of sourceChanges) { + for (const [projectName, changedResourcePaths] of sourceChanges) { // Propagate changes to dependents of the project - for (const {project: dep} of graph.traverseDependents(project.getName())) { - const depChanges = dependencyChanges.get(dep); + for (const {project: dep} of graph.traverseDependents(projectName)) { + const depChanges = dependencyChanges.get(dep.getName()); if (!depChanges) { - dependencyChanges.set(dep, new Set(changedResourcePaths)); + dependencyChanges.set(dep.getName(), new Set(changedResourcePaths)); continue; } for (const res of changedResourcePaths) { depChanges.add(res); } } + const projectBuildContext = this.#buildContext.getBuildContext(projectName); + projectBuildContext.getBuildCache() + .projectSourcesChanged(Array.from(changedResourcePaths)); } - await graph.traverseDepthFirst(async ({project}) => { - if (!sourceChanges.has(project) && !dependencyChanges.has(project)) { - return; - } - const projectSourceChanges = Array.from(sourceChanges.get(project) ?? new Set()); - const projectDependencyChanges = Array.from(dependencyChanges.get(project) ?? new Set()); - const projectBuildContext = this.#buildContext.getBuildContext(project.getName()); - const tasksInvalidated = await projectBuildContext.getBuildCache() - .resourceChanged(projectSourceChanges, projectDependencyChanges); - - if (tasksInvalidated) { - someProjectTasksInvalidated = true; - } - }); - - if (someProjectTasksInvalidated) { - this.emit("projectResourcesInvalidated"); - await this.#updateBuildResult(); - this.emit("projectResourcesUpdated"); + for (const [projectName, changedResourcePaths] of dependencyChanges) { + const projectBuildContext = this.#buildContext.getBuildContext(projectName); + projectBuildContext.getBuildCache() + .dependencyResourcesChanged(Array.from(changedResourcePaths)); } + + this.emit("projectResourcesInvalidated"); + await this.#updateBuildResult(); + this.emit("projectResourcesUpdated"); } } diff --git a/packages/project/lib/build/helpers/calculateBuildSignature.js b/packages/project/lib/build/helpers/getBuildSignature.js similarity index 60% rename from packages/project/lib/build/helpers/calculateBuildSignature.js rename to packages/project/lib/build/helpers/getBuildSignature.js index 684ea0c4d17..f3dc3bc440c 100644 --- a/packages/project/lib/build/helpers/calculateBuildSignature.js +++ b/packages/project/lib/build/helpers/getBuildSignature.js @@ -1,7 +1,11 @@ import crypto from "node:crypto"; -// Using CommonsJS require since JSON module imports are still experimental -const BUILD_CACHE_VERSION = "0"; +const BUILD_SIG_VERSION = "0"; + +export function getBaseSignature(buildConfig) { + const key = BUILD_SIG_VERSION + JSON.stringify(buildConfig); + return crypto.createHash("sha256").update(key).digest("hex"); +} /** * The build signature is calculated based on the **build configuration and environment** of a project. @@ -9,15 +13,15 @@ const BUILD_CACHE_VERSION = "0"; * The hash is represented as a hexadecimal string to allow safe usage in file names. * * @private + * @param {string} baseSignature * @param {@ui5/project/lib/Project} project The project to create the cache integrity for * @param {@ui5/project/lib/graph/ProjectGraph} graph The project graph - * @param {object} buildConfig The build configuration * @param {@ui5/builder/tasks/taskRepository} taskRepository The task repository (used to determine the effective * versions of ui5-builder and ui5-fs) */ -export default async function calculateBuildSignature(project, graph, buildConfig, taskRepository) { - const key = BUILD_CACHE_VERSION + project.getName() + - JSON.stringify(buildConfig); +export function getProjectSignature(baseSignature, project, graph, taskRepository) { + const key = baseSignature + project.getId() + JSON.stringify(project.getConfig()); + // TODO: Add signatures of relevant custom tasks // Create a hash for all metadata const hash = crypto.createHash("sha256").update(key).digest("hex"); diff --git a/packages/project/lib/specifications/Specification.js b/packages/project/lib/specifications/Specification.js index 02bdc58036e..212aa37ecdd 100644 --- a/packages/project/lib/specifications/Specification.js +++ b/packages/project/lib/specifications/Specification.js @@ -161,6 +161,10 @@ class Specification { } /* === Attributes === */ + getConfig() { + return this._config; + } + /** * Gets the ID of this specification. * From a4ba6db8c5ef64cf10d3f5fb030307d4eedf449f Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Tue, 13 Jan 2026 13:49:20 +0100 Subject: [PATCH 075/110] refactor(project): Extract project build into own method Allows better test assertions via spies --- packages/project/lib/build/ProjectBuilder.js | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index c07e36a9991..b9b6310b5dd 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -295,9 +295,7 @@ class ProjectBuilder { if (alreadyBuilt.includes(projectName) || !(await projectBuildContext.requiresBuild())) { this.#log.skipProjectBuild(projectName, projectType); } else { - this.#log.startProjectBuild(projectName, projectType); - const changedResources = await projectBuildContext.runTasks(); - this.#log.endProjectBuild(projectName, projectType); + const {changedResources} = await this._buildProject(projectBuildContext); for (const pbc of queue) { // Propagate resource changes to following projects pbc.getBuildCache().dependencyResourcesChanged(changedResources); @@ -389,9 +387,7 @@ class ProjectBuilder { continue; } - this.#log.startProjectBuild(projectName, projectType); - const changedResources = await projectBuildContext.runTasks(); - this.#log.endProjectBuild(projectName, projectType); + const {changedResources} = await this._buildProject(projectBuildContext); for (const pbc of queue) { // Propagate resource changes to following projects pbc.getBuildCache().dependencyResourcesChanged(changedResources); @@ -420,6 +416,18 @@ class ProjectBuilder { await Promise.all(pWrites); } + async _buildProject(projectBuildContext) { + const project = projectBuildContext.getProject(); + const projectName = project.getName(); + const projectType = project.getType(); + + this.#log.startProjectBuild(projectName, projectType); + const changedResources = await projectBuildContext.runTasks(); + this.#log.endProjectBuild(projectName, projectType); + + return {changedResources}; + } + async _getProjectFilter({ dependencyIncludes, explicitIncludes, From 3e00d78661769f6a3fc8059957aa105d4b4ebd03 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Tue, 13 Jan 2026 13:49:57 +0100 Subject: [PATCH 076/110] fix(project): Clear cleanup task queue --- packages/project/lib/build/helpers/ProjectBuildContext.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/project/lib/build/helpers/ProjectBuildContext.js b/packages/project/lib/build/helpers/ProjectBuildContext.js index 15f3567cbd2..99f62073621 100644 --- a/packages/project/lib/build/helpers/ProjectBuildContext.js +++ b/packages/project/lib/build/helpers/ProjectBuildContext.js @@ -77,6 +77,7 @@ class ProjectBuildContext { await Promise.all(this._queues.cleanup.map((callback) => { return callback(force); })); + this._queues.cleanup = []; } /** From abe9e6dea01984a9841742d8905600be93daf372 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Tue, 13 Jan 2026 13:50:27 +0100 Subject: [PATCH 077/110] test(project): Add ProjectBuilder integration test --- .../lib/build/ProjectBuilder.integration.js | 84 +++++++++++++++++++ 1 file changed, 84 insertions(+) create mode 100644 packages/project/test/lib/build/ProjectBuilder.integration.js diff --git a/packages/project/test/lib/build/ProjectBuilder.integration.js b/packages/project/test/lib/build/ProjectBuilder.integration.js new file mode 100644 index 00000000000..235d174a6c7 --- /dev/null +++ b/packages/project/test/lib/build/ProjectBuilder.integration.js @@ -0,0 +1,84 @@ +import test from "ava"; +import sinonGlobal from "sinon"; +import {fileURLToPath} from "node:url"; +import ProjectGraph from "../../../lib/graph/ProjectGraph.js"; +import ProjectBuilder from "../../../lib/build/ProjectBuilder.js"; +import Application from "../../../lib/specifications/types/Application.js"; +import * as taskRepository from "@ui5/builder/internal/taskRepository"; + +test.beforeEach((t) => { + t.context.sinon = sinonGlobal.createSandbox(); +}); + +test.afterEach.always((t) => { + t.context.sinon.restore(); + delete process.env.UI5_DATA_DIR; +}); + +test.serial("Build application project twice without changes", async (t) => { + const {sinon} = t.context; + + process.env.UI5_DATA_DIR = getTmpPath("application.a/.ui5"); + + async function createProjectBuilder() { + const customApplicationProject = new Application(); + await customApplicationProject.init({ + "id": "application.a", + "version": "1.0.0", + "modulePath": getFixturePath("application.a"), + "configuration": { + "specVersion": "5.0", + "type": "application", + "metadata": { + "name": "application.a" + }, + "kind": "project" + } + }); + + const graph = new ProjectGraph({ + rootProjectName: customApplicationProject.getName(), + }); + graph.addProject(customApplicationProject); + graph.seal(); // Graph needs to be sealed before building + + const buildConfig = {}; + + const projectBuilder = new ProjectBuilder({ + graph, + taskRepository, + buildConfig + }); + sinon.spy(projectBuilder, "_buildProject"); + return projectBuilder; + } + + const destPath = getTmpPath("application.a/dist"); + + let projectBuilder = await createProjectBuilder(); + + // First build (with empty cache) + await projectBuilder.build({destPath}); + + t.is(projectBuilder._buildProject.callCount, 1); + t.is( + projectBuilder._buildProject.getCall(0).args[0].getProject().getName(), + "application.a", + "application.a built in first build" + ); + + // Second build (with cache, no changes) + projectBuilder = await createProjectBuilder(); + + await projectBuilder.build({destPath}); + + t.is(projectBuilder._buildProject.callCount, 0, "No projects built in second build"); +}); + +function getFixturePath(fixtureName) { + return fileURLToPath(new URL(`../../fixtures/${fixtureName}`, import.meta.url)); +} + +function getTmpPath(folderName) { + return fileURLToPath(new URL(`../../tmp/${folderName}`, import.meta.url)); +} From 913366080fc540756a03e4977102f1fbb0ad8036 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Tue, 13 Jan 2026 14:32:36 +0100 Subject: [PATCH 078/110] test(project): Add failing ProjectBuilder test case --- .../lib/build/ProjectBuilder.integration.js | 109 +++++++++++------- 1 file changed, 65 insertions(+), 44 deletions(-) diff --git a/packages/project/test/lib/build/ProjectBuilder.integration.js b/packages/project/test/lib/build/ProjectBuilder.integration.js index 235d174a6c7..d730aa3d134 100644 --- a/packages/project/test/lib/build/ProjectBuilder.integration.js +++ b/packages/project/test/lib/build/ProjectBuilder.integration.js @@ -1,10 +1,10 @@ import test from "ava"; import sinonGlobal from "sinon"; import {fileURLToPath} from "node:url"; -import ProjectGraph from "../../../lib/graph/ProjectGraph.js"; +import fs from "node:fs/promises"; import ProjectBuilder from "../../../lib/build/ProjectBuilder.js"; -import Application from "../../../lib/specifications/types/Application.js"; import * as taskRepository from "@ui5/builder/internal/taskRepository"; +import {graphFromPackageDependencies} from "../../../lib/graph/graph.js"; test.beforeEach((t) => { t.context.sinon = sinonGlobal.createSandbox(); @@ -15,64 +15,49 @@ test.afterEach.always((t) => { delete process.env.UI5_DATA_DIR; }); -test.serial("Build application project twice without changes", async (t) => { - const {sinon} = t.context; - - process.env.UI5_DATA_DIR = getTmpPath("application.a/.ui5"); - - async function createProjectBuilder() { - const customApplicationProject = new Application(); - await customApplicationProject.init({ - "id": "application.a", - "version": "1.0.0", - "modulePath": getFixturePath("application.a"), - "configuration": { - "specVersion": "5.0", - "type": "application", - "metadata": { - "name": "application.a" - }, - "kind": "project" - } - }); +test.serial("Build application project multiple times", async (t) => { + const fixtureTester = new FixtureTester(t, "application.a"); - const graph = new ProjectGraph({ - rootProjectName: customApplicationProject.getName(), - }); - graph.addProject(customApplicationProject); - graph.seal(); // Graph needs to be sealed before building + let projectBuilder; + const destPath = fixtureTester.destPath; - const buildConfig = {}; + // #1 build (with empty cache) + projectBuilder = await fixtureTester.createProjectBuilder(); + await projectBuilder.build({destPath}); - const projectBuilder = new ProjectBuilder({ - graph, - taskRepository, - buildConfig - }); - sinon.spy(projectBuilder, "_buildProject"); - return projectBuilder; - } + t.is(projectBuilder._buildProject.callCount, 1); + t.is( + projectBuilder._buildProject.getCall(0).args[0].getProject().getName(), + "application.a", + "application.a built in build #1" + ); + + // #2 build (with cache, no changes) + projectBuilder = await fixtureTester.createProjectBuilder(); + await projectBuilder.build({destPath}); - const destPath = getTmpPath("application.a/dist"); + t.is(projectBuilder._buildProject.callCount, 0, "No projects built in build #2"); - let projectBuilder = await createProjectBuilder(); + // Change a source file in application.a + const changedFilePath = `${fixtureTester.fixturePath}/webapp/test.js`; + await fs.appendFile(changedFilePath, `\ntest("line added");\n`); - // First build (with empty cache) + // #3 build (with cache, with changes) + projectBuilder = await fixtureTester.createProjectBuilder(); await projectBuilder.build({destPath}); t.is(projectBuilder._buildProject.callCount, 1); t.is( projectBuilder._buildProject.getCall(0).args[0].getProject().getName(), "application.a", - "application.a built in first build" + "application.a rebuilt in build #3" ); - // Second build (with cache, no changes) - projectBuilder = await createProjectBuilder(); - + // #4 build (with cache, no changes) + projectBuilder = await fixtureTester.createProjectBuilder(); await projectBuilder.build({destPath}); - t.is(projectBuilder._buildProject.callCount, 0, "No projects built in second build"); + t.is(projectBuilder._buildProject.callCount, 0, "No projects built in build #4"); }); function getFixturePath(fixtureName) { @@ -82,3 +67,39 @@ function getFixturePath(fixtureName) { function getTmpPath(folderName) { return fileURLToPath(new URL(`../../tmp/${folderName}`, import.meta.url)); } + +class FixtureTester { + constructor(t, fixtureName) { + this._sinon = t.context.sinon; + this._fixtureName = fixtureName; + this._initialized = false; + + // Public + this.fixturePath = getTmpPath(fixtureName); + this.destPath = getTmpPath(`${fixtureName}/dist`); + } + + async _initialize() { + if (this._initialized) { + return; + } + process.env.UI5_DATA_DIR = getTmpPath(`${this._fixtureName}/.ui5`); + await fs.cp(getFixturePath(this._fixtureName), this.fixturePath, {recursive: true}); + this._initialized = true; + } + + async createProjectBuilder() { + await this._initialize(); + const graph = await graphFromPackageDependencies({ + cwd: this.fixturePath + }); + graph.seal(); + const projectBuilder = new ProjectBuilder({ + graph, + taskRepository, + buildConfig: {} + }); + this._sinon.spy(projectBuilder, "_buildProject"); + return projectBuilder; + } +} From d33a3141122c782df216fe536f88c20b0e70fcf0 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Tue, 13 Jan 2026 15:27:41 +0100 Subject: [PATCH 079/110] test(project): Enhance ProjectBuilder test assertions --- .../lib/build/ProjectBuilder.integration.js | 80 +++++++++++++++++-- 1 file changed, 73 insertions(+), 7 deletions(-) diff --git a/packages/project/test/lib/build/ProjectBuilder.integration.js b/packages/project/test/lib/build/ProjectBuilder.integration.js index d730aa3d134..83526e651b5 100644 --- a/packages/project/test/lib/build/ProjectBuilder.integration.js +++ b/packages/project/test/lib/build/ProjectBuilder.integration.js @@ -7,23 +7,41 @@ import * as taskRepository from "@ui5/builder/internal/taskRepository"; import {graphFromPackageDependencies} from "../../../lib/graph/graph.js"; test.beforeEach((t) => { - t.context.sinon = sinonGlobal.createSandbox(); + const sinon = t.context.sinon = sinonGlobal.createSandbox(); + + t.context.logEventStub = sinon.stub(); + t.context.buildMetadataEventStub = sinon.stub(); + t.context.projectBuildMetadataEventStub = sinon.stub(); + t.context.buildStatusEventStub = sinon.stub(); + t.context.projectBuildStatusEventStub = sinon.stub(); + + process.on("ui5.log", t.context.logEventStub); + process.on("ui5.build-metadata", t.context.buildMetadataEventStub); + process.on("ui5.project-build-metadata", t.context.projectBuildMetadataEventStub); + process.on("ui5.build-status", t.context.buildStatusEventStub); + process.on("ui5.project-build-status", t.context.projectBuildStatusEventStub); }); test.afterEach.always((t) => { t.context.sinon.restore(); delete process.env.UI5_DATA_DIR; + + process.off("ui5.log", t.context.logEventStub); + process.off("ui5.build-metadata", t.context.buildMetadataEventStub); + process.off("ui5.project-build-metadata", t.context.projectBuildMetadataEventStub); + process.off("ui5.build-status", t.context.buildStatusEventStub); + process.off("ui5.project-build-status", t.context.projectBuildStatusEventStub); }); test.serial("Build application project multiple times", async (t) => { const fixtureTester = new FixtureTester(t, "application.a"); - let projectBuilder; + let projectBuilder; let buildStatusEventArgs; const destPath = fixtureTester.destPath; // #1 build (with empty cache) projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath}); + await projectBuilder.build({destPath, cleanDest: false /* No clean dest needed for build #1 */}); t.is(projectBuilder._buildProject.callCount, 1); t.is( @@ -32,9 +50,15 @@ test.serial("Build application project multiple times", async (t) => { "application.a built in build #1" ); + buildStatusEventArgs = t.context.projectBuildStatusEventStub.args.map((args) => args[0]); + t.deepEqual( + buildStatusEventArgs.filter(({status}) => status === "task-skip"), [], + "No 'task-skip' status in build #1" + ); + // #2 build (with cache, no changes) projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath}); + await projectBuilder.build({destPath, cleanDest: true}); t.is(projectBuilder._buildProject.callCount, 0, "No projects built in build #2"); @@ -44,7 +68,7 @@ test.serial("Build application project multiple times", async (t) => { // #3 build (with cache, with changes) projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath}); + await projectBuilder.build({destPath, cleanDest: true}); t.is(projectBuilder._buildProject.callCount, 1); t.is( @@ -53,9 +77,50 @@ test.serial("Build application project multiple times", async (t) => { "application.a rebuilt in build #3" ); - // #4 build (with cache, no changes) + buildStatusEventArgs = t.context.projectBuildStatusEventStub.args.map((args) => args[0]); + t.deepEqual( + buildStatusEventArgs.filter(({status}) => status === "task-skip"), [ + { + level: "info", + projectName: "application.a", + projectType: "application", + status: "task-skip", + taskName: "escapeNonAsciiCharacters", + }, + // Note: replaceCopyright task is expected to be skipped as the project + // does not define a copyright in its ui5.yaml. + { + level: "info", + projectName: "application.a", + projectType: "application", + status: "task-skip", + taskName: "replaceCopyright", + }, + { + level: "info", + projectName: "application.a", + projectType: "application", + status: "task-skip", + taskName: "enhanceManifest", + }, + { + level: "info", + projectName: "application.a", + projectType: "application", + status: "task-skip", + taskName: "generateFlexChangesBundle", + }, + ], + "'task-skip' status in build #3 for tasks that did not need to be re-executed based on changed test.js file" + ); + + // Check whether the changed file is in the destPath + const builtFileContent = await fs.readFile(`${destPath}/test.js`, {encoding: "utf8"}); + t.true(builtFileContent.includes(`test("line added");`), "Build dest contains changed file content"); + + // // #4 build (with cache, no changes) projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath}); + await projectBuilder.build({destPath, cleanDest: true}); t.is(projectBuilder._buildProject.callCount, 0, "No projects built in build #4"); }); @@ -90,6 +155,7 @@ class FixtureTester { async createProjectBuilder() { await this._initialize(); + this._sinon.resetHistory(); // Reset history of spies/stubs from previous builds (e.g. process event handlers) const graph = await graphFromPackageDependencies({ cwd: this.fixturePath }); From 8dec87cd3a517335f69e26da2c53cc109a4b1309 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Tue, 13 Jan 2026 15:40:53 +0100 Subject: [PATCH 080/110] test(project): Add library test case for ProjectBuilder --- .../lib/build/ProjectBuilder.integration.js | 80 ++++++++++++++++++- 1 file changed, 78 insertions(+), 2 deletions(-) diff --git a/packages/project/test/lib/build/ProjectBuilder.integration.js b/packages/project/test/lib/build/ProjectBuilder.integration.js index 83526e651b5..c2c05d5dc95 100644 --- a/packages/project/test/lib/build/ProjectBuilder.integration.js +++ b/packages/project/test/lib/build/ProjectBuilder.integration.js @@ -33,7 +33,7 @@ test.afterEach.always((t) => { process.off("ui5.project-build-status", t.context.projectBuildStatusEventStub); }); -test.serial("Build application project multiple times", async (t) => { +test.serial("Build application.a project multiple times", async (t) => { const fixtureTester = new FixtureTester(t, "application.a"); let projectBuilder; let buildStatusEventArgs; @@ -118,7 +118,83 @@ test.serial("Build application project multiple times", async (t) => { const builtFileContent = await fs.readFile(`${destPath}/test.js`, {encoding: "utf8"}); t.true(builtFileContent.includes(`test("line added");`), "Build dest contains changed file content"); - // // #4 build (with cache, no changes) + // #4 build (with cache, no changes) + projectBuilder = await fixtureTester.createProjectBuilder(); + await projectBuilder.build({destPath, cleanDest: true}); + + t.is(projectBuilder._buildProject.callCount, 0, "No projects built in build #4"); +}); + +test.serial("Build library.d project multiple times", async (t) => { + const fixtureTester = new FixtureTester(t, "library.d"); + + let projectBuilder; let buildStatusEventArgs; + const destPath = fixtureTester.destPath; + + // #1 build (with empty cache) + projectBuilder = await fixtureTester.createProjectBuilder(); + await projectBuilder.build({destPath, cleanDest: false /* No clean dest needed for build #1 */}); + + t.is(projectBuilder._buildProject.callCount, 1); + t.is( + projectBuilder._buildProject.getCall(0).args[0].getProject().getName(), + "library.d", + "library.d built in build #1" + ); + + buildStatusEventArgs = t.context.projectBuildStatusEventStub.args.map((args) => args[0]); + t.deepEqual( + buildStatusEventArgs.filter(({status}) => status === "task-skip"), [], + "No 'task-skip' status in build #1" + ); + + // #2 build (with cache, no changes) + projectBuilder = await fixtureTester.createProjectBuilder(); + await projectBuilder.build({destPath, cleanDest: true}); + + t.is(projectBuilder._buildProject.callCount, 0, "No projects built in build #2"); + + // Change a source file in library.d + const changedFilePath = `${fixtureTester.fixturePath}/main/src/library/d/.library`; + await fs.writeFile( + changedFilePath, + (await fs.readFile(changedFilePath, {encoding: "utf8"})).replace( + `Some fancy copyright`, + `Some new fancy copyright` + ) + ); + + // #3 build (with cache, with changes) + projectBuilder = await fixtureTester.createProjectBuilder(); + await projectBuilder.build({destPath, cleanDest: true}); + + t.is(projectBuilder._buildProject.callCount, 1); + t.is( + projectBuilder._buildProject.getCall(0).args[0].getProject().getName(), + "library.d", + "library.d rebuilt in build #3" + ); + + buildStatusEventArgs = t.context.projectBuildStatusEventStub.args.map((args) => args[0]); + t.deepEqual( + buildStatusEventArgs.filter(({status}) => status === "task-skip"), [], + "No 'task-skip' status in build #3" + ); + + // Check whether the changed file is in the destPath + const builtFileContent = await fs.readFile(`${destPath}/resources/library/d/.library`, {encoding: "utf8"}); + t.true( + builtFileContent.includes(`Some new fancy copyright`), + "Build dest contains changed file content" + ); + // Check whether the updated copyright replacement took place + const builtSomeJsContent = await fs.readFile(`${destPath}/resources/library/d/some.js`, {encoding: "utf8"}); + t.true( + builtSomeJsContent.includes(`Some new fancy copyright`), + "Build dest contains updated copyright in some.js" + ); + + // #4 build (with cache, no changes) projectBuilder = await fixtureTester.createProjectBuilder(); await projectBuilder.build({destPath, cleanDest: true}); From 2b14042db4829f0a2d8bdf453184a80f8b7e1743 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Tue, 13 Jan 2026 15:58:35 +0100 Subject: [PATCH 081/110] test(project): Build dependencies in application test of ProjectBuilder --- .../lib/build/ProjectBuilder.integration.js | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/packages/project/test/lib/build/ProjectBuilder.integration.js b/packages/project/test/lib/build/ProjectBuilder.integration.js index c2c05d5dc95..4f6eef2de01 100644 --- a/packages/project/test/lib/build/ProjectBuilder.integration.js +++ b/packages/project/test/lib/build/ProjectBuilder.integration.js @@ -123,6 +123,34 @@ test.serial("Build application.a project multiple times", async (t) => { await projectBuilder.build({destPath, cleanDest: true}); t.is(projectBuilder._buildProject.callCount, 0, "No projects built in build #4"); + + // #5 build (with cache, no changes, with dependencies) + projectBuilder = await fixtureTester.createProjectBuilder(); + await projectBuilder.build({destPath, cleanDest: true, dependencyIncludes: {includeAllDependencies: true}}); + + t.is(projectBuilder._buildProject.callCount, 4, "Only dependency projects built in build #5"); + t.is( + projectBuilder._buildProject.getCall(0).args[0].getProject().getName(), + "library.d", + ); + t.is( + projectBuilder._buildProject.getCall(1).args[0].getProject().getName(), + "library.a", + ); + t.is( + projectBuilder._buildProject.getCall(2).args[0].getProject().getName(), + "library.b", + ); + t.is( + projectBuilder._buildProject.getCall(3).args[0].getProject().getName(), + "library.c", + ); + + // #6 build (with cache, no changes) + projectBuilder = await fixtureTester.createProjectBuilder(); + await projectBuilder.build({destPath, cleanDest: true}); + + t.is(projectBuilder._buildProject.callCount, 0, "No projects built in build #6"); }); test.serial("Build library.d project multiple times", async (t) => { @@ -178,7 +206,7 @@ test.serial("Build library.d project multiple times", async (t) => { buildStatusEventArgs = t.context.projectBuildStatusEventStub.args.map((args) => args[0]); t.deepEqual( buildStatusEventArgs.filter(({status}) => status === "task-skip"), [], - "No 'task-skip' status in build #3" + "No 'task-skip' status in build #3" // TODO: Is this correct? ); // Check whether the changed file is in the destPath From d6af7cddba96378f1bd3c2e87d8c88f28541beb7 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Wed, 14 Jan 2026 13:52:31 +0100 Subject: [PATCH 082/110] test(project): Refactor ProjectBuilder test code --- .../lib/build/ProjectBuilder.integration.js | 325 ++++++++++-------- 1 file changed, 182 insertions(+), 143 deletions(-) diff --git a/packages/project/test/lib/build/ProjectBuilder.integration.js b/packages/project/test/lib/build/ProjectBuilder.integration.js index 4f6eef2de01..23e06f6597c 100644 --- a/packages/project/test/lib/build/ProjectBuilder.integration.js +++ b/packages/project/test/lib/build/ProjectBuilder.integration.js @@ -5,6 +5,10 @@ import fs from "node:fs/promises"; import ProjectBuilder from "../../../lib/build/ProjectBuilder.js"; import * as taskRepository from "@ui5/builder/internal/taskRepository"; import {graphFromPackageDependencies} from "../../../lib/graph/graph.js"; +import {setLogLevel} from "@ui5/logger"; + +// Ensures that all logging code paths are tested +setLogLevel("silly"); test.beforeEach((t) => { const sinon = t.context.sinon = sinonGlobal.createSandbox(); @@ -35,152 +39,143 @@ test.afterEach.always((t) => { test.serial("Build application.a project multiple times", async (t) => { const fixtureTester = new FixtureTester(t, "application.a"); - - let projectBuilder; let buildStatusEventArgs; const destPath = fixtureTester.destPath; // #1 build (with empty cache) - projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath, cleanDest: false /* No clean dest needed for build #1 */}); - - t.is(projectBuilder._buildProject.callCount, 1); - t.is( - projectBuilder._buildProject.getCall(0).args[0].getProject().getName(), - "application.a", - "application.a built in build #1" - ); - - buildStatusEventArgs = t.context.projectBuildStatusEventStub.args.map((args) => args[0]); - t.deepEqual( - buildStatusEventArgs.filter(({status}) => status === "task-skip"), [], - "No 'task-skip' status in build #1" - ); + await fixtureTester.buildProject({ + config: {destPath, cleanDest: false}, + assertions: { + projects: { + "application.a": {} + } + } + }); // #2 build (with cache, no changes) - projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath, cleanDest: true}); - - t.is(projectBuilder._buildProject.callCount, 0, "No projects built in build #2"); + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true}, + assertions: { + projects: {} + } + }); // Change a source file in application.a const changedFilePath = `${fixtureTester.fixturePath}/webapp/test.js`; await fs.appendFile(changedFilePath, `\ntest("line added");\n`); // #3 build (with cache, with changes) - projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath, cleanDest: true}); - - t.is(projectBuilder._buildProject.callCount, 1); - t.is( - projectBuilder._buildProject.getCall(0).args[0].getProject().getName(), - "application.a", - "application.a rebuilt in build #3" - ); - - buildStatusEventArgs = t.context.projectBuildStatusEventStub.args.map((args) => args[0]); - t.deepEqual( - buildStatusEventArgs.filter(({status}) => status === "task-skip"), [ - { - level: "info", - projectName: "application.a", - projectType: "application", - status: "task-skip", - taskName: "escapeNonAsciiCharacters", - }, - // Note: replaceCopyright task is expected to be skipped as the project - // does not define a copyright in its ui5.yaml. - { - level: "info", - projectName: "application.a", - projectType: "application", - status: "task-skip", - taskName: "replaceCopyright", - }, - { - level: "info", - projectName: "application.a", - projectType: "application", - status: "task-skip", - taskName: "enhanceManifest", - }, - { - level: "info", - projectName: "application.a", - projectType: "application", - status: "task-skip", - taskName: "generateFlexChangesBundle", - }, - ], - "'task-skip' status in build #3 for tasks that did not need to be re-executed based on changed test.js file" - ); + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true}, + assertions: { + projects: { + "application.a": { + skippedTasks: [ + "escapeNonAsciiCharacters", + // Note: replaceCopyright is skipped because no copyright is configured in the project + "replaceCopyright", + "enhanceManifest", + "generateFlexChangesBundle", + ] + } + } + } + }); // Check whether the changed file is in the destPath const builtFileContent = await fs.readFile(`${destPath}/test.js`, {encoding: "utf8"}); t.true(builtFileContent.includes(`test("line added");`), "Build dest contains changed file content"); - // #4 build (with cache, no changes) - projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath, cleanDest: true}); - - t.is(projectBuilder._buildProject.callCount, 0, "No projects built in build #4"); - - // #5 build (with cache, no changes, with dependencies) - projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath, cleanDest: true, dependencyIncludes: {includeAllDependencies: true}}); - - t.is(projectBuilder._buildProject.callCount, 4, "Only dependency projects built in build #5"); - t.is( - projectBuilder._buildProject.getCall(0).args[0].getProject().getName(), - "library.d", - ); - t.is( - projectBuilder._buildProject.getCall(1).args[0].getProject().getName(), - "library.a", - ); - t.is( - projectBuilder._buildProject.getCall(2).args[0].getProject().getName(), - "library.b", - ); - t.is( - projectBuilder._buildProject.getCall(3).args[0].getProject().getName(), - "library.c", - ); - - // #6 build (with cache, no changes) - projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath, cleanDest: true}); - - t.is(projectBuilder._buildProject.callCount, 0, "No projects built in build #6"); + // #4 build (with cache, no changes, with dependencies) + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true, dependencyIncludes: {includeAllDependencies: true}}, + assertions: { + projects: { + "library.d": {}, + "library.a": {}, + "library.b": {}, + "library.c": {}, + + // FIXME: application.a should not be rebuilt here at all. + // Currently it is rebuilt but all tasks are skipped. + "application.a": { + skippedTasks: [ + "enhanceManifest", + "escapeNonAsciiCharacters", + "generateComponentPreload", + "generateFlexChangesBundle", + "minify", + "replaceCopyright", + "replaceVersion", + ] + } + } + } + }); + + // #5 build (with cache, no changes) + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true}, + assertions: { + projects: { + // FIXME: application.a should not be rebuilt here at all. + // Currently it is rebuilt but all tasks are skipped. + "application.a": { + skippedTasks: [ + "enhanceManifest", + "escapeNonAsciiCharacters", + "generateComponentPreload", + "generateFlexChangesBundle", + "minify", + "replaceCopyright", + "replaceVersion", + ] + } + } + } + }); + + // #6 build (with cache, no changes, with dependencies) + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true, dependencyIncludes: {includeAllDependencies: true}}, + assertions: { + projects: { + // FIXME: application.a should not be rebuilt here at all. + // Currently it is rebuilt but all tasks are skipped. + "application.a": { + skippedTasks: [ + "enhanceManifest", + "escapeNonAsciiCharacters", + "generateComponentPreload", + "generateFlexChangesBundle", + "minify", + "replaceCopyright", + "replaceVersion", + ] + } + } + } + }); }); test.serial("Build library.d project multiple times", async (t) => { const fixtureTester = new FixtureTester(t, "library.d"); - - let projectBuilder; let buildStatusEventArgs; const destPath = fixtureTester.destPath; // #1 build (with empty cache) - projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath, cleanDest: false /* No clean dest needed for build #1 */}); - - t.is(projectBuilder._buildProject.callCount, 1); - t.is( - projectBuilder._buildProject.getCall(0).args[0].getProject().getName(), - "library.d", - "library.d built in build #1" - ); - - buildStatusEventArgs = t.context.projectBuildStatusEventStub.args.map((args) => args[0]); - t.deepEqual( - buildStatusEventArgs.filter(({status}) => status === "task-skip"), [], - "No 'task-skip' status in build #1" - ); + await fixtureTester.buildProject({ + config: {destPath, cleanDest: false}, + assertions: { + projects: {"library.d": {}} + } + }); // #2 build (with cache, no changes) - projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath, cleanDest: true}); - - t.is(projectBuilder._buildProject.callCount, 0, "No projects built in build #2"); + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true}, + assertions: { + projects: {} + } + }); // Change a source file in library.d const changedFilePath = `${fixtureTester.fixturePath}/main/src/library/d/.library`; @@ -193,21 +188,12 @@ test.serial("Build library.d project multiple times", async (t) => { ); // #3 build (with cache, with changes) - projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath, cleanDest: true}); - - t.is(projectBuilder._buildProject.callCount, 1); - t.is( - projectBuilder._buildProject.getCall(0).args[0].getProject().getName(), - "library.d", - "library.d rebuilt in build #3" - ); - - buildStatusEventArgs = t.context.projectBuildStatusEventStub.args.map((args) => args[0]); - t.deepEqual( - buildStatusEventArgs.filter(({status}) => status === "task-skip"), [], - "No 'task-skip' status in build #3" // TODO: Is this correct? - ); + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true}, + assertions: { + projects: {"library.d": {}} + } + }); // Check whether the changed file is in the destPath const builtFileContent = await fs.readFile(`${destPath}/resources/library/d/.library`, {encoding: "utf8"}); @@ -223,10 +209,12 @@ test.serial("Build library.d project multiple times", async (t) => { ); // #4 build (with cache, no changes) - projectBuilder = await fixtureTester.createProjectBuilder(); - await projectBuilder.build({destPath, cleanDest: true}); - - t.is(projectBuilder._buildProject.callCount, 0, "No projects built in build #4"); + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true}, + assertions: { + projects: {} + } + }); }); function getFixturePath(fixtureName) { @@ -237,8 +225,13 @@ function getTmpPath(folderName) { return fileURLToPath(new URL(`../../tmp/${folderName}`, import.meta.url)); } +async function rmrf(dirPath) { + return fs.rm(dirPath, {recursive: true, force: true}); +} + class FixtureTester { constructor(t, fixtureName) { + this._t = t; this._sinon = t.context.sinon; this._fixtureName = fixtureName; this._initialized = false; @@ -253,13 +246,15 @@ class FixtureTester { return; } process.env.UI5_DATA_DIR = getTmpPath(`${this._fixtureName}/.ui5`); + await rmrf(this.fixturePath); // Clean up any previous test runs await fs.cp(getFixturePath(this._fixtureName), this.fixturePath, {recursive: true}); this._initialized = true; } - async createProjectBuilder() { + async buildProject({config = {}, assertions = {}} = {}) { await this._initialize(); - this._sinon.resetHistory(); // Reset history of spies/stubs from previous builds (e.g. process event handlers) + this._sinon.resetHistory(); + const graph = await graphFromPackageDependencies({ cwd: this.fixturePath }); @@ -269,7 +264,51 @@ class FixtureTester { taskRepository, buildConfig: {} }); - this._sinon.spy(projectBuilder, "_buildProject"); + + // Execute the build + await projectBuilder.build(config); + + // Apply assertions if provided + if (assertions) { + this._assertBuild(assertions); + } + return projectBuilder; } + + _assertBuild(assertions) { + const {projects = {}} = assertions; + const eventArgs = this._t.context.projectBuildStatusEventStub.args.map((args) => args[0]); + + const projectsInOrder = []; + const seenProjects = new Set(); + const tasksByProject = {}; + + for (const event of eventArgs) { + if (!seenProjects.has(event.projectName)) { + projectsInOrder.push(event.projectName); + seenProjects.add(event.projectName); + } + if (!tasksByProject[event.projectName]) { + tasksByProject[event.projectName] = {executed: [], skipped: []}; + } + if (event.status === "task-skip") { + tasksByProject[event.projectName].skipped.push(event.taskName); + } else if (event.status === "task-start") { + tasksByProject[event.projectName].executed.push(event.taskName); + } + } + + // Assert projects built in order + const expectedProjects = Object.keys(projects); + this._t.deepEqual(projectsInOrder, expectedProjects); + + // Assert skipped tasks per project + for (const [projectName, expectedSkipped] of Object.entries(projects)) { + const skippedTasks = expectedSkipped.skippedTasks || []; + const actualSkipped = (tasksByProject[projectName]?.skipped || []).sort(); + const expectedArray = skippedTasks.sort(); + this._t.deepEqual(actualSkipped, expectedArray); + } + } } From 1fe328d8f849649e6214c6584db8e3f80f83ab5f Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 14 Jan 2026 16:26:55 +0100 Subject: [PATCH 083/110] refactor(project): Refactor task resource request tracking Track requests for the project separate from the dependencies --- packages/project/lib/build/ProjectBuilder.js | 72 +- packages/project/lib/build/TaskRunner.js | 64 +- .../project/lib/build/cache/BuildTaskCache.js | 584 ++------- .../lib/build/cache/ProjectBuildCache.js | 1053 ++++++++--------- .../lib/build/cache/ResourceRequestGraph.js | 10 +- .../lib/build/cache/ResourceRequestManager.js | 533 +++++++++ .../project/lib/build/cache/StageCache.js | 14 +- .../project/lib/build/cache/index/HashTree.js | 6 +- .../lib/build/cache/index/ResourceIndex.js | 27 +- .../lib/build/helpers/ProjectBuildContext.js | 90 +- .../project/lib/build/helpers/WatchHandler.js | 6 +- .../project/lib/specifications/Project.js | 11 +- 12 files changed, 1209 insertions(+), 1261 deletions(-) create mode 100644 packages/project/lib/build/cache/ResourceRequestManager.js diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index b9b6310b5dd..9e6e79efe8e 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -236,17 +236,8 @@ class ProjectBuilder { })); const alreadyBuilt = []; - const changedDependencyResources = []; for (const projectBuildContext of queue) { - if (changedDependencyResources.length) { - // Notify build cache of changed resources from dependencies - projectBuildContext.dependencyResourcesChanged(changedDependencyResources); - } - const changedResources = await projectBuildContext.determineChangedResources(); - for (const resourcePath of changedResources) { - changedDependencyResources.push(resourcePath); - } - if (!await projectBuildContext.requiresBuild()) { + if (!await projectBuildContext.possiblyRequiresBuild()) { const projectName = projectBuildContext.getProject().getName(); alreadyBuilt.push(projectName); } @@ -292,13 +283,13 @@ class ProjectBuilder { this.#log.verbose(`Processing project ${projectName}...`); // Only build projects that are not already build (i.e. provide a matching build manifest) - if (alreadyBuilt.includes(projectName) || !(await projectBuildContext.requiresBuild())) { + if (alreadyBuilt.includes(projectName)) { this.#log.skipProjectBuild(projectName, projectType); } else { - const {changedResources} = await this._buildProject(projectBuildContext); - for (const pbc of queue) { - // Propagate resource changes to following projects - pbc.getBuildCache().dependencyResourcesChanged(changedResources); + if (await projectBuildContext.prepareProjectBuildAndValidateCache(true)) { + this.#log.skipProjectBuild(projectName, projectType); + } else { + await this._buildProject(projectBuildContext); } } if (!requestedProjects.includes(projectName)) { @@ -313,12 +304,12 @@ class ProjectBuilder { } if (!alreadyBuilt.includes(projectName) && !process.env.UI5_BUILD_NO_CACHE_UPDATE) { - this.#log.verbose(`Saving cache...`); - const buildManifest = await createBuildManifest( - project, - this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), - projectBuildContext.getBuildSignature()); - pWrites.push(projectBuildContext.getBuildCache().writeCache(buildManifest)); + this.#log.verbose(`Triggering cache write...`); + // const buildManifest = await createBuildManifest( + // project, + // this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), + // projectBuildContext.getBuildSignature()); + pWrites.push(projectBuildContext.getBuildCache().writeCache()); } } await Promise.all(pWrites); @@ -349,7 +340,6 @@ class ProjectBuilder { async #update(projectBuildContexts, requestedProjects, fsTarget) { const queue = []; - const changedDependencyResources = []; await this._graph.traverseDepthFirst(async ({project}) => { const projectName = project.getName(); const projectBuildContext = projectBuildContexts.get(projectName); @@ -358,15 +348,6 @@ class ProjectBuilder { // => This project needs to be built or, in case it has already // been built, it's build result needs to be written out (if requested) queue.push(projectBuildContext); - - if (changedDependencyResources.length) { - // Notify build cache of changed resources from dependencies - await projectBuildContext.dependencyResourcesChanged(changedDependencyResources); - } - const changedResources = await projectBuildContext.determineChangedResources(); - for (const resourcePath of changedResources) { - changedDependencyResources.push(resourcePath); - } } }); @@ -382,15 +363,18 @@ class ProjectBuilder { const projectType = project.getType(); this.#log.verbose(`Updating project ${projectName}...`); - if (!await projectBuildContext.requiresBuild()) { + let changedPaths = await projectBuildContext.prepareProjectBuildAndValidateCache(); + if (changedPaths) { this.#log.skipProjectBuild(projectName, projectType); - continue; + } else { + changedPaths = await this._buildProject(projectBuildContext); } - const {changedResources} = await this._buildProject(projectBuildContext); - for (const pbc of queue) { - // Propagate resource changes to following projects - pbc.getBuildCache().dependencyResourcesChanged(changedResources); + if (changedPaths.length) { + for (const pbc of queue) { + // Propagate resource changes to following projects + pbc.getBuildCache().dependencyResourcesChanged(changedPaths); + } } if (!requestedProjects.includes(projectName)) { // Project has not been requested @@ -406,12 +390,12 @@ class ProjectBuilder { if (process.env.UI5_BUILD_NO_CACHE_UPDATE) { continue; } - this.#log.verbose(`Updating cache...`); - const buildManifest = await createBuildManifest( - project, - this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), - projectBuildContext.getBuildSignature()); - pWrites.push(projectBuildContext.getBuildCache().writeCache(buildManifest)); + this.#log.verbose(`Triggering cache write...`); + // const buildManifest = await createBuildManifest( + // project, + // this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), + // projectBuildContext.getBuildSignature()); + pWrites.push(projectBuildContext.getBuildCache().writeCache()); } await Promise.all(pWrites); } @@ -422,7 +406,7 @@ class ProjectBuilder { const projectType = project.getType(); this.#log.startProjectBuild(projectName, projectType); - const changedResources = await projectBuildContext.runTasks(); + const changedResources = await projectBuildContext.buildProject(); this.#log.endProjectBuild(projectName, projectType); return {changedResources}; diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index d9b4d227134..bc847997f57 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -81,31 +81,19 @@ class TaskRunner { } await this._addCustomTasks(); - - // Create readers for *all* dependencies - const depReaders = []; - await this._graph.traverseBreadthFirst(project.getName(), async function({project: dep}) { - if (dep.getName() === project.getName()) { - // Ignore project itself - return; - } - depReaders.push(dep.getReader()); - }); - - this._allDependenciesReader = createReaderCollection({ - name: `Dependency reader collection of project ${project.getName()}`, - readers: depReaders - }); - this._buildCache.setDependencyReader(this._allDependenciesReader); } /** * Takes a list of tasks which should be executed from the available task list of the current builder * - * @returns {Promise} Returns promise resolving once all tasks have been executed + * @returns {Promise} Resolves with list of changed resources since the last build */ async runTasks() { await this._initTasks(); + + // Ensure cached dependencies reader is initialized and up-to-date (TODO: improve this lifecycle) + await this.getDependenciesReader(this._directDependencies); + const tasksToRun = composeTaskList(Object.keys(this._tasks), this._buildConfig); const allTasks = this._taskExecutionOrder.filter((taskName) => { // There might be a numeric suffix in case a custom task is configured multiple times. @@ -141,6 +129,9 @@ class TaskRunner { * @returns {Set} Returns a set containing the names of all required direct project dependencies */ async getRequiredDependencies() { + if (this._requiredDependencies) { + return this._requiredDependencies; + } await this._initTasks(); const tasksToRun = composeTaskList(Object.keys(this._tasks), this._buildConfig); const allTasks = this._taskExecutionOrder.filter((taskName) => { @@ -155,7 +146,7 @@ class TaskRunner { const taskWithoutSuffixCounter = taskName.replace(/--\d+$/, ""); return tasksToRun.includes(taskWithoutSuffixCounter); }); - return allTasks.reduce((requiredDependencies, taskName) => { + this._requiredDependencies = allTasks.reduce((requiredDependencies, taskName) => { if (this._tasks[taskName].requiredDependencies.size) { this._log.verbose(`Task ${taskName} for project ${this._project.getName()} requires dependencies`); } @@ -164,6 +155,7 @@ class TaskRunner { } return requiredDependencies; }, new Set()); + return this._requiredDependencies; } /** @@ -198,7 +190,7 @@ class TaskRunner { options.projectName = this._project.getName(); options.projectNamespace = this._project.getNamespace(); // TODO: Apply cache and stage handling for custom tasks as well - const cacheInfo = await this._buildCache.prepareTaskExecution(taskName); + const cacheInfo = await this._buildCache.prepareTaskExecutionAndValidateCache(taskName); if (cacheInfo === true) { this._log.skipTask(taskName); return; @@ -213,7 +205,7 @@ class TaskRunner { let dependencies; if (requiresDependencies) { - dependencies = createMonitor(this._allDependenciesReader); + dependencies = createMonitor(this._cachedDependenciesReader); params.dependencies = dependencies; } if (usingCache) { @@ -387,9 +379,9 @@ class TaskRunner { getBuildSignatureCallback, getExpectedOutputCallback, differentialUpdateCallback, - getDependenciesReader: () => { + getDependenciesReaderCb: () => { // Create the dependencies reader on-demand - return this._createDependenciesReader(requiredDependencies); + return this.getDependenciesReader(requiredDependencies); }, }), requiredDependencies @@ -422,7 +414,7 @@ class TaskRunner { } _createCustomTaskWrapper({ - project, taskUtil, getDependenciesReader, provideDependenciesReader, task, taskName, taskConfiguration + project, taskUtil, getDependenciesReaderCb, provideDependenciesReader, task, taskName, taskConfiguration }) { return async function() { /* Custom Task Interface @@ -469,7 +461,7 @@ class TaskRunner { } if (provideDependenciesReader) { - params.dependencies = await getDependenciesReader(); + params.dependencies = await getDependenciesReaderCb(); } return taskFunction(params); }; @@ -485,13 +477,6 @@ class TaskRunner { * @returns {Promise} Resolves when task has finished */ async _executeTask(taskName, taskFunction, taskParams) { - // if (this._buildCache.isTaskCacheValid(taskName)) { - // // Immediately skip task if cache is valid - // // Continue if cache is (potentially) invalid, in which case taskFunction will - // // validate the cache thoroughly - // this._log.skipTask(taskName); - // return; - // } this._taskStart = performance.now(); await taskFunction(taskParams, this._log); if (this._log.isLevelEnabled("perf")) { @@ -499,10 +484,10 @@ class TaskRunner { } } - async _createDependenciesReader(requiredDirectDependencies) { - if (requiredDirectDependencies.size === this._directDependencies.size) { + async getDependenciesReader(dependencyNames, forceUpdate = false) { + if (!forceUpdate && dependencyNames.size === this._directDependencies.size) { // Shortcut: If all direct dependencies are required, just return the already created reader - return this._allDependenciesReader; + return this._cachedDependenciesReader; } const rootProject = this._project; @@ -510,8 +495,8 @@ class TaskRunner { const readers = []; // Add transitive dependencies to set of required dependencies - const requiredDependencies = new Set(requiredDirectDependencies); - for (const projectName of requiredDirectDependencies) { + const requiredDependencies = new Set(dependencyNames); + for (const projectName of dependencyNames) { this._graph.getTransitiveDependencies(projectName).forEach((depName) => { requiredDependencies.add(depName); }); @@ -525,10 +510,15 @@ class TaskRunner { }); // Create a reader collection for that - return createReaderCollection({ + const reader = createReaderCollection({ name: `Reduced dependency reader collection of project ${rootProject.getName()}`, readers }); + + if (dependencyNames.size === this._directDependencies.size) { + this._cachedDependenciesReader = reader; + } + return reader; } } diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index 8168c27c62a..9d82c78ff50 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -1,8 +1,5 @@ -import micromatch from "micromatch"; import {getLogger} from "@ui5/logger"; -import ResourceRequestGraph, {Request} from "./ResourceRequestGraph.js"; -import ResourceIndex from "./index/ResourceIndex.js"; -import TreeRegistry from "./index/TreeRegistry.js"; +import ResourceRequestManager from "./ResourceRequestManager.js"; const log = getLogger("build:cache:BuildTaskCache"); /** @@ -11,13 +8,6 @@ const log = getLogger("build:cache:BuildTaskCache"); * @property {Set} patterns - Glob patterns used to access resources */ -/** - * @typedef {object} TaskCacheMetadata - * @property {object} requestSetGraph - Serialized resource request graph - * @property {Array} requestSetGraph.nodes - Graph nodes representing request sets - * @property {number} requestSetGraph.nextId - Next available node ID - */ - /** * Manages the build cache for a single task * @@ -39,46 +29,30 @@ export default class BuildTaskCache { #taskName; #projectName; - #resourceRequests; - #readTaskMetadataCache; - #treeRegistries = []; - #useDifferentialUpdate = true; - #hasNewOrModifiedCacheEntries = true; - - // ===== LIFECYCLE ===== + #projectRequestManager; + #dependencyRequestManager; /** * Creates a new BuildTaskCache instance * * @param {string} taskName - Name of the task this cache manages * @param {string} projectName - Name of the project this task belongs to - * @param {Function} readTaskMetadataCache - Function to read cached task metadata + * @param {object} [cachedTaskMetadata] */ - constructor(taskName, projectName, readTaskMetadataCache) { + constructor(taskName, projectName, cachedTaskMetadata) { this.#taskName = taskName; this.#projectName = projectName; - this.#readTaskMetadataCache = readTaskMetadataCache; - } - async #initResourceRequests() { - if (this.#resourceRequests) { - return; // Already initialized - } - if (!this.#readTaskMetadataCache) { + if (cachedTaskMetadata) { + this.#projectRequestManager = ResourceRequestManager.fromCache(taskName, projectName, + cachedTaskMetadata.projectRequests); + this.#dependencyRequestManager = ResourceRequestManager.fromCache(taskName, projectName, + cachedTaskMetadata.dependencyRequests); + } else { // No cache reader provided, start with empty graph - this.#resourceRequests = new ResourceRequestGraph(); - this.#hasNewOrModifiedCacheEntries = true; - return; + this.#projectRequestManager = new ResourceRequestManager(taskName, projectName); + this.#dependencyRequestManager = new ResourceRequestManager(taskName, projectName); } - - const taskMetadata = - await this.#readTaskMetadataCache(); - if (!taskMetadata) { - throw new Error(`No cached metadata found for task '${this.#taskName}' ` + - `of project '${this.#projectName}'`); - } - this.#resourceRequests = this.#restoreGraphFromCache(taskMetadata); - this.#hasNewOrModifiedCacheEntries = false; // Using cache } // ===== METADATA ACCESS ===== @@ -93,162 +67,63 @@ export default class BuildTaskCache { } hasNewOrModifiedCacheEntries() { - return this.#hasNewOrModifiedCacheEntries; + return this.#projectRequestManager.hasNewOrModifiedCacheEntries() || + this.#dependencyRequestManager.hasNewOrModifiedCacheEntries(); + } + + /** + * @param {module:@ui5/fs.AbstractReader} projectReader - Reader for accessing project resources + * @param {string[]} changedProjectResourcePaths - Array of changed project resource path + * @returns {Promise} Whether any index has changed + */ + async updateProjectIndices(projectReader, changedProjectResourcePaths) { + return await this.#projectRequestManager.updateIndices(projectReader, changedProjectResourcePaths); } /** - * Updates resource indices for request sets affected by changed resources - * - * This method: - * 1. Traverses the request graph to find request sets matching changed resources - * 2. Restores missing resource indices if needed - * 3. Updates or removes resources in affected indices - * 4. Flushes all tree registries to apply batched changes * - * Changes propagate from parent to child nodes in the request graph, ensuring - * all derived request sets are updated consistently. + * Special case for dependency indices: Since dependency resources may change independently from this + * projects cache, we need to update the full index once at the beginning of every build from cache. + * This is triggered by calling this method without changedDepResourcePaths. * - * @param {Set} changedProjectResourcePaths - Set of changed project resource paths - * @param {Set} changedDepResourcePaths - Set of changed dependency resource paths - * @param {module:@ui5/fs.AbstractReader} projectReader - Reader for accessing project resources * @param {module:@ui5/fs.AbstractReader} dependencyReader - Reader for accessing dependency resources - * @returns {Promise} + * @param {string[]} [changedDepResourcePaths] - Array of changed dependency resource paths + * @returns {Promise} Whether any index has changed */ - async updateIndices(changedProjectResourcePaths, changedDepResourcePaths, projectReader, dependencyReader) { - await this.#initResourceRequests(); - // Filter relevant resource changes and update the indices if necessary - const matchingRequestSetIds = []; - const updatesByRequestSetId = new Map(); - const changedProjectResourcePathsArray = Array.from(changedProjectResourcePaths); - const changedDepResourcePathsArray = Array.from(changedDepResourcePaths); - // Process all nodes, parents before children - for (const {nodeId, node, parentId} of this.#resourceRequests.traverseByDepth()) { - const addedRequests = node.getAddedRequests(); // Resource requests added at this level - let relevantUpdates; - if (addedRequests.length) { - relevantUpdates = this.#matchResourcePaths( - addedRequests, changedProjectResourcePathsArray, changedDepResourcePathsArray); - } else { - relevantUpdates = []; - } - if (parentId) { - // Include updates from parent nodes - const parentUpdates = updatesByRequestSetId.get(parentId); - if (parentUpdates && parentUpdates.length) { - relevantUpdates.push(...parentUpdates); - } - } - if (relevantUpdates.length) { - updatesByRequestSetId.set(nodeId, relevantUpdates); - matchingRequestSetIds.push(nodeId); - } - } - - const resourceCache = new Map(); - // Update matching resource indices - for (const requestSetId of matchingRequestSetIds) { - const {resourceIndex} = this.#resourceRequests.getMetadata(requestSetId); - if (!resourceIndex) { - throw new Error(`Missing resource index for request set ID ${requestSetId}`); - } - - const resourcePathsToUpdate = updatesByRequestSetId.get(requestSetId); - const resourcesToUpdate = []; - const removedResourcePaths = []; - for (const resourcePath of resourcePathsToUpdate) { - let resource; - if (resourceCache.has(resourcePath)) { - resource = resourceCache.get(resourcePath); - } else { - if (changedDepResourcePaths.has(resourcePath)) { - resource = await dependencyReader.byPath(resourcePath); - } else { - resource = await projectReader.byPath(resourcePath); - } - resourceCache.set(resourcePath, resource); - } - if (resource) { - resourcesToUpdate.push(resource); - } else { - // Resource has been removed - removedResourcePaths.push(resourcePath); - } - } - if (removedResourcePaths.length) { - await resourceIndex.removeResources(removedResourcePaths); - } - if (resourcesToUpdate.length) { - await resourceIndex.upsertResources(resourcesToUpdate); - } - } - if (this.#useDifferentialUpdate) { - return await this.#flushTreeChangesWithDiff(changedProjectResourcePaths); + async updateDependencyIndices(dependencyReader, changedDepResourcePaths) { + if (changedDepResourcePaths) { + return await this.#dependencyRequestManager.updateIndices(dependencyReader, changedDepResourcePaths); } else { - return await this.#flushTreeChanges(changedProjectResourcePaths); + return await this.#dependencyRequestManager.refreshIndices(dependencyReader); } } /** - * Matches changed resources against a set of requests + * Gets all project index signatures for this task * - * Tests each request against the changed resource paths using exact path matching - * for 'path'/'dep-path' requests and glob pattern matching for 'patterns'/'dep-patterns' requests. + * Returns signatures from all recorded project-request sets. Each signature represents + * a unique combination of resources, belonging to the current project, that were accessed + * during task execution. This can be used to form a cache keys for restoring cached task results. * - * @private - * @param {Request[]} resourceRequests - Array of resource requests to match against - * @param {string[]} projectResourcePaths - Changed project resource paths - * @param {string[]} dependencyResourcePaths - Changed dependency resource paths - * @returns {string[]} Array of matched resource paths - * @throws {Error} If an unknown request type is encountered + * @returns {Promise} Array of signature strings + * @throws {Error} If resource index is missing for any request set */ - #matchResourcePaths(resourceRequests, projectResourcePaths, dependencyResourcePaths) { - const matchedResources = []; - for (const {type, value} of resourceRequests) { - switch (type) { - case "path": - if (projectResourcePaths.includes(value)) { - matchedResources.push(value); - } - break; - case "patterns": - matchedResources.push(...micromatch(projectResourcePaths, value)); - break; - case "dep-path": - if (dependencyResourcePaths.includes(value)) { - matchedResources.push(value); - } - break; - case "dep-patterns": - matchedResources.push(...micromatch(dependencyResourcePaths, value)); - break; - default: - throw new Error(`Unknown request type: ${type}`); - } - } - return matchedResources; + getProjectIndexSignatures() { + return this.#projectRequestManager.getIndexSignatures(); } /** - * Gets all possible stage signatures for this task + * Gets all dependency index signatures for this task * - * Returns signatures from all recorded request sets. Each signature represents - * a unique combination of resources that were accessed during task execution. - * Used to look up cached build stages. + * Returns signatures from all recorded dependency-request sets. Each signature represents + * a unique combination of resources, belonging to all dependencies of the current project, that were accessed + * during task execution. This can be used to form a cache keys for restoring cached task results. * - * @returns {Promise} Array of stage signature strings + * @returns {Promise} Array of signature strings * @throws {Error} If resource index is missing for any request set */ - async getPossibleStageSignatures() { - await this.#initResourceRequests(); - const requestSetIds = this.#resourceRequests.getAllNodeIds(); - const signatures = requestSetIds.map((requestSetId) => { - const {resourceIndex} = this.#resourceRequests.getMetadata(requestSetId); - if (!resourceIndex) { - throw new Error(`Resource index missing for request set ID ${requestSetId}`); - } - return resourceIndex.getSignature(); - }); - return signatures; + getDependencyIndexSignatures() { + return this.#dependencyRequestManager.getIndexSignatures(); } /** @@ -264,291 +139,33 @@ export default class BuildTaskCache { * The signature uniquely identifies the set of resources accessed and their * content, enabling cache lookup for previously executed task results. * - * @param {ResourceRequests} projectRequests - Project resource requests (paths and patterns) - * @param {ResourceRequests} [dependencyRequests] - Dependency resource requests (paths and patterns) + * @param {ResourceRequests} projectRequestRecording - Project resource requests (paths and patterns) + * @param {ResourceRequests|undefined} dependencyRequestRecording - Dependency resource requests * @param {module:@ui5/fs.AbstractReader} projectReader - Reader for accessing project resources * @param {module:@ui5/fs.AbstractReader} dependencyReader - Reader for accessing dependency resources * @returns {Promise} Signature hash string of the resource index */ - async calculateSignature(projectRequests, dependencyRequests, projectReader, dependencyReader) { - await this.#initResourceRequests(); - const requests = []; - for (const pathRead of projectRequests.paths) { - requests.push(new Request("path", pathRead)); - } - for (const patterns of projectRequests.patterns) { - requests.push(new Request("patterns", patterns)); - } - if (dependencyRequests) { - for (const pathRead of dependencyRequests.paths) { - requests.push(new Request("dep-path", pathRead)); - } - for (const patterns of dependencyRequests.patterns) { - requests.push(new Request("dep-patterns", patterns)); - } - } - // Try to find an existing request set that we can reuse - let setId = this.#resourceRequests.findExactMatch(requests); - let resourceIndex; - if (setId) { - // Reuse existing resource index. - // Note: This index has already been updated before the task executed, so no update is necessary here - resourceIndex = this.#resourceRequests.getMetadata(setId).resourceIndex; + async recordRequests(projectRequestRecording, dependencyRequestRecording, projectReader, dependencyReader) { + const { + setId: projectReqSetId, signature: projectReqSignature + } = await this.#projectRequestManager.addRequests(projectRequestRecording, projectReader); + + let dependencyReqSignature; + if (dependencyRequestRecording) { + const { + setId: depReqSetId, signature: depReqSignature + } = await this.#dependencyRequestManager.addRequests(dependencyRequestRecording, dependencyReader); + + this.#projectRequestManager.addAffiliatedRequestSet(projectReqSetId, depReqSetId); + dependencyReqSignature = depReqSignature; } else { - // New request set, check whether we can create a delta - const metadata = {}; // Will populate with resourceIndex below - setId = this.#resourceRequests.addRequestSet(requests, metadata); - - const requestSet = this.#resourceRequests.getNode(setId); - const parentId = requestSet.getParentId(); - if (parentId) { - const {resourceIndex: parentResourceIndex} = this.#resourceRequests.getMetadata(parentId); - // Add resources from delta to index - const addedRequests = requestSet.getAddedRequests(); - const resourcesToAdd = - await this.#getResourcesForRequests(addedRequests, projectReader, dependencyReader); - if (!resourcesToAdd.length) { - throw new Error(`Unexpected empty added resources for request set ID ${setId} ` + - `of task '${this.#taskName}' of project '${this.#projectName}'`); - } - log.verbose(`Task '${this.#taskName}' of project '${this.#projectName}' ` + - `created derived resource index for request set ID ${setId} ` + - `based on parent ID ${parentId} with ${resourcesToAdd.length} additional resources`); - resourceIndex = await parentResourceIndex.deriveTree(resourcesToAdd); - } else { - const resourcesRead = - await this.#getResourcesForRequests(requests, projectReader, dependencyReader); - resourceIndex = await ResourceIndex.create(resourcesRead, this.#newTreeRegistry()); - } - metadata.resourceIndex = resourceIndex; + dependencyReqSignature = "X"; // No dependencies accessed } - return resourceIndex.getSignature(); - } - - /** - * Creates and registers a new tree registry - * - * Tree registries enable batched updates across multiple derived trees, - * improving performance when multiple indices share common subtrees. - * - * @private - * @returns {TreeRegistry} New tree registry instance - */ - #newTreeRegistry() { - const registry = new TreeRegistry(); - this.#treeRegistries.push(registry); - return registry; + return [projectReqSignature, dependencyReqSignature]; } - /** - * Flushes all tree registries to apply batched updates - * - * Commits all pending tree modifications across all registries in parallel. - * Must be called after operations that schedule updates via registries. - * - * @private - * @returns {Promise} Object containing sets of added, updated, and removed resource paths - */ - async #flushTreeChanges() { - return await Promise.all(this.#treeRegistries.map((registry) => registry.flush())); - } - - /** - * Flushes all tree registries to apply batched updates - * - * Commits all pending tree modifications across all registries in parallel. - * Must be called after operations that schedule updates via registries. - * - * @param {Set} projectResourcePaths Set of changed project resource paths - * @private - * @returns {Promise} Object containing sets of added, updated, and removed resource paths - */ - async #flushTreeChangesWithDiff(projectResourcePaths) { - const requestSetIds = this.#resourceRequests.getAllNodeIds(); - const trees = new Map(); - // Record current signatures and create mapping between trees and request sets - requestSetIds.map((requestSetId) => { - const {resourceIndex} = this.#resourceRequests.getMetadata(requestSetId); - if (!resourceIndex) { - throw new Error(`Resource index missing for request set ID ${requestSetId}`); - } - trees.set(resourceIndex.getTree(), { - requestSetId, - signature: resourceIndex.getSignature(), - }); - }); - - let greatestNumberOfChanges = 0; - let relevantTree; - let relevantStats; - const res = await this.#flushTreeChanges(); - - // Based on the returned stats, find the tree with the greatest difference - // If none of the updated trees lead to a valid cache, this tree can be used to execute a differential - // build (assuming there's a cache for its previous signature) - for (const {treeStats} of res) { - for (const [tree, stats] of treeStats) { - if (stats.removed.length > 0) { - // If the update process removed resources from that tree, this means that using it in a - // differential build might lead to stale removed resources - return; - } - const numberOfChanges = stats.added.length + stats.updated.length; - if (numberOfChanges > greatestNumberOfChanges) { - greatestNumberOfChanges = numberOfChanges; - relevantTree = tree; - relevantStats = stats; - } - } - } - - if (!relevantTree) { - return; - } - this.#hasNewOrModifiedCacheEntries = true; - - // Update signatures for affected request sets - const {requestSetId, signature: originalSignature} = trees.get(relevantTree); - const newSignature = relevantTree.getRootHash(); - log.verbose(`Task '${this.#taskName}' of project '${this.#projectName}' ` + - `updated resource index for request set ID ${requestSetId} ` + - `from signature ${originalSignature} ` + - `to ${newSignature}`); - - const changedProjectResourcePaths = new Set(); - const changedDependencyResourcePaths = new Set(); - for (const path of relevantStats.added) { - if (projectResourcePaths.has(path)) { - changedProjectResourcePaths.add(path); - } else { - changedDependencyResourcePaths.add(path); - } - } - for (const path of relevantStats.updated) { - if (projectResourcePaths.has(path)) { - changedProjectResourcePaths.add(path); - } else { - changedDependencyResourcePaths.add(path); - } - } - - return { - originalSignature, - newSignature, - changedProjectResourcePaths, - changedDependencyResourcePaths, - }; - } - - /** - * Retrieves resources for a set of resource requests - * - * Processes different request types: - * - 'path': Retrieves single resource by path from project reader - * - 'patterns': Retrieves resources matching glob patterns from project reader - * - 'dep-path': Retrieves single resource by path from dependency reader - * - 'dep-patterns': Retrieves resources matching glob patterns from dependency reader - * - * @private - * @param {Request[]|Array<{type: string, value: string|string[]}>} resourceRequests - Resource requests to process - * @param {module:@ui5/fs.AbstractReader} projectReader - Reader for project resources - * @param {module:@ui5/fs.AbstractReader} dependencyReder - Reader for dependency resources - * @returns {Promise>} Iterator of retrieved resources - * @throws {Error} If an unknown request type is encountered - */ - async #getResourcesForRequests(resourceRequests, projectReader, dependencyReder) { - const resourcesMap = new Map(); - for (const {type, value} of resourceRequests) { - switch (type) { - case "path": { - const resource = await projectReader.byPath(value); - if (resource) { - resourcesMap.set(value, resource); - } - break; - } - case "patterns": { - const matchedResources = await projectReader.byGlob(value); - for (const resource of matchedResources) { - resourcesMap.set(resource.getOriginalPath(), resource); - } - break; - } - case "dep-path": { - const resource = await dependencyReder.byPath(value); - if (resource) { - resourcesMap.set(value, resource); - } - break; - } - case "dep-patterns": { - const matchedResources = await dependencyReder.byGlob(value); - for (const resource of matchedResources) { - resourcesMap.set(resource.getOriginalPath(), resource); - } - break; - } - default: - throw new Error(`Unknown request type: ${type}`); - } - } - return Array.from(resourcesMap.values()); - } - - /** - * Checks if changed resources match this task's tracked resources - * - * This is a fast check that determines if the task *might* be invalidated - * based on path matching and glob patterns. - * - * @param {string[]} projectResourcePaths - Changed project resource paths - * @param {string[]} dependencyResourcePaths - Changed dependency resource paths - * @returns {boolean} True if any changed resources match this task's tracked resources - */ - async matchesChangedResources(projectResourcePaths, dependencyResourcePaths) { - await this.#initResourceRequests(); - const resourceRequests = this.#resourceRequests.getAllRequests(); - return resourceRequests.some(({type, value}) => { - if (type === "path") { - return projectResourcePaths.includes(value); - } - if (type === "patterns") { - return micromatch(projectResourcePaths, value).length > 0; - } - if (type === "dep-path") { - return dependencyResourcePaths.includes(value); - } - if (type === "dep-patterns") { - return micromatch(dependencyResourcePaths, value).length > 0; - } - throw new Error(`Unknown request type: ${type}`); - }); - } - - async isAffectedByProjectChanges(changedPaths) { - await this.#initResourceRequests(); - const resourceRequests = this.#resourceRequests.getAllRequests(); - return resourceRequests.some(({type, value}) => { - if (type === "path") { - return changedPaths.includes(value); - } - if (type === "patterns") { - return micromatch(changedPaths, value).length > 0; - } - }); - } - - async isAffectedByDependencyChanges(changedPaths) { - await this.#initResourceRequests(); - const resourceRequests = this.#resourceRequests.getAllRequests(); - return resourceRequests.some(({type, value}) => { - if (type === "dep-path") { - return changedPaths.includes(value); - } - if (type === "dep-patterns") { - return micromatch(changedPaths, value).length > 0; - } - }); + findDelta() { + // TODO: Implement } /** @@ -559,71 +176,10 @@ export default class BuildTaskCache { * * @returns {TaskCacheMetadata} Serialized cache metadata containing the request set graph */ - toCacheObject() { - if (!this.#resourceRequests) { - throw new Error("BuildTaskCache#toCacheObject: Resource requests not initialized for task " + - `'${this.#taskName}' of project '${this.#projectName}'`); - } - const rootIndices = []; - const deltaIndices = []; - for (const {nodeId, parentId} of this.#resourceRequests.traverseByDepth()) { - const {resourceIndex} = this.#resourceRequests.getMetadata(nodeId); - if (!resourceIndex) { - throw new Error(`Missing resource index for node ID ${nodeId}`); - } - if (!parentId) { - rootIndices.push({ - nodeId, - resourceIndex: resourceIndex.toCacheObject(), - }); - } else { - const {resourceIndex: rootResourceIndex} = this.#resourceRequests.getMetadata(parentId); - if (!rootResourceIndex) { - throw new Error(`Missing root resource index for parent ID ${parentId}`); - } - // Store the metadata for all added resources. Note: Those resources might not be available - // in the current tree. In that case we store an empty array. - const addedResourceIndex = resourceIndex.getAddedResourceIndex(rootResourceIndex); - deltaIndices.push({ - nodeId, - addedResourceIndex, - }); - } - } + toCacheObjects() { return { - requestSetGraph: this.#resourceRequests.toCacheObject(), - rootIndices, - deltaIndices, + projectRequests: this.#projectRequestManager.toCacheObject(), + dependencyRequests: this.#dependencyRequestManager.toCacheObject(), }; } - - #restoreGraphFromCache({requestSetGraph, rootIndices, deltaIndices}) { - const resourceRequests = ResourceRequestGraph.fromCacheObject(requestSetGraph); - const registries = new Map(); - // Restore root resource indices - for (const {nodeId, resourceIndex: serializedIndex} of rootIndices) { - const metadata = resourceRequests.getMetadata(nodeId); - const registry = this.#newTreeRegistry(); - registries.set(nodeId, registry); - metadata.resourceIndex = ResourceIndex.fromCache(serializedIndex, registry); - } - // Restore delta resource indices - if (deltaIndices) { - for (const {nodeId, addedResourceIndex} of deltaIndices) { - const node = resourceRequests.getNode(nodeId); - const {resourceIndex: parentResourceIndex} = resourceRequests.getMetadata(node.getParentId()); - const registry = registries.get(node.getParentId()); - if (!registry) { - throw new Error(`Missing tree registry for parent of node ID ${nodeId} of task ` + - `'${this.#taskName}' of project '${this.#projectName}'`); - } - const resourceIndex = parentResourceIndex.deriveTreeWithIndex(addedResourceIndex); - - resourceRequests.setMetadata(nodeId, { - resourceIndex, - }); - } - } - return resourceRequests; - } } diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 46971cebbb2..469c748ac6b 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -11,6 +11,15 @@ import ResourceIndex from "./index/ResourceIndex.js"; import {firstTruthy} from "./utils.js"; const log = getLogger("build:cache:ProjectBuildCache"); +export const CACHE_STATES = Object.freeze({ + INITIALIZING: "initializing", + INITIALIZED: "initialized", + EMPTY: "empty", + STALE: "stale", + FRESH: "fresh", + DIRTY: "dirty", +}); + /** * @typedef {object} StageMetadata * @property {Object} resourceMetadata @@ -19,7 +28,7 @@ const log = getLogger("build:cache:ProjectBuildCache"); /** * @typedef {object} StageCacheEntry * @property {@ui5/fs/AbstractReader} stage - Reader for the cached stage - * @property {Set} writtenResourcePaths - Set of resource paths written by the task + * @property {string[]} writtenResourcePaths - Set of resource paths written by the task */ export default class ProjectBuildCache { @@ -28,25 +37,21 @@ export default class ProjectBuildCache { #project; #buildSignature; - // #buildManifest; #cacheManager; #currentProjectReader; - #dependencyReader; + #currentDependencyReader; #sourceIndex; #cachedSourceSignature; - #resultIndex; + #currentDependencySignatures = new Map(); #cachedResultSignature; #currentResultSignature; - #usingResultStage = false; - // Pending changes - #changedProjectSourcePaths = new Set(); - #changedProjectResourcePaths = new Set(); - #changedDependencyResourcePaths = new Set(); - #changedResultResourcePaths = new Set(); + #changedProjectSourcePaths = []; + #changedDependencyResourcePaths = []; + #writtenResultResourcePaths = []; - #invalidatedTasks = new Map(); + #cacheState = CACHE_STATES.INITIALIZING; /** * Creates a new ProjectBuildCache instance @@ -77,223 +82,161 @@ export default class ProjectBuildCache { */ static async create(project, buildSignature, cacheManager) { const cache = new ProjectBuildCache(project, buildSignature, cacheManager); - await cache.#init(); + await cache.#initSourceIndex(); return cache; } /** - * Initializes the cache by loading resource index, build manifest, and checking cache validity + * Sets the dependency reader for accessing dependency resources * - * @private - * @returns {Promise} + * The dependency reader is used by tasks to access resources from project + * dependencies. Must be set before tasks that require dependencies are executed. + * + * @param {@ui5/fs/AbstractReader} dependencyReader - Reader for dependency resources + * @param {boolean} [forceDependencyUpdate=false] + * @returns {Promise} True if cache is fresh and can be fully utilized, false otherwise */ - async #init() { - // this.#buildManifest = await this.#loadBuildManifest(); - // this.#sourceIndex = await this.#initResourceIndex(); - // const hasIndexCache = await this.#loadIndexCache(); - // const requiresDepdendencyResources = true; // TODO: Determine dynamically using task caches - // this.#requiresInitialBuild = !hasIndexCache || requiresDepdendencyResources; - } + async prepareProjectBuildAndValidateCache(dependencyReader, forceDependencyUpdate = false) { + this.#currentProjectReader = this.#project.getReader(); + this.#currentDependencyReader = dependencyReader; - /** - * Determines changed resources since last build - * - * This is expected to be the first method called on the cache. - * Hence it will perform some initialization and deserialization tasks as needed. - */ - async determineChangedResources() { - // TODO: Start detached initializations in constructor and await them here? - let changedSourcePaths; - if (!this.#sourceIndex) { - changedSourcePaths = await this.#initSourceIndex(); - for (const resourcePath of changedSourcePaths) { - this.#changedProjectSourcePaths.add(resourcePath); - } - } else if (this.#changedProjectSourcePaths.size) { - changedSourcePaths = await this._updateSourceIndex(this.#changedProjectSourcePaths); - } else { - changedSourcePaths = []; + if (this.#cacheState === CACHE_STATES.EMPTY) { + log.verbose(`Project ${this.#project.getName()} has empty cache, skipping change processing.`); + return false; } - - if (!this.#resultIndex) { - await this.#initResultIndex(); + if (forceDependencyUpdate) { + await this.#updateDependencyIndices(dependencyReader); } - - await this.#flushPendingInputChanges(); - return changedSourcePaths; + await this.#flushPendingChanges(); + const changedResources = await this.#findResultCache(); + return changedResources; } /** - * Determines whether a rebuild is needed. - * - * A rebuild is required if: - * - No task cache exists - * - Any tasks have been invalidated - * - Initial build is required (e.g., cache couldn't be loaded) - * - * @param {string[]} dependencySignatures - Sorted by name of the dependency project - * @returns {boolean} True if rebuild is needed, false if cache can be fully utilized - */ - async requiresBuild(dependencySignatures) { - if (this.#invalidatedTasks.size > 0) { - this.#usingResultStage = false; - return true; + * Processes changed resources since last build, updating indices and invalidating tasks as needed + */ + async #flushPendingChanges() { + if (this.#changedProjectSourcePaths.length === 0 && + this.#changedDependencyResourcePaths.length === 0) { + return; } - - if (this.#usingResultStage && this.#invalidatedTasks.size === 0) { - return false; + let sourceIndexChanged = false; + if (this.#changedProjectSourcePaths.length) { + // Update source index so we can use the signature later as part of the result stage signature + sourceIndexChanged = await this.#updateSourceIndex(this.#changedProjectSourcePaths); } - if (await this.#hasValidResultCache(dependencySignatures)) { - return false; + let depIndicesChanged = false; + if (this.#changedDependencyResourcePaths.length) { + await Promise.all(Array.from(this.#taskCache.values()).map(async (taskCache) => { + const changed = await taskCache + .updateDependencyIndices(this.#currentDependencyReader, this.#changedDependencyResourcePaths); + if (changed) { + depIndicesChanged = true; + } + })); } - return true; - } - - async getResultSignature() { - // Do not include dependency signatures here. They are not relevant to consumers of this project and would - // unnecessarily invalidate their caches. - return this.#resultIndex.getSignature(); - } - /** - * Initializes the resource index from cache or creates a new one - * - * This method attempts to load a cached resource index. If found, it validates - * the index against current source files and invalidates affected tasks if - * resources have changed. If no cache exists, creates a fresh index. - * - * @private - * @throws {Error} If cached index signature doesn't match computed signature - */ - async #initSourceIndex() { - const sourceReader = this.#project.getSourceReader(); - const [resources, indexCache] = await Promise.all([ - await sourceReader.byGlob("/**/*"), - await this.#cacheManager.readIndexCache(this.#project.getId(), this.#buildSignature, "source"), - ]); - if (indexCache) { - log.verbose(`Using cached resource index for project ${this.#project.getName()}`); - // Create and diff resource index - const {resourceIndex, changedPaths} = - await ResourceIndex.fromCacheWithDelta(indexCache, resources); - // Import task caches - - for (const taskName of indexCache.taskList) { - this.#taskCache.set(taskName, - new BuildTaskCache(taskName, this.#project.getName(), - this.#createBuildTaskCacheMetadataReader(taskName))); - } - if (changedPaths.length) { - // Invalidate tasks based on changed resources - // Note: If the changed paths don't affect any task, the index cache still can't be used due to the - // root hash mismatch. - // Since no tasks have been invalidated, a rebuild is still necessary in this case, so that - // each task can find and use its individual stage cache. - // Hence requiresInitialBuild will be set to true in this case (and others. - const tasksInvalidated = await this._invalidateTasks(changedPaths, []); - if (!tasksInvalidated) { - this.#cachedSourceSignature = resourceIndex.getSignature(); - } - // for (const resourcePath of changedPaths) { - // this.#changedProjectResourcePaths.add(resourcePath); - // } - } else if (indexCache.indexTree.root.hash !== resourceIndex.getSignature()) { - // Validate index signature matches with cached signature - throw new Error( - `Resource index signature mismatch for project ${this.#project.getName()}: ` + - `expected ${indexCache.indexTree.root.hash}, got ${resourceIndex.getSignature()}`); - } else { - log.verbose( - `Resource index signature for project ${this.#project.getName()} matches cached signature: ` + - `${resourceIndex.getSignature()}`); - this.#cachedSourceSignature = resourceIndex.getSignature(); - } - this.#sourceIndex = resourceIndex; - return changedPaths; + if (sourceIndexChanged || depIndicesChanged) { + // Relevant resources have changed, mark the cache as dirty + this.#cacheState = CACHE_STATES.DIRTY; } else { - // No index cache found, create new index - this.#sourceIndex = await ResourceIndex.create(resources); - return []; + log.verbose(`No relevant resource changes detected for project ${this.#project.getName()}`); } + + // Reset pending changes + this.#changedProjectSourcePaths = []; + this.#changedDependencyResourcePaths = []; } - async _updateSourceIndex(resourcePaths) { - if (resourcePaths.size === 0) { - return []; - } - const sourceReader = this.#project.getSourceReader(); - const resources = await Promise.all(Array.from(resourcePaths).map(async (resourcePath) => { - const resource = await sourceReader.byPath(resourcePath); - if (!resource) { - throw new Error( - `Failed to update source index for project ${this.#project.getName()}: ` + - `resource at path ${resourcePath} not found in source reader`); + async #updateDependencyIndices(dependencyReader) { + let depIndicesChanged = false; + await Promise.all(Array.from(this.#taskCache.values()).map(async (taskCache) => { + const changed = await taskCache.updateDependencyIndices(this.#currentDependencyReader); + if (changed) { + depIndicesChanged = true; } - return resource; })); - const res = await this.#sourceIndex.upsertResources(resources); - return [...res.added, ...res.updated]; - } - - async #initResultIndex() { - const indexCache = await this.#cacheManager.readIndexCache( - this.#project.getId(), this.#buildSignature, "result"); - - if (indexCache) { - log.verbose(`Using cached result resource index for project ${this.#project.getName()}`); - this.#resultIndex = await ResourceIndex.fromCache(indexCache); - this.#cachedResultSignature = this.#resultIndex.getSignature(); - } else { - this.#resultIndex = await ResourceIndex.create([]); + if (depIndicesChanged) { + // Relevant resources have changed, mark the cache as dirty + this.#cacheState = CACHE_STATES.DIRTY; } + // Reset pending dependency changes since indices are fresh now anyways + this.#changedDependencyResourcePaths = []; } - #getResultStageSignature(sourceSignature, dependencySignatures) { - // Different from the project cache's "result signature", the "result stage signature" includes the - // signatures of dependencies, since they possibly affect the result stage's content. - const stageSignature = `${sourceSignature}|${dependencySignatures.join("|")}`; - return crypto.createHash("sha256").update(stageSignature).digest("hex"); + isFresh() { + return this.#cacheState === CACHE_STATES.FRESH; } /** - * Loads the cached result stage from persistent storage + * Loads a cached result stage from persistent storage if available * * Attempts to load a cached result stage using the resource index signature. * If found, creates a reader for the cached stage and sets it as the project's * result stage. * - * @param {string[]} dependencySignatures - * @private - * @returns {Promise} True if cache was loaded successfully, false otherwise + * @returns {Promise} */ - async #hasValidResultCache(dependencySignatures) { - const stageSignature = this.#getResultStageSignature(this.#sourceIndex.getSignature(), dependencySignatures); - if (this.#currentResultSignature === stageSignature) { - // log.verbose( - // `Project ${this.#project.getName()} result stage signature unchanged: ${stageSignature}`); - // TODO: Requires setResultStage again? - return this.#usingResultStage; + async #findResultCache() { + if (this.#cacheState === CACHE_STATES.STALE && this.#currentResultSignature) { + log.verbose(`Project ${this.#project.getName()} cache state is stale but no changes have been detected. ` + + `Continuing with current result stage: ${this.#currentResultSignature}`); + this.#cacheState = CACHE_STATES.FRESH; + return []; } - this.#currentResultSignature = stageSignature; - const stageId = "result"; - log.verbose(`Project ${this.#project.getName()} resource index signature: ${stageSignature}`); - const stageCache = await this.#cacheManager.readStageCache( - this.#project.getId(), this.#buildSignature, stageId, stageSignature); + if (![CACHE_STATES.STALE, CACHE_STATES.DIRTY, CACHE_STATES.INITIALIZED].includes(this.#cacheState)) { + log.verbose(`Project ${this.#project.getName()} cache state is ${this.#cacheState}, ` + + `skipping result cache validation.`); + return; + } + const stageSignatures = this.#getPossibleResultStageSignatures(); + if (stageSignatures.includes(this.#currentResultSignature)) { + log.verbose( + `Project ${this.#project.getName()} result stage signature unchanged: ${this.#currentResultSignature}`); + this.#cacheState = CACHE_STATES.FRESH; + return []; + } + const stageCache = await this.#findStageCache("result", stageSignatures); if (!stageCache) { log.verbose( - `No cached stage found for project ${this.#project.getName()} with index signature ${stageSignature}`); - return false; + `No cached stage found for project ${this.#project.getName()}. Searching with ` + + `${stageSignatures.length} possible signatures.`); + // Cache state remains dirty + // this.#cacheState = CACHE_STATES.EMPTY; + return; } + const {stage, signature, writtenResourcePaths} = stageCache; log.verbose( - `Using cached result stage for project ${this.#project.getName()} with index signature ${stageSignature}`); - const reader = await this.#createReaderForStageCache( - stageId, stageSignature, stageCache.resourceMetadata); - this.#project.setResultStage(reader); + `Using cached result stage for project ${this.#project.getName()} with index signature ${signature}`); + this.#currentResultSignature = signature; + this.#cachedResultSignature = signature; + this.#project.setResultStage(stage); this.#project.useResultStage(); - this.#usingResultStage = true; - return true; + this.#cacheState = CACHE_STATES.FRESH; + return writtenResourcePaths; + } + + #getPossibleResultStageSignatures() { + const projectSourceSignature = this.#sourceIndex.getSignature(); + + const taskDependencySignatures = []; + for (const taskCache of this.#taskCache.values()) { + taskDependencySignatures.push(taskCache.getDependencyIndexSignatures()); + } + const dependencySignaturesCombinations = cartesianProduct(taskDependencySignatures); + + return dependencySignaturesCombinations.map((dependencySignatures) => { + const combinedDepSignature = createDependencySignature(dependencySignatures); + return createStageSignature(projectSourceSignature, combinedDepSignature); + }); + } + + #getResultStageSignature() { + const projectSourceSignature = this.#sourceIndex.getSignature(); + const combinedDepSignature = createDependencySignature(Array.from(this.#currentDependencySignatures.values())); + return createStageSignature(projectSourceSignature, combinedDepSignature); } // ===== TASK MANAGEMENT ===== @@ -310,7 +253,7 @@ export default class ProjectBuildCache { * @param {string} taskName - Name of the task to prepare * @returns {Promise} True or object if task can use cache, false otherwise */ - async prepareTaskExecution(taskName) { + async prepareTaskExecutionAndValidateCache(taskName) { const stageName = this.#getStageNameForTask(taskName); const taskCache = this.#taskCache.get(taskName); // Store current project reader (= state of the previous stage) for later use (e.g. in recordTaskResult) @@ -318,59 +261,84 @@ export default class ProjectBuildCache { // Switch project to new stage this.#project.useStage(stageName); log.verbose(`Preparing task execution for task ${taskName} in project ${this.#project.getName()}...`); - if (taskCache) { - let deltaInfo; - if (this.#invalidatedTasks.has(taskName)) { - const invalidationInfo = - this.#invalidatedTasks.get(taskName); - log.verbose(`Task cache for task ${taskName} has been invalidated, updating indices ` + - `with ${invalidationInfo.changedProjectResourcePaths.size} changed project resource paths and ` + - `${invalidationInfo.changedDependencyResourcePaths.size} changed dependency resource paths...`); - deltaInfo = await taskCache.updateIndices( - invalidationInfo.changedProjectResourcePaths, - invalidationInfo.changedDependencyResourcePaths, - this.#currentProjectReader, this.#dependencyReader); - } // else: Index will be created upon task completion - - // After index update, try to find cached stages for the new signatures - const stageSignatures = await taskCache.getPossibleStageSignatures(); - const stageCache = await this.#findStageCache(stageName, stageSignatures); - if (stageCache) { - const stageChanged = this.#project.setStage(stageName, stageCache.stage); - - // Task can be skipped, use cached stage as project reader - if (this.#invalidatedTasks.has(taskName)) { - this.#invalidatedTasks.delete(taskName); - } + if (!taskCache) { + log.verbose(`No task cache found`); + return false; + } - if (!stageChanged && stageCache.writtenResourcePaths.size) { - // Invalidate following tasks - this.#invalidateFollowingTasks(taskName, Array.from(stageCache.writtenResourcePaths)); - } - return true; // No need to execute the task - } else if (deltaInfo) { - log.verbose(`No cached stage found for task ${taskName} in project ${this.#project.getName()}`); - - const deltaStageCache = await this.#findStageCache(stageName, [deltaInfo.originalSignature]); - if (deltaStageCache) { - log.verbose( - `Using delta cached stage for task ${taskName} in project ${this.#project.getName()} ` + - `with original signature ${deltaInfo.originalSignature} (now ${deltaInfo.newSignature}) ` + - `and ${deltaInfo.changedProjectResourcePaths.size} changed project resource paths and ` + - `${deltaInfo.changedDependencyResourcePaths.size} changed dependency resource paths.`); + if (this.#writtenResultResourcePaths.length) { + // Update task indices based on source changes and changes from by previous tasks + await taskCache.updateProjectIndices(this.#currentProjectReader, this.#writtenResultResourcePaths); + } - return { - previousStageCache: deltaStageCache, - newSignature: deltaInfo.newSignature, - changedProjectResourcePaths: deltaInfo.changedProjectResourcePaths, - changedDependencyResourcePaths: deltaInfo.changedDependencyResourcePaths - }; + // let deltaInfo; + // if (this.#invalidatedTasks.has(taskName)) { + // const invalidationInfo = + // this.#invalidatedTasks.get(taskName); + // log.verbose(`Task cache for task ${taskName} has been invalidated, updating indices ` + + // `with ${invalidationInfo.changedProjectResourcePaths.size} changed project resource paths and ` + + // `${invalidationInfo.changedDependencyResourcePaths.size} changed dependency resource paths...`); + + + // // deltaInfo = await taskCache.updateIndices( + // // invalidationInfo.changedProjectResourcePaths, + // // invalidationInfo.changedDependencyResourcePaths, + // // this.#currentProjectReader, this.#currentDependencyReader); + // } // else: Index will be created upon task completion + + // After index update, try to find cached stages for the new signatures + // let stageSignatures = taskCache.getAffiliatedSignaturePairs(); // TODO: Implement + + const stageSignatures = combineTwoArraysFast( + taskCache.getProjectIndexSignatures(), + taskCache.getDependencyIndexSignatures() + ).map((signaturePair) => { + return createStageSignature(...signaturePair); + }); + + const stageCache = await this.#findStageCache(stageName, stageSignatures); + if (stageCache) { + const stageChanged = this.#project.setStage(stageName, stageCache.stage); + + // Store dependency signature for later use in result stage signature calculation + this.#currentDependencySignatures.set(taskName, stageCache.signature.split("-")[1]); + + // Task can be skipped, use cached stage as project reader + // if (this.#invalidatedTasks.has(taskName)) { + // this.#invalidatedTasks.delete(taskName); + // } + + if (!stageChanged) { + // Invalidate following tasks + // this.#invalidateFollowingTasks(taskName, Array.from(stageCache.writtenResourcePaths)); + for (const resourcePath of stageCache.writtenResourcePaths) { + if (!this.#writtenResultResourcePaths.includes(resourcePath)) { + this.#writtenResultResourcePaths.push(resourcePath); + } } } + return true; // No need to execute the task } else { - log.verbose(`No task cache found`); + log.verbose(`No cached stage found for task ${taskName} in project ${this.#project.getName()}`); + // TODO: Re-implement + // const deltaInfo = taskCache.findDelta(); + + // const deltaStageCache = await this.#findStageCache(stageName, [deltaInfo.originalSignature]); + // if (deltaStageCache) { + // log.verbose( + // `Using delta cached stage for task ${taskName} in project ${this.#project.getName()} ` + + // `with original signature ${deltaInfo.originalSignature} (now ${deltaInfo.newSignature}) ` + + // `and ${deltaInfo.changedProjectResourcePaths.size} changed project resource paths and ` + + // `${deltaInfo.changedDependencyResourcePaths.size} changed dependency resource paths.`); + + // return { + // previousStageCache: deltaStageCache, + // newSignature: deltaInfo.newSignature, + // changedProjectResourcePaths: deltaInfo.changedProjectResourcePaths, + // changedDependencyResourcePaths: deltaInfo.changedDependencyResourcePaths + // }; + // } } - return false; // Task needs to be executed } @@ -396,17 +364,20 @@ export default class ProjectBuildCache { return stageCache; } } - + // TODO: If list of signatures is longer than N, + // retrieve all available signatures from cache manager first. + // Later maybe add a bloom filter for even larger sets const stageCache = await firstTruthy(stageSignatures.map(async (stageSignature) => { const stageMetadata = await this.#cacheManager.readStageCache( this.#project.getId(), this.#buildSignature, stageName, stageSignature); if (stageMetadata) { log.verbose(`Found cached stage with signature ${stageSignature}`); - const reader = await this.#createReaderForStageCache( + const reader = this.#createReaderForStageCache( stageName, stageSignature, stageMetadata.resourceMetadata); return { + signature: stageSignature, stage: reader, - writtenResourcePaths: new Set(Object.keys(stageMetadata.resourceMetadata)), + writtenResourcePaths: Object.keys(stageMetadata.resourceMetadata), }; } })); @@ -426,7 +397,7 @@ export default class ProjectBuildCache { * @param {string} taskName - Name of the executed task * @param {@ui5/project/build/cache/BuildTaskCache~ResourceRequests} projectResourceRequests * Resource requests for project resources - * @param {@ui5/project/build/cache/BuildTaskCache~ResourceRequests} dependencyResourceRequests + * @param {@ui5/project/build/cache/BuildTaskCache~ResourceRequests|undefined} dependencyResourceRequests * Resource requests for dependency resources * @param {object} cacheInfo * @returns {Promise} @@ -436,7 +407,7 @@ export default class ProjectBuildCache { // Initialize task cache this.#taskCache.set(taskName, new BuildTaskCache(taskName, this.#project.getName())); } - log.verbose(`Updating build cache with results of task ${taskName} in project ${this.#project.getName()}`); + log.verbose(`Recording results of task ${taskName} in project ${this.#project.getName()}...`); const taskCache = this.#taskCache.get(taskName); // Identify resources written by task @@ -447,6 +418,7 @@ export default class ProjectBuildCache { let stageSignature; if (cacheInfo) { + // TODO: Update stageSignature = cacheInfo.newSignature; // Add resources from previous stage cache to current stage let reader; @@ -466,15 +438,18 @@ export default class ProjectBuildCache { } } else { // Calculate signature for executed task - stageSignature = await taskCache.calculateSignature( + const currentSignaturePair = await taskCache.recordRequests( projectResourceRequests, dependencyResourceRequests, this.#currentProjectReader, - this.#dependencyReader + this.#currentDependencyReader ); + // If provided, set dependency signature for later use in result stage signature calculation + this.#currentDependencySignatures.set(taskName, currentSignaturePair[1]); + stageSignature = createStageSignature(...currentSignaturePair); } - log.verbose(`Storing stage for task ${taskName} in project ${this.#project.getName()} ` + + log.verbose(`Caching stage for task ${taskName} in project ${this.#project.getName()} ` + `with signature ${stageSignature}`); // Store resulting stage in stage cache // TODO: Check whether signature already exists and avoid invalidating following tasks @@ -482,73 +457,21 @@ export default class ProjectBuildCache { this.#getStageNameForTask(taskName), stageSignature, this.#project.getStage(), writtenResourcePaths); - // Task has been successfully executed, remove from invalidated tasks - if (this.#invalidatedTasks.has(taskName)) { - this.#invalidatedTasks.delete(taskName); - } + // // Task has been successfully executed, remove from invalidated tasks + // if (this.#invalidatedTasks.has(taskName)) { + // this.#invalidatedTasks.delete(taskName); + // } // Update task cache with new metadata - if (writtenResourcePaths.length) { - log.verbose(`Task ${taskName} produced ${writtenResourcePaths.length} resources`); - this.#invalidateFollowingTasks(taskName, writtenResourcePaths); - } - // Reset current project reader - this.#currentProjectReader = null; - } - - /** - * Invalidates tasks that follow the given task if they depend on written resources - * - * Checks all tasks that come after the given task in execution order and - * invalidates those that match the written resource paths. - * - * @private - * @param {string} taskName - Name of the task that wrote resources - * @param {string[]} writtenResourcePaths - Paths of resources written by the task - */ - async #invalidateFollowingTasks(taskName, writtenResourcePaths) { - // Check whether following tasks need to be invalidated - const allTasks = Array.from(this.#taskCache.keys()); - const taskIdx = allTasks.indexOf(taskName); - for (let i = taskIdx + 1; i < allTasks.length; i++) { - const nextTaskName = allTasks[i]; - if (!await this.#taskCache.get(nextTaskName).matchesChangedResources(writtenResourcePaths, [])) { - continue; - } - if (this.#invalidatedTasks.has(nextTaskName)) { - const {changedProjectResourcePaths} = - this.#invalidatedTasks.get(nextTaskName); - for (const resourcePath of writtenResourcePaths) { - changedProjectResourcePaths.add(resourcePath); - } - } else { - this.#invalidatedTasks.set(nextTaskName, { - changedProjectResourcePaths: new Set(writtenResourcePaths), - changedDependencyResourcePaths: new Set() - }); - } - } + log.verbose(`Task ${taskName} produced ${writtenResourcePaths.length} resources`); for (const resourcePath of writtenResourcePaths) { - this.#changedResultResourcePaths.add(resourcePath); - } - } - - async #updateResultIndex(resourcePaths) { - const deltaReader = this.#project.getReader({excludeSourceReader: true}); - - const resources = await Promise.all(Array.from(resourcePaths).map(async (resourcePath) => { - const resource = await deltaReader.byPath(resourcePath); - if (!resource) { - throw new Error( - `Failed to update result index for project ${this.#project.getName()}: ` + - `resource at path ${resourcePath} not found in result reader`); + if (!this.#writtenResultResourcePaths.includes(resourcePath)) { + this.#writtenResultResourcePaths.push(resourcePath); } - return resource; - })); - - const res = await this.#resultIndex.upsertResources(resources); - return [...res.added, ...res.updated]; + } + // Reset current project reader + this.#currentProjectReader = null; } /** @@ -561,174 +484,38 @@ export default class ProjectBuildCache { return this.#taskCache.get(taskName); } - async projectSourcesChanged(changedPaths) { - for (const resourcePath of changedPaths) { - this.#changedProjectSourcePaths.add(resourcePath); - } - } - - /** - * Handles resource changes - * - * Iterates through all cached tasks and checks if any match the changed resources. - * Matching tasks are marked as invalidated and will need to be re-executed. - * Changed resource paths are accumulated if a task is already invalidated. - * - * @param {string[]} changedPaths - Changed project resource paths - * @returns {boolean} True if any task was invalidated, false otherwise - */ - // async projectResourcesChanged(changedPaths) { - // let taskInvalidated = false; - // for (const taskCache of this.#taskCache.values()) { - // if (await taskCache.isAffectedByProjectChanges(changedPaths)) { - // taskInvalidated = true; - // break; - // } - // } - // if (taskInvalidated) { - // for (const resourcePath of changedPaths) { - // this.#changedProjectResourcePaths.add(resourcePath); - // } - // } - // return taskInvalidated; - // } - /** - * Handles resource changes and invalidates affected tasks + * Records changed source files of the project and marks cache as stale * - * Iterates through all cached tasks and checks if any match the changed resources. - * Matching tasks are marked as invalidated and will need to be re-executed. - * Changed resource paths are accumulated if a task is already invalidated. - * - * @param {string[]} changedPaths - Changed dependency resource paths - * @returns {boolean} True if any task was invalidated, false otherwise + * @param {string[]} changedPaths - Changed project source file paths */ - async dependencyResourcesChanged(changedPaths) { - // let taskInvalidated = false; - // for (const taskCache of this.#taskCache.values()) { - // if (await taskCache.isAffectedByDependencyChanges(changedPaths)) { - // taskInvalidated = true; - // break; - // } - // } - // if (taskInvalidated) { + projectSourcesChanged(changedPaths) { for (const resourcePath of changedPaths) { - this.#changedDependencyResourcePaths.add(resourcePath); + if (!this.#changedProjectSourcePaths.includes(resourcePath)) { + this.#changedProjectSourcePaths.push(resourcePath); + } } - // } - // return taskInvalidated; - } - - async #flushPendingInputChanges() { - if (this.#changedProjectSourcePaths.size === 0 && - this.#changedDependencyResourcePaths.size === 0) { - return []; + if (this.#cacheState !== CACHE_STATES.EMPTY) { + // If there is a cache, mark it as stale + this.#cacheState = CACHE_STATES.STALE; } - await this._invalidateTasks( - Array.from(this.#changedProjectSourcePaths), - Array.from(this.#changedDependencyResourcePaths)); - - // Reset pending changes - this.#changedProjectSourcePaths = new Set(); - this.#changedDependencyResourcePaths = new Set(); } /** - * Handles resource changes and invalidates affected tasks - * - * Iterates through all cached tasks and checks if any match the changed resources. - * Matching tasks are marked as invalidated and will need to be re-executed. - * Changed resource paths are accumulated if a task is already invalidated. + * Records changed dependency resources and marks cache as stale * - * @param {string[]} projectResourcePaths - Changed project resource paths - * @param {string[]} dependencyResourcePaths - Changed dependency resource paths - * @returns {boolean} True if any task was invalidated, false otherwise + * @param {string[]} changedPaths - Changed dependency resource paths */ - async _invalidateTasks(projectResourcePaths, dependencyResourcePaths) { - let taskInvalidated = false; - for (const [taskName, taskCache] of this.#taskCache) { - if (!await taskCache.matchesChangedResources(projectResourcePaths, dependencyResourcePaths)) { - continue; - } - taskInvalidated = true; - if (this.#invalidatedTasks.has(taskName)) { - const {changedProjectResourcePaths, changedDependencyResourcePaths} = - this.#invalidatedTasks.get(taskName); - for (const resourcePath of projectResourcePaths) { - changedProjectResourcePaths.add(resourcePath); - } - for (const resourcePath of dependencyResourcePaths) { - changedDependencyResourcePaths.add(resourcePath); - } - } else { - this.#invalidatedTasks.set(taskName, { - changedProjectResourcePaths: new Set(projectResourcePaths), - changedDependencyResourcePaths: new Set(dependencyResourcePaths) - }); + dependencyResourcesChanged(changedPaths) { + for (const resourcePath of changedPaths) { + if (!this.#changedDependencyResourcePaths.includes(resourcePath)) { + this.#changedDependencyResourcePaths.push(resourcePath); } } - return taskInvalidated; - } - - // async areTasksAffectedByResource(projectResourcePaths, dependencyResourcePaths) { - // for (const taskCache of this.#taskCache.values()) { - // if (await taskCache.matchesChangedResources(projectResourcePaths, dependencyResourcePaths)) { - // return true; - // } - // } - // } - - /** - * Gets the set of changed project resource paths for a task - * - * @param {string} taskName - Name of the task - * @returns {Set} Set of changed project resource paths - */ - getChangedProjectResourcePaths(taskName) { - return this.#invalidatedTasks.get(taskName)?.changedProjectResourcePaths ?? new Set(); - } - - /** - * Gets the set of changed dependency resource paths for a task - * - * @param {string} taskName - Name of the task - * @returns {Set} Set of changed dependency resource paths - */ - getChangedDependencyResourcePaths(taskName) { - return this.#invalidatedTasks.get(taskName)?.changedDependencyResourcePaths ?? new Set(); - } - - // ===== CACHE QUERIES ===== - - /** - * Checks if any task cache exists - * - * @returns {boolean} True if at least one task has been cached - */ - hasAnyTaskCache() { - return this.#taskCache.size > 0; - } - - /** - * Checks whether the project's build cache has an entry for the given task - * - * This means that the cache has been filled with the input and output of the given task. - * - * @param {string} taskName - Name of the task - * @returns {boolean} True if cache exists for this task - */ - hasTaskCache(taskName) { - return this.#taskCache.has(taskName); - } - - /** - * Checks whether the cache for a specific task is currently valid - * - * @param {string} taskName - Name of the task - * @returns {boolean} True if cache exists and is valid for this task - */ - isTaskCacheValid(taskName) { - return this.#taskCache.has(taskName) && !this.#invalidatedTasks.has(taskName); + if (this.#cacheState !== CACHE_STATES.EMPTY) { + // If there is a cache, mark it as stale + this.#cacheState = CACHE_STATES.STALE; + } } /** @@ -747,19 +534,6 @@ export default class ProjectBuildCache { // TODO: Rename function? We simply use it to have a point in time right before the project is built } - /** - * Sets the dependency reader for accessing dependency resources - * - * The dependency reader is used by tasks to access resources from project - * dependencies. Must be set before tasks that require dependencies are executed. - * - * @param {@ui5/fs/AbstractReader} dependencyReader - Reader for dependency resources - * @returns {void} - */ - setDependencyReader(dependencyReader) { - this.#dependencyReader = dependencyReader; - } - /** * Signals that all tasks have completed and switches to the result stage * @@ -771,26 +545,17 @@ export default class ProjectBuildCache { */ async allTasksCompleted() { this.#project.useResultStage(); - this.#usingResultStage = true; - const changedPaths = await this.#updateResultIndex(this.#changedResultResourcePaths); + this.#cacheState = CACHE_STATES.FRESH; + const changedPaths = this.#writtenResultResourcePaths; + + this.#currentResultSignature = this.#getResultStageSignature(); // Reset updated resource paths - this.#changedResultResourcePaths = new Set(); + this.#writtenResultResourcePaths = []; + this.#currentDependencySignatures = new Map(); return changedPaths; } - /** - * Gets the names of all invalidated tasks - * - * Invalidated tasks are those that need to be re-executed because their - * input resources have changed. - * - * @returns {string[]} Array of task names that have been invalidated - */ - getInvalidatedTaskNames() { - return Array.from(this.#invalidatedTasks.keys()); - } - /** * Generates the stage name for a given task * @@ -802,13 +567,128 @@ export default class ProjectBuildCache { return `task/${taskName}`; } + /** + * Initializes the resource index from cache or creates a new one + * + * This method attempts to load a cached resource index. If found, it validates + * the index against current source files and invalidates affected tasks if + * resources have changed. If no cache exists, creates a fresh index. + * + * @private + * @throws {Error} If cached index signature doesn't match computed signature + */ + async #initSourceIndex() { + const sourceReader = this.#project.getSourceReader(); + const [resources, indexCache] = await Promise.all([ + await sourceReader.byGlob("/**/*"), + await this.#cacheManager.readIndexCache(this.#project.getId(), this.#buildSignature, "source"), + ]); + if (indexCache) { + log.verbose(`Using cached resource index for project ${this.#project.getName()}`); + // Create and diff resource index + const {resourceIndex, changedPaths} = + await ResourceIndex.fromCacheWithDelta(indexCache, resources, Date.now()); + + // Import task caches + const buildTaskCaches = await Promise.all(indexCache.taskList.map(async (taskName) => { + const projectRequests = await this.#cacheManager.readTaskMetadata( + this.#project.getId(), this.#buildSignature, `${taskName}-pr`); + if (!projectRequests) { + throw new Error(`Failed to load project request cache for task ` + + `${taskName} in project ${this.#project.getName()}`); + } + const dependencyRequests = await this.#cacheManager.readTaskMetadata( + this.#project.getId(), this.#buildSignature, `${taskName}-dr`); + if (!dependencyRequests) { + throw new Error(`Failed to load dependency request cache for task ` + + `${taskName} in project ${this.#project.getName()}`); + } + return new BuildTaskCache(taskName, this.#project.getName(), { + projectRequests, + dependencyRequests, + }); + })); + // Ensure taskCache is filled in the order of task execution + for (const buildTaskCache of buildTaskCaches) { + this.#taskCache.set(buildTaskCache.getTaskName(), buildTaskCache); + } + + if (changedPaths.length) { + this.#cacheState = CACHE_STATES.DIRTY; + } else { + this.#cacheState = CACHE_STATES.INITIALIZED; + } + // // Invalidate tasks based on changed resources + // // Note: If the changed paths don't affect any task, the index cache still can't be used due to the + // // root hash mismatch. + // // Since no tasks have been invalidated, a rebuild is still necessary in this case, so that + // // each task can find and use its individual stage cache. + // // Hence requiresInitialBuild will be set to true in this case (and others. + // // const tasksInvalidated = await this.#invalidateTasks(changedPaths, []); + // // if (!tasksInvalidated) { + + // // } + // } else if (indexCache.indexTree.root.hash !== resourceIndex.getSignature()) { + // // Validate index signature matches with cached signature + // throw new Error( + // `Resource index signature mismatch for project ${this.#project.getName()}: ` + + // `expected ${indexCache.indexTree.root.hash}, got ${resourceIndex.getSignature()}`); + // } + + // else { + // log.verbose( + // `Resource index signature for project ${this.#project.getName()} matches cached signature: ` + + // `${resourceIndex.getSignature()}`); + // // this.#cachedSourceSignature = resourceIndex.getSignature(); + // } + this.#sourceIndex = resourceIndex; + this.#cachedSourceSignature = resourceIndex.getSignature(); + this.#changedProjectSourcePaths = changedPaths; + this.#writtenResultResourcePaths = changedPaths; + } else { + // No index cache found, create new index + this.#sourceIndex = await ResourceIndex.create(resources, Date.now()); + this.#cacheState = CACHE_STATES.EMPTY; + } + } + + async #updateSourceIndex(changedResourcePaths) { + const sourceReader = this.#project.getSourceReader(); + + const resources = await Promise.all(changedResourcePaths.map((resourcePath) => { + return sourceReader.byPath(resourcePath); + })); + const removedResources = []; + const foundResources = resources.filter((resource) => { + if (!resource) { + removedResources.push(resource); + return false; + } + return true; + }); + const {removed} = await this.#sourceIndex.removeResources(removedResources); + const {added, updated} = await this.#sourceIndex.upsertResources(foundResources, Date.now()); + + if (removed.length || added.length || updated.length) { + log.verbose(`Source resource index for project ${this.#project.getName()} updated: ` + + `${removed.length} removed, ${added.length} added, ${updated.length} updated resources.`); + const changedPaths = [...removed, ...added, ...updated]; + for (const resourcePath of changedPaths) { + if (!this.#writtenResultResourcePaths.includes(resourcePath)) { + this.#writtenResultResourcePaths.push(resourcePath); + } + } + return true; + } + return false; + } + // ===== CACHE SERIALIZATION ===== /** * Stores all cache data to persistent storage * * This method: - * 1. Writes the build manifest (if not already written) * 2. Stores the result stage with all resources * 3. Writes the resource index and task metadata * 4. Stores all stage caches from the queue @@ -819,46 +699,14 @@ export default class ProjectBuildCache { * @returns {Promise} */ async writeCache(buildManifest) { - // if (!this.#buildManifest) { - // log.verbose(`Storing build manifest for project ${this.#project.getName()} ` + - // `with build signature ${this.#buildSignature}`); - // // Write build manifest if it wasn't loaded from cache before - // this.#buildManifest = buildManifest; - // await this.#cacheManager.writeBuildManifest(this.#project.getId(), this.#buildSignature, buildManifest); - // } - - // Store result stage - await this.#writeResultIndex(); - - // Store task caches - for (const [taskName, taskCache] of this.#taskCache) { - if (taskCache.hasNewOrModifiedCacheEntries()) { - log.verbose(`Storing task cache metadata for task ${taskName} in project ${this.#project.getName()} ` + - `with build signature ${this.#buildSignature}`); - await this.#cacheManager.writeTaskMetadata(this.#project.getId(), this.#buildSignature, taskName, - taskCache.toCacheObject()); - } - } - - await this.#writeStageCaches(); + await Promise.all([ + this.#writeResultStageCache(), - await this.#writeSourceIndex(); - } + this.#writeTaskStageCaches(), + this.#writeTaskMetadataCaches(), - async #writeSourceIndex() { - if (this.#cachedSourceSignature === this.#sourceIndex.getSignature()) { - // No changes to already cached result index - return; - } - - // Finally store index cache - log.verbose(`Storing resource index cache for project ${this.#project.getName()} ` + - `with build signature ${this.#buildSignature}`); - const sourceIndexObject = this.#sourceIndex.toCacheObject(); - await this.#cacheManager.writeIndexCache(this.#project.getId(), this.#buildSignature, "source", { - ...sourceIndexObject, - taskList: Array.from(this.#taskCache.keys()), - }); + this.#writeSourceIndex(), + ]); } /** @@ -868,22 +716,21 @@ export default class ProjectBuildCache { * stores their content via the cache manager, and writes stage metadata * including resource information. * - * @private * @returns {Promise} */ - async #writeResultIndex() { - if (this.#cachedResultSignature === this.#resultIndex.getSignature()) { - // No changes to already cached result index + async #writeResultStageCache() { + const stageSignature = this.#currentResultSignature; + if (stageSignature === this.#cachedResultSignature) { + // No changes to already cached result stage return; } - const stageSignature = this.#currentResultSignature; const stageId = "result"; - const deltaReader = this.#project.getReader({excludeSourceReader: true}); const resources = await deltaReader.byGlob("/**/*"); const resourceMetadata = Object.create(null); - log.verbose(`Project ${this.#project.getName()} resource index signature: ${stageSignature}`); - log.verbose(`Caching result stage with ${resources.length} resources`); + log.verbose(`Project ${this.#project.getName()} result stage signature is: ${stageSignature}`); + log.verbose(`Cache state: ${this.#cacheState}`); + log.verbose(`Storing result stage cache with ${resources.length} resources`); await Promise.all(resources.map(async (res) => { // Store resource content in cacache via CacheManager @@ -902,15 +749,12 @@ export default class ProjectBuildCache { }; await this.#cacheManager.writeStageCache( this.#project.getId(), this.#buildSignature, stageId, stageSignature, metadata); - - // After all resources have been stored, write updated result index hash tree - const resultIndexObject = this.#resultIndex.toCacheObject(); - await this.#cacheManager.writeIndexCache(this.#project.getId(), this.#buildSignature, "result", { - ...resultIndexObject - }); } - async #writeStageCaches() { + async #writeTaskStageCaches() { + if (!this.#stageCache.hasPendingCacheQueue()) { + return; + } // Store stage caches log.verbose(`Storing stage caches for project ${this.#project.getName()} ` + `with build signature ${this.#buildSignature}`); @@ -941,10 +785,39 @@ export default class ProjectBuildCache { })); } - #createBuildTaskCacheMetadataReader(taskName) { - return () => { - return this.#cacheManager.readTaskMetadata(this.#project.getId(), this.#buildSignature, taskName); - }; + async #writeTaskMetadataCaches() { + // Store task caches + for (const [taskName, taskCache] of this.#taskCache) { + if (taskCache.hasNewOrModifiedCacheEntries()) { + const {projectRequests, dependencyRequests} = taskCache.toCacheObjects(); + log.verbose(`Storing task cache metadata for task ${taskName} in project ${this.#project.getName()} ` + + `with build signature ${this.#buildSignature}`); + const writes = []; + if (projectRequests) { + writes.push(this.#cacheManager.writeTaskMetadata( + this.#project.getId(), this.#buildSignature, `${taskName}-pr`, projectRequests)); + } + if (dependencyRequests) { + writes.push(this.#cacheManager.writeTaskMetadata( + this.#project.getId(), this.#buildSignature, `${taskName}-dr`, dependencyRequests)); + } + await Promise.all(writes); + } + } + } + + async #writeSourceIndex() { + if (this.#cachedSourceSignature === this.#sourceIndex.getSignature()) { + // No changes to already cached result index + return; + } + log.verbose(`Storing resource index cache for project ${this.#project.getName()} ` + + `with build signature ${this.#buildSignature}`); + const sourceIndexObject = this.#sourceIndex.toCacheObject(); + await this.#cacheManager.writeIndexCache(this.#project.getId(), this.#buildSignature, "source", { + ...sourceIndexObject, + taskList: Array.from(this.#taskCache.keys()), + }); } /** @@ -959,7 +832,7 @@ export default class ProjectBuildCache { * @param {Object} resourceMetadata - Metadata for all cached resources * @returns {Promise<@ui5/fs/AbstractReader>} Proxy reader for cached resources */ - async #createReaderForStageCache(stageId, stageSignature, resourceMetadata) { + #createReaderForStageCache(stageId, stageSignature, resourceMetadata) { const allResourcePaths = Object.keys(resourceMetadata); return createProxy({ name: `Cache reader for task ${stageId} in project ${this.#project.getName()}`, @@ -1005,50 +878,46 @@ export default class ProjectBuildCache { } }); } - /** - * Loads and validates the build manifest from persistent storage - * - * Attempts to load the build manifest and performs validation: - * - Checks manifest version compatibility (must be "1.0") - * - Validates build signature matches the expected signature - * - * If validation fails, the cache is considered invalid and will be ignored. - * - * @param taskName - * @private - * @returns {Promise} Build manifest object or undefined if not found/invalid - * @throws {Error} If build signature mismatch or cache restoration fails - */ - // async #loadBuildManifest() { - // const manifest = await this.#cacheManager.readBuildManifest(this.#project.getId(), this.#buildSignature); - // if (!manifest) { - // log.verbose(`No build manifest found for project ${this.#project.getName()} ` + - // `with build signature ${this.#buildSignature}`); - // return; - // } - - // try { - // // Check build manifest version - // const {buildManifest} = manifest; - // if (buildManifest.manifestVersion !== "1.0") { - // log.verbose(`Incompatible build manifest version ${manifest.version} found for project ` + - // `${this.#project.getName()} with build signature ${this.#buildSignature}. Ignoring cache.`); - // return; - // } - // // TODO: Validate manifest against a schema - - // // Validate build signature match - // if (this.#buildSignature !== manifest.buildManifest.signature) { - // throw new Error( - // `Build manifest signature ${manifest.buildManifest.signature} does not match expected ` + - // `build signature ${this.#buildSignature} for project ${this.#project.getName()}`); - // } - // return buildManifest; - // } catch (err) { - // throw new Error( - // `Failed to restore cache from disk for project ${this.#project.getName()}: ${err.message}`, { - // cause: err - // }); - // } - // } +} + +function cartesianProduct(arrays) { + if (arrays.length === 0) return [[]]; + if (arrays.some((arr) => arr.length === 0)) return []; + + let result = [[]]; + + for (const array of arrays) { + const temp = []; + for (const resultItem of result) { + for (const item of array) { + temp.push([...resultItem, item]); + } + } + result = temp; + } + + return result; +} + +function combineTwoArraysFast(array1, array2) { + const len1 = array1.length; + const len2 = array2.length; + const result = new Array(len1 * len2); + + let idx = 0; + for (let i = 0; i < len1; i++) { + for (let j = 0; j < len2; j++) { + result[idx++] = [array1[i], array2[j]]; + } + } + + return result; +} + +function createStageSignature(projectSignature, dependencySignature) { + return `${projectSignature}-${dependencySignature}`; +} + +function createDependencySignature(stageDependencySignatures) { + return crypto.createHash("sha256").update(stageDependencySignatures.join("")).digest("hex"); } diff --git a/packages/project/lib/build/cache/ResourceRequestGraph.js b/packages/project/lib/build/cache/ResourceRequestGraph.js index 65366ac3885..099939a3cea 100644 --- a/packages/project/lib/build/cache/ResourceRequestGraph.js +++ b/packages/project/lib/build/cache/ResourceRequestGraph.js @@ -1,11 +1,11 @@ -const ALLOWED_REQUEST_TYPES = new Set(["path", "patterns", "dep-path", "dep-patterns"]); +const ALLOWED_REQUEST_TYPES = new Set(["path", "patterns"]); /** * Represents a single request with type and value */ export class Request { /** - * @param {string} type - Either 'path', 'pattern', "dep-path" or "dep-pattern" + * @param {string} type - Either 'path' or 'pattern' * @param {string|string[]} value - The request value (string for path types, array for pattern types) */ constructor(type, value) { @@ -14,7 +14,7 @@ export class Request { } // Validate value type based on request type - if ((type === "path" || type === "dep-path") && typeof value !== "string") { + if (type === "path" && typeof value !== "string") { throw new Error(`Request type '${type}' requires value to be a string`); } @@ -368,6 +368,10 @@ export default class ResourceRequestGraph { }; } + getSize() { + return this.nodes.size; + } + /** * Iterate through nodes in breadth-first order (by depth level). * Parents are always yielded before their children, allowing efficient traversal diff --git a/packages/project/lib/build/cache/ResourceRequestManager.js b/packages/project/lib/build/cache/ResourceRequestManager.js new file mode 100644 index 00000000000..6a2fcb05de1 --- /dev/null +++ b/packages/project/lib/build/cache/ResourceRequestManager.js @@ -0,0 +1,533 @@ +import micromatch from "micromatch"; +import ResourceRequestGraph, {Request} from "./ResourceRequestGraph.js"; +import ResourceIndex from "./index/ResourceIndex.js"; +import TreeRegistry from "./index/TreeRegistry.js"; +import {getLogger} from "@ui5/logger"; +const log = getLogger("build:cache:ResourceRequestManager"); + +class ResourceRequestManager { + #taskName; + #projectName; + #requestGraph; + + #treeRegistries = []; + #treeDiffs = new Map(); + + #hasNewOrModifiedCacheEntries; + #useDifferentialUpdate = true; + + constructor(taskName, projectName, requestGraph) { + this.#taskName = taskName; + this.#projectName = projectName; + if (requestGraph) { + this.#requestGraph = requestGraph; + this.#hasNewOrModifiedCacheEntries = false; // Using cache + } else { + this.#requestGraph = new ResourceRequestGraph(); + this.#hasNewOrModifiedCacheEntries = true; + } + } + + static fromCache(taskName, projectName, {requestSetGraph, rootIndices, deltaIndices}) { + const requestGraph = ResourceRequestGraph.fromCacheObject(requestSetGraph); + const resourceRequestManager = new ResourceRequestManager(taskName, projectName, requestGraph); + const registries = new Map(); + // Restore root resource indices + for (const {nodeId, resourceIndex: serializedIndex} of rootIndices) { + const metadata = requestGraph.getMetadata(nodeId); + const registry = resourceRequestManager.#newTreeRegistry(); + registries.set(nodeId, registry); + metadata.resourceIndex = ResourceIndex.fromCache(serializedIndex, registry); + } + // Restore delta resource indices + if (deltaIndices) { + for (const {nodeId, addedResourceIndex} of deltaIndices) { + const node = requestGraph.getNode(nodeId); + const {resourceIndex: parentResourceIndex} = requestGraph.getMetadata(node.getParentId()); + const registry = registries.get(node.getParentId()); + if (!registry) { + throw new Error(`Missing tree registry for parent of node ID ${nodeId} of task ` + + `'${this.#taskName}' of project '${this.#projectName}'`); + } + const resourceIndex = parentResourceIndex.deriveTreeWithIndex(addedResourceIndex); + + requestGraph.setMetadata(nodeId, { + resourceIndex, + }); + } + } + return resourceRequestManager; + } + + /** + * Gets all project index signatures for this task + * + * Returns signatures from all recorded project-request sets. Each signature represents + * a unique combination of resources belonging to the current project that were accessed + * during task execution. This can be used to form a cache keys for restoring cached task results. + * + * @returns {Promise} Array of signature strings + * @throws {Error} If resource index is missing for any request set + */ + getIndexSignatures() { + const requestSetIds = this.#requestGraph.getAllNodeIds(); + if (requestSetIds.length === 0) { + return ["X"]; // No requests recorded, return static signature + } + const signatures = requestSetIds.map((requestSetId) => { + const {resourceIndex} = this.#requestGraph.getMetadata(requestSetId); + if (!resourceIndex) { + throw new Error(`Resource index missing for request set ID ${requestSetId}`); + } + return resourceIndex.getSignature(); + }); + return signatures; + } + + /** + * Update all indices based on current resources (no delta update) + * + * @param {module:@ui5/fs.AbstractReader} reader - Reader for accessing project resources + */ + async refreshIndices(reader) { + if (this.#requestGraph.getSize() === 0) { + // No requests recorded -> No updates necessary + return false; + } + + const resourceCache = new Map(); + for (const {nodeId} of this.#requestGraph.traverseByDepth()) { + const {resourceIndex} = this.#requestGraph.getMetadata(nodeId); + if (!resourceIndex) { + throw new Error(`Missing resource index for request set ID ${nodeId}`); + } + const addedRequests = this.#requestGraph.getNode(nodeId).getAddedRequests(); + const resourcesToUpdate = await this.#getResourcesForRequests(addedRequests, reader, resourceCache); + + // Determine resources to remove + const indexedResourcePaths = resourceIndex.getResourcePaths(); + const currentResourcePaths = resourcesToUpdate.map((res) => res.getOriginalPath()); + const resourcesToRemove = indexedResourcePaths.filter((resPath) => { + return !currentResourcePaths.includes(resPath); + }); + if (resourcesToRemove.length) { + await resourceIndex.removeResources(resourcesToRemove); + } + if (resourcesToUpdate.length) { + await resourceIndex.upsertResources(resourcesToUpdate); + } + } + } + + /** + * Filter relevant resource changes and update the indices if necessary + * + * @param {module:@ui5/fs.AbstractReader} reader - Reader for accessing project resources + * @param {string[]} changedResourcePaths - Array of changed project resource path + * @returns {Promise} True if any changes were detected, false otherwise + */ + async updateIndices(reader, changedResourcePaths) { + const matchingRequestSetIds = []; + const updatesByRequestSetId = new Map(); + if (this.#requestGraph.getSize() === 0) { + // No requests recorded -> No updates necessary + return false; + } + + // Process all nodes, parents before children + for (const {nodeId, node, parentId} of this.#requestGraph.traverseByDepth()) { + const addedRequests = node.getAddedRequests(); // Resource requests added at this level + let relevantUpdates; + if (addedRequests.length) { + relevantUpdates = this.#matchResourcePaths(addedRequests, changedResourcePaths); + } else { + relevantUpdates = []; + } + if (parentId) { + // Include updates from parent nodes + const parentUpdates = updatesByRequestSetId.get(parentId); + if (parentUpdates && parentUpdates.length) { + relevantUpdates.push(...parentUpdates); + } + } + if (relevantUpdates.length) { + updatesByRequestSetId.set(nodeId, relevantUpdates); + matchingRequestSetIds.push(nodeId); + } + } + + const resourceCache = new Map(); + // Update matching resource indices + for (const requestSetId of matchingRequestSetIds) { + const {resourceIndex} = this.#requestGraph.getMetadata(requestSetId); + if (!resourceIndex) { + throw new Error(`Missing resource index for request set ID ${requestSetId}`); + } + + const resourcePathsToUpdate = updatesByRequestSetId.get(requestSetId); + const resourcesToUpdate = []; + const removedResourcePaths = []; + for (const resourcePath of resourcePathsToUpdate) { + let resource; + if (resourceCache.has(resourcePath)) { + resource = resourceCache.get(resourcePath); + } else { + resource = await reader.byPath(resourcePath); + resourceCache.set(resourcePath, resource); + } + if (resource) { + resourcesToUpdate.push(resource); + } else { + // Resource has been removed + removedResourcePaths.push(resourcePath); + } + } + if (removedResourcePaths.length) { + await resourceIndex.removeResources(removedResourcePaths); + } + if (resourcesToUpdate.length) { + await resourceIndex.upsertResources(resourcesToUpdate); + } + } + if (this.#useDifferentialUpdate) { + return await this.#flushTreeChangesWithDiffTracking(); + } else { + return await this.#flushTreeChangesWithoutDiffTracking(); + } + } + + /** + * Matches changed resources against a set of requests + * + * Tests each request against the changed resource paths using exact path matching + * for 'path'/'dep-path' requests and glob pattern matching for 'patterns'/'dep-patterns' requests. + * + * @private + * @param {Request[]} resourceRequests - Array of resource requests to match against + * @param {string[]} resourcePaths - Changed project resource paths + * @returns {string[]} Array of matched resource paths + */ + #matchResourcePaths(resourceRequests, resourcePaths) { + const matchedResources = []; + for (const {type, value} of resourceRequests) { + if (type === "path") { + if (resourcePaths.includes(value)) { + matchedResources.push(value); + } + } else { + matchedResources.push(...micromatch(resourcePaths, value)); + } + } + return matchedResources; + } + + /** + * Flushes all tree registries to apply batched updates, ignoring how trees changed + * + * @returns {Promise} True if any changes were detected, false otherwise + */ + async #flushTreeChangesWithoutDiffTracking() { + const results = await this.#flushTreeChanges(); + + // Check for changes + for (const res of results) { + if (res.added.length || res.updated.length || res.unchanged.length || res.removed.length) { + return true; + } + } + return false; + } + + /** + * Flushes all tree registries to apply batched updates, keeping track of how trees changed + * + * @returns {Promise} True if any changes were detected, false otherwise + */ + async #flushTreeChangesWithDiffTracking() { + const requestSetIds = this.#requestGraph.getAllNodeIds(); + // Record current signatures and create mapping between trees and request sets + requestSetIds.map((requestSetId) => { + const {resourceIndex} = this.#requestGraph.getMetadata(requestSetId); + if (!resourceIndex) { + throw new Error(`Resource index missing for request set ID ${requestSetId}`); + } + // Store original signatures for all trees that are not yet tracked + if (!this.#treeDiffs.has(resourceIndex.getTree())) { + this.#treeDiffs.set(resourceIndex.getTree(), { + requestSetId, + signature: resourceIndex.getSignature(), + }); + } + }); + const results = await this.#flushTreeChanges(); + let hasChanges = false; + for (const res of results) { + if (res.added.length || res.updated.length || res.unchanged.length || res.removed.length) { + hasChanges = true; + } + for (const [tree, stats] of res.treeStats) { + this.#addStatsToTreeDiff(this.#treeDiffs.get(tree), stats); + } + } + return hasChanges; + + // let greatestNumberOfChanges = 0; + // let relevantTree; + // let relevantStats; + // let hasChanges = false; + // const results = await this.#flushTreeChanges(); + + // // Based on the returned stats, find the tree with the greatest difference + // // If none of the updated trees lead to a valid cache, this tree can be used to execute a differential + // // build (assuming there's a cache for its previous signature) + // for (const res of results) { + // if (res.added.length || res.updated.length || res.unchanged.length || res.removed.length) { + // hasChanges = true; + // } + // for (const [tree, stats] of res.treeStats) { + // if (stats.removed.length > 0) { + // // If the update process removed resources from that tree, this means that using it in a + // // differential build might lead to stale removed resources + // return; // TODO: continue; instead? + // } + // const numberOfChanges = stats.added.length + stats.updated.length; + // if (numberOfChanges > greatestNumberOfChanges) { + // greatestNumberOfChanges = numberOfChanges; + // relevantTree = tree; + // relevantStats = stats; + // } + // } + // } + // if (hasChanges) { + // this.#hasNewOrModifiedCacheEntries = true; + // } + + // if (!relevantTree) { + // return hasChanges; + // } + + // // Update signatures for affected request sets + // const {requestSetId, signature: originalSignature} = trees.get(relevantTree); + // const newSignature = relevantTree.getRootHash(); + // log.verbose(`Task '${this.#taskName}' of project '${this.#projectName}' ` + + // `updated resource index for request set ID ${requestSetId} ` + + // `from signature ${originalSignature} ` + + // `to ${newSignature}`); + + // const changedPaths = new Set(); + // for (const path of relevantStats.added) { + // changedPaths.add(path); + // } + // for (const path of relevantStats.updated) { + // changedPaths.add(path); + // } + + // return { + // originalSignature, + // newSignature, + // changedPaths, + // }; + } + + /** + * Flushes all tree registries to apply batched updates + * + * Commits all pending tree modifications across all registries in parallel. + * Must be called after operations that schedule updates via registries. + * + * @returns {Promise} Object containing sets of added, updated, and removed resource paths + */ + async #flushTreeChanges() { + return await Promise.all(this.#treeRegistries.map((registry) => registry.flush())); + } + + #addStatsToTreeDiff(treeDiff, stats) { + if (!treeDiff.stats) { + treeDiff.stats = { + added: new Set(), + updated: new Set(), + unchanged: new Set(), + removed: new Set(), + }; + } + for (const path of stats.added) { + treeDiff.stats.added.add(path); + } + for (const path of stats.updated) { + treeDiff.stats.updated.add(path); + } + for (const path of stats.unchanged) { + treeDiff.stats.unchanged.add(path); + } + for (const path of stats.removed) { + treeDiff.stats.removed.add(path); + } + } + + /** + * + * @param {ResourceRequests} requestRecording - Project resource requests (paths and patterns) + * @param {module:@ui5/fs.AbstractReader} reader - Reader for accessing project resources + * @returns {Promise} Signature hash string of the resource index + */ + async addRequests(requestRecording, reader) { + const projectRequests = []; + for (const pathRead of requestRecording.paths) { + projectRequests.push(new Request("path", pathRead)); + } + for (const patterns of requestRecording.patterns) { + projectRequests.push(new Request("patterns", patterns)); + } + return await this.#addRequestSet(projectRequests, reader); + } + + async #addRequestSet(requests, reader) { + // Try to find an existing request set that we can reuse + let setId = this.#requestGraph.findExactMatch(requests); + let resourceIndex; + if (setId) { + // Reuse existing resource index. + // Note: This index has already been updated before the task executed, so no update is necessary here + resourceIndex = this.#requestGraph.getMetadata(setId).resourceIndex; + } else { + // New request set, check whether we can create a delta + const metadata = {}; // Will populate with resourceIndex below + setId = this.#requestGraph.addRequestSet(requests, metadata); + + const requestSet = this.#requestGraph.getNode(setId); + const parentId = requestSet.getParentId(); + if (parentId) { + const {resourceIndex: parentResourceIndex} = this.#requestGraph.getMetadata(parentId); + // Add resources from delta to index + const addedRequests = requestSet.getAddedRequests(); + const resourcesToAdd = + await this.#getResourcesForRequests(addedRequests, reader); + if (!resourcesToAdd.length) { + throw new Error(`Unexpected empty added resources for request set ID ${setId} ` + + `of task '${this.#taskName}' of project '${this.#projectName}'`); + } + log.verbose(`Task '${this.#taskName}' of project '${this.#projectName}' ` + + `created derived resource index for request set ID ${setId} ` + + `based on parent ID ${parentId} with ${resourcesToAdd.length} additional resources`); + resourceIndex = await parentResourceIndex.deriveTree(resourcesToAdd); + } else { + const resourcesRead = + await this.#getResourcesForRequests(requests, reader); + resourceIndex = await ResourceIndex.create(resourcesRead, Date.now(), this.#newTreeRegistry()); + } + metadata.resourceIndex = resourceIndex; + } + return { + setId, + signature: resourceIndex.getSignature(), + }; + } + + addAffiliatedRequestSet(ourRequestSetId, foreignRequestSetId) { + // TODO + } + + /** + * Creates and registers a new tree registry + * + * Tree registries enable batched updates across multiple derived trees, + * improving performance when multiple indices share common subtrees. + * + * @returns {TreeRegistry} New tree registry instance + */ + #newTreeRegistry() { + const registry = new TreeRegistry(); + this.#treeRegistries.push(registry); + return registry; + } + + /** + * Retrieves resources for a set of resource requests + * + * Processes different request types: + * - 'path': Retrieves single resource by path from the given reader + * - 'patterns': Retrieves resources matching glob patterns from the given reader + * + * @private + * @param {Request[]|Array<{type: string, value: string|string[]}>} resourceRequests - Resource requests to process + * @param {module:@ui5/fs.AbstractReader} reader - Resource reader + * @param {Map} [resourceCache] + * @returns {Promise>} Array of matched resources + */ + async #getResourcesForRequests(resourceRequests, reader, resourceCache) { + const resourcesMap = new Map(); + await Promise.all(resourceRequests.map(async ({type, value}) => { + if (type === "path") { + if (resourcesMap.has(value)) { + // Resource already found + return; + } + if (resourceCache?.has(value)) { + const cachedResource = resourceCache.get(value); + resourcesMap.set(cachedResource.getOriginalPath(), cachedResource); + } + const resource = await reader.byPath(value); + if (resource) { + resourcesMap.set(resource.getOriginalPath(), resource); + } + } else if (type === "patterns") { + const matchedResources = await reader.byGlob(value); + for (const resource of matchedResources) { + resourcesMap.set(resource.getOriginalPath(), resource); + } + } + })); + return Array.from(resourcesMap.values()); + } + + hasNewOrModifiedCacheEntries() { + return this.#hasNewOrModifiedCacheEntries; + } + + /** + * Serializes the task cache to a plain object for persistence + * + * Exports the resource request graph in a format suitable for JSON serialization. + * The serialized data can be passed to the constructor to restore the cache state. + * + * @returns {TaskCacheMetadata} Serialized cache metadata containing the request set graph + */ + toCacheObject() { + if (!this.#hasNewOrModifiedCacheEntries) { + return; + } + const rootIndices = []; + const deltaIndices = []; + for (const {nodeId, parentId} of this.#requestGraph.traverseByDepth()) { + const {resourceIndex} = this.#requestGraph.getMetadata(nodeId); + if (!resourceIndex) { + throw new Error(`Missing resource index for node ID ${nodeId}`); + } + if (!parentId) { + rootIndices.push({ + nodeId, + resourceIndex: resourceIndex.toCacheObject(), + }); + } else { + const {resourceIndex: rootResourceIndex} = this.#requestGraph.getMetadata(parentId); + if (!rootResourceIndex) { + throw new Error(`Missing root resource index for parent ID ${parentId}`); + } + // Store the metadata for all added resources. Note: Those resources might not be available + // in the current tree. In that case we store an empty array. + const addedResourceIndex = resourceIndex.getAddedResourceIndex(rootResourceIndex); + deltaIndices.push({ + nodeId, + addedResourceIndex, + }); + } + } + return { + requestSetGraph: this.#requestGraph.toCacheObject(), + rootIndices, + deltaIndices, + }; + } +} + +export default ResourceRequestManager; diff --git a/packages/project/lib/build/cache/StageCache.js b/packages/project/lib/build/cache/StageCache.js index 519531720c6..cd9031c197a 100644 --- a/packages/project/lib/build/cache/StageCache.js +++ b/packages/project/lib/build/cache/StageCache.js @@ -1,7 +1,7 @@ /** * @typedef {object} StageCacheEntry * @property {object} stage - The cached stage instance (typically a reader or writer) - * @property {Set} writtenResourcePaths - Set of resource paths written during stage execution + * @property {string[]} writtenResourcePaths - Set of resource paths written during stage execution */ /** @@ -36,7 +36,7 @@ export default class StageCache { * @param {string} stageId - Identifier for the stage (e.g., "task/generateBundle") * @param {string} signature - Content hash signature of the stage's input resources * @param {object} stageInstance - The stage instance to cache (typically a reader or writer) - * @param {Set} writtenResourcePaths - Set of resource paths written during this stage + * @param {string[]} writtenResourcePaths - Set of resource paths written during this stage * @returns {void} */ addSignature(stageId, signature, stageInstance, writtenResourcePaths) { @@ -45,6 +45,7 @@ export default class StageCache { } const signatureToStageInstance = this.#stageIdToSignatures.get(stageId); signatureToStageInstance.set(signature, { + signature, stage: stageInstance, writtenResourcePaths, }); @@ -86,4 +87,13 @@ export default class StageCache { this.#cacheQueue = []; return queue; } + + /** + * Checks if there are pending entries in the cache queue + * + * @returns {boolean} True if there are entries to flush, false otherwise + */ + hasPendingCacheQueue() { + return this.#cacheQueue.length > 0; + } } diff --git a/packages/project/lib/build/cache/index/HashTree.js b/packages/project/lib/build/cache/index/HashTree.js index 4b4bd264a01..adf354197d3 100644 --- a/packages/project/lib/build/cache/index/HashTree.js +++ b/packages/project/lib/build/cache/index/HashTree.js @@ -247,9 +247,9 @@ export default class HashTree { // Insert the resource const resourceName = parts[parts.length - 1]; - if (current.children.has(resourceName)) { - throw new Error(`Duplicate resource path: ${resourcePath}`); - } + // if (current.children.has(resourceName)) { + // throw new Error(`Duplicate resource path: ${resourcePath}`); + // } const resourceNode = new TreeNode(resourceName, "resource", { integrity: resourceData.integrity, diff --git a/packages/project/lib/build/cache/index/ResourceIndex.js b/packages/project/lib/build/cache/index/ResourceIndex.js index 18f64371d62..ed17e533355 100644 --- a/packages/project/lib/build/cache/index/ResourceIndex.js +++ b/packages/project/lib/build/cache/index/ResourceIndex.js @@ -49,12 +49,12 @@ export default class ResourceIndex { * signature calculation and change tracking. * * @param {Array<@ui5/fs/Resource>} resources - Resources to index - * @param {TreeRegistry} [registry] - Optional tree registry for structural sharing within trees * @param {number} indexTimestamp Timestamp at which the provided resources have been indexed + * @param {TreeRegistry} [registry] - Optional tree registry for structural sharing within trees * @returns {Promise} A new resource index * @public */ - static async create(resources, registry, indexTimestamp) { + static async create(resources, indexTimestamp, registry) { const resourceIndex = await createResourceIndex(resources); const tree = new HashTree(resourceIndex, {registry, indexTimestamp}); return new ResourceIndex(tree); @@ -154,20 +154,6 @@ export default class ResourceIndex { return new ResourceIndex(this.#tree.deriveTree(resourceIndex)); } - // /** - // * Updates existing resources in the index. - // * - // * Updates metadata for resources that already exist in the index. - // * Resources not present in the index are ignored. - // * - // * @param {Array<@ui5/fs/Resource>} resources - Resources to update - // * @returns {Promise} Array of paths for resources that were updated - // * @public - // */ - // async updateResources(resources) { - // return await this.#tree.updateResources(resources); - // } - /** * Compares this index against a base index and returns metadata * for resources that have been added in this index. @@ -188,12 +174,13 @@ export default class ResourceIndex { * - If it exists and hasn't changed, no action is taken * * @param {Array<@ui5/fs/Resource>} resources - Resources to upsert + * @param {number} newIndexTimestamp Timestamp at which the provided resources have been indexed * @returns {Promise<{added: string[], updated: string[]}>} * Object with arrays of added and updated resource paths * @public */ - async upsertResources(resources) { - return await this.#tree.upsertResources(resources); + async upsertResources(resources, newIndexTimestamp) { + return await this.#tree.upsertResources(resources, newIndexTimestamp); } /** @@ -205,6 +192,10 @@ export default class ResourceIndex { return await this.#tree.removeResources(resourcePaths); } + getResourcePaths() { + return this.#tree.getResourcePaths(); + } + /** * Computes the signature hash for this resource index. * diff --git a/packages/project/lib/build/helpers/ProjectBuildContext.js b/packages/project/lib/build/helpers/ProjectBuildContext.js index 99f62073621..8372b831c49 100644 --- a/packages/project/lib/build/helpers/ProjectBuildContext.js +++ b/packages/project/lib/build/helpers/ProjectBuildContext.js @@ -110,8 +110,7 @@ class ProjectBuildContext { return this._requiredDependencies; } const taskRunner = this.getTaskRunner(); - this._requiredDependencies = Array.from(await taskRunner.getRequiredDependencies()) - .sort((a, b) => a.localeCompare(b)); + this._requiredDependencies = await taskRunner.getRequiredDependencies(); return this._requiredDependencies; } @@ -159,60 +158,67 @@ class ProjectBuildContext { } /** - * Determine whether the project has to be built or is already built - * (typically indicated by the presence of a build manifest or a valid cache) + * Early check whether a project build is possibly required. * - * @returns {boolean} True if the project needs to be built + * In some cases, the cache state cannot be determined until all dependencies have been processed and + * the cache has been updated with that information. This happens during prepareProjectBuildAndValidateCache(). + * + * This method allows for an early check whether a project build can be skipped. + * + * @returns {Promise} True if a build might required, false otherwise */ - async requiresBuild() { + async possiblyRequiresBuild() { if (this.#getBuildManifest()) { // Build manifest present -> No build required return false; } - - // Check whether all required dependencies are built and collect their signatures so that - // we can validate our build cache (keyed using the project's sources and relevant dependency signatures) - const depSignatures = []; - const requiredDependencyNames = await this.getRequiredDependencies(); - for (const depName of requiredDependencyNames) { - const depCtx = this._buildContext.getBuildContext(depName); - if (!depCtx) { - throw new Error(`Unexpected missing build context for project '${depName}', dependency of ` + - `project '${this._project.getName()}'`); - } - const signature = await depCtx.getBuildResultSignature(); - if (!signature) { - // Dependency is unable to provide a signature, likely because it needs to be built itself - // Until then, we assume this project requires a build as well and return here - return true; - } - // Collect signatures - depSignatures.push(signature); - } - - return this._buildCache.requiresBuild(depSignatures); - } - - async getBuildResultSignature() { - if (await this.requiresBuild()) { - return null; - } - return await this._buildCache.getResultSignature(); + // Without build manifest, check cache state + return !this.getBuildCache().isFresh(); } - async determineChangedResources() { - return this._buildCache.determineChangedResources(); + /** + * Prepares the project build by updating, and then validating the build cache as needed + * + * @param {boolean} initialBuild + * @returns {Promise} True if project cache is fresh and can be used, false otherwise + */ + async prepareProjectBuildAndValidateCache(initialBuild) { + // if (this.getBuildCache().hasCache() && this.getBuildCache().requiresDependencyIndexInitialization()) { + // const depReader = this.getTaskRunner().getDependenciesReader(this.getTaskRunner.getRequiredDependencies()); + // await this.getBuildCache().updateDependencyCache(depReader); + // } + const depReader = await this.getTaskRunner().getDependenciesReader( + await this.getTaskRunner().getRequiredDependencies(), + true, // Force creation of new reader since project readers might have changed during their (re-)build + ); + this._currentDependencyReader = depReader; + return await this.getBuildCache().prepareProjectBuildAndValidateCache(depReader, initialBuild); } - async runTasks() { + /** + * Builds the project by running all required tasks + * Requires prepareProjectBuildAndValidateCache to be called beforehand + * + * @returns {Promise} Resolves with list of changed resources since the last build + */ + async buildProject() { return await this.getTaskRunner().runTasks(); } - - async projectResourcesChanged(changedPaths) { - return this._buildCache.projectResourcesChanged(changedPaths); + /** + * Informs the build cache about changed project source resources + * + * @param {string[]} changedPaths - Changed project source file paths + */ + projectSourcesChanged(changedPaths) { + return this._buildCache.projectSourcesChanged(changedPaths); } - async dependencyResourcesChanged(changedPaths) { + /** + * Informs the build cache about changed dependency resources + * + * @param {string[]} changedPaths - Changed dependency resource paths + */ + dependencyResourcesChanged(changedPaths) { return this._buildCache.dependencyResourcesChanged(changedPaths); } diff --git a/packages/project/lib/build/helpers/WatchHandler.js b/packages/project/lib/build/helpers/WatchHandler.js index 17d1e6504dd..e85ee1b4e08 100644 --- a/packages/project/lib/build/helpers/WatchHandler.js +++ b/packages/project/lib/build/helpers/WatchHandler.js @@ -129,14 +129,12 @@ class WatchHandler extends EventEmitter { } } const projectBuildContext = this.#buildContext.getBuildContext(projectName); - projectBuildContext.getBuildCache() - .projectSourcesChanged(Array.from(changedResourcePaths)); + projectBuildContext.projectSourcesChanged(Array.from(changedResourcePaths)); } for (const [projectName, changedResourcePaths] of dependencyChanges) { const projectBuildContext = this.#buildContext.getBuildContext(projectName); - projectBuildContext.getBuildCache() - .dependencyResourcesChanged(Array.from(changedResourcePaths)); + projectBuildContext.dependencyResourcesChanged(Array.from(changedResourcePaths)); } this.emit("projectResourcesInvalidated"); diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index cbb0f206a53..0dd06e4a290 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -480,9 +480,16 @@ class Project extends Specification { return true; // Indicate that the stored stage has changed } - setResultStage(reader) { + setResultStage(stageOrCacheReader) { this._initStageMetadata(); - const resultStage = new Stage(RESULT_STAGE_ID, undefined, reader); + + let resultStage; + if (stageOrCacheReader instanceof Stage) { + resultStage = stageOrCacheReader; + } else { + resultStage = new Stage(RESULT_STAGE_ID, undefined, stageOrCacheReader); + } + this.#stages.push(resultStage); } From 723ea9202ee05a8492e2d47f841f3fad84c1a790 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Wed, 14 Jan 2026 16:38:06 +0100 Subject: [PATCH 084/110] test(project): Add theme-library test and update assertions for fixed behavior --- .../fixtures/theme.library.e/package.json | 4 + .../lib/build/ProjectBuilder.integration.js | 104 ++++++++++-------- 2 files changed, 64 insertions(+), 44 deletions(-) create mode 100644 packages/project/test/fixtures/theme.library.e/package.json diff --git a/packages/project/test/fixtures/theme.library.e/package.json b/packages/project/test/fixtures/theme.library.e/package.json new file mode 100644 index 00000000000..2315226524d --- /dev/null +++ b/packages/project/test/fixtures/theme.library.e/package.json @@ -0,0 +1,4 @@ +{ + "name": "theme.library.e", + "version": "1.0.0" +} diff --git a/packages/project/test/lib/build/ProjectBuilder.integration.js b/packages/project/test/lib/build/ProjectBuilder.integration.js index 23e06f6597c..b847491e0e4 100644 --- a/packages/project/test/lib/build/ProjectBuilder.integration.js +++ b/packages/project/test/lib/build/ProjectBuilder.integration.js @@ -94,20 +94,6 @@ test.serial("Build application.a project multiple times", async (t) => { "library.a": {}, "library.b": {}, "library.c": {}, - - // FIXME: application.a should not be rebuilt here at all. - // Currently it is rebuilt but all tasks are skipped. - "application.a": { - skippedTasks: [ - "enhanceManifest", - "escapeNonAsciiCharacters", - "generateComponentPreload", - "generateFlexChangesBundle", - "minify", - "replaceCopyright", - "replaceVersion", - ] - } } } }); @@ -116,21 +102,7 @@ test.serial("Build application.a project multiple times", async (t) => { await fixtureTester.buildProject({ config: {destPath, cleanDest: true}, assertions: { - projects: { - // FIXME: application.a should not be rebuilt here at all. - // Currently it is rebuilt but all tasks are skipped. - "application.a": { - skippedTasks: [ - "enhanceManifest", - "escapeNonAsciiCharacters", - "generateComponentPreload", - "generateFlexChangesBundle", - "minify", - "replaceCopyright", - "replaceVersion", - ] - } - } + projects: {} } }); @@ -138,21 +110,7 @@ test.serial("Build application.a project multiple times", async (t) => { await fixtureTester.buildProject({ config: {destPath, cleanDest: true, dependencyIncludes: {includeAllDependencies: true}}, assertions: { - projects: { - // FIXME: application.a should not be rebuilt here at all. - // Currently it is rebuilt but all tasks are skipped. - "application.a": { - skippedTasks: [ - "enhanceManifest", - "escapeNonAsciiCharacters", - "generateComponentPreload", - "generateFlexChangesBundle", - "minify", - "replaceCopyright", - "replaceVersion", - ] - } - } + projects: {} } }); }); @@ -217,6 +175,64 @@ test.serial("Build library.d project multiple times", async (t) => { }); }); +test.serial("Build theme.library.e project multiple times", async (t) => { + const fixtureTester = new FixtureTester(t, "theme.library.e"); + const destPath = fixtureTester.destPath; + + // #1 build (with empty cache) + await fixtureTester.buildProject({ + config: {destPath, cleanDest: false}, + assertions: { + projects: {"theme.library.e": {}} + } + }); + + // #2 build (with cache, no changes) + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true}, + assertions: { + projects: {} + } + }); + + // Change a source file in theme.library.e + const changedFilePath = `${fixtureTester.fixturePath}/src/theme/library/e/themes/my_theme/library.source.less`; + await fs.appendFile(changedFilePath, `\n.someNewClass {\n\tcolor: red;\n}\n`); + + // #3 build (with cache, with changes) + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true}, + assertions: { + projects: {"theme.library.e": {}} + } + }); + + // Check whether the changed file is in the destPath + const builtFileContent = await fs.readFile( + `${destPath}/resources/theme/library/e/themes/my_theme/library.source.less`, {encoding: "utf8"} + ); + t.true( + builtFileContent.includes(`.someNewClass`), + "Build dest contains changed file content" + ); + // Check whether the updated copyright replacement took place + const builtCssContent = await fs.readFile( + `${destPath}/resources/theme/library/e/themes/my_theme/library.css`, {encoding: "utf8"} + ); + t.true( + builtCssContent.includes(`.someNewClass`), + "Build dest contains new rule in library.css" + ); + + // #4 build (with cache, no changes) + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true}, + assertions: { + projects: {} + } + }); +}); + function getFixturePath(fixtureName) { return fileURLToPath(new URL(`../../fixtures/${fixtureName}`, import.meta.url)); } From c5b050faa9d06c58a797a8cdb5c59f4074bfc1c4 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Thu, 15 Jan 2026 15:12:34 +0100 Subject: [PATCH 085/110] test(project): Use graph.build for ProjectBuilder test --- .../test/lib/build/ProjectBuilder.integration.js | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/packages/project/test/lib/build/ProjectBuilder.integration.js b/packages/project/test/lib/build/ProjectBuilder.integration.js index b847491e0e4..d0524f5da8d 100644 --- a/packages/project/test/lib/build/ProjectBuilder.integration.js +++ b/packages/project/test/lib/build/ProjectBuilder.integration.js @@ -2,8 +2,6 @@ import test from "ava"; import sinonGlobal from "sinon"; import {fileURLToPath} from "node:url"; import fs from "node:fs/promises"; -import ProjectBuilder from "../../../lib/build/ProjectBuilder.js"; -import * as taskRepository from "@ui5/builder/internal/taskRepository"; import {graphFromPackageDependencies} from "../../../lib/graph/graph.js"; import {setLogLevel} from "@ui5/logger"; @@ -274,22 +272,14 @@ class FixtureTester { const graph = await graphFromPackageDependencies({ cwd: this.fixturePath }); - graph.seal(); - const projectBuilder = new ProjectBuilder({ - graph, - taskRepository, - buildConfig: {} - }); // Execute the build - await projectBuilder.build(config); + await graph.build(config); // Apply assertions if provided if (assertions) { this._assertBuild(assertions); } - - return projectBuilder; } _assertBuild(assertions) { From 2ebf9cb275f753bde0715e48639e91869ff87dfc Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Thu, 15 Jan 2026 16:00:24 +0100 Subject: [PATCH 086/110] test(project): Add custom task to ProjectBuilder test --- .../fixtures/application.a/task.example.js | 3 ++ .../application.a/ui5-customTask.yaml | 17 ++++++++++ .../lib/build/ProjectBuilder.integration.js | 33 +++++++++++++++++-- 3 files changed, 51 insertions(+), 2 deletions(-) create mode 100644 packages/project/test/fixtures/application.a/task.example.js create mode 100644 packages/project/test/fixtures/application.a/ui5-customTask.yaml diff --git a/packages/project/test/fixtures/application.a/task.example.js b/packages/project/test/fixtures/application.a/task.example.js new file mode 100644 index 00000000000..600405554f4 --- /dev/null +++ b/packages/project/test/fixtures/application.a/task.example.js @@ -0,0 +1,3 @@ +module.exports = function () { + console.log("Example task executed"); +}; diff --git a/packages/project/test/fixtures/application.a/ui5-customTask.yaml b/packages/project/test/fixtures/application.a/ui5-customTask.yaml new file mode 100644 index 00000000000..3c44bbf65c7 --- /dev/null +++ b/packages/project/test/fixtures/application.a/ui5-customTask.yaml @@ -0,0 +1,17 @@ +--- +specVersion: "5.0" +type: application +metadata: + name: application.a +builder: + customTasks: + - name: example-task + afterTask: minify +--- +specVersion: "5.0" +kind: extension +type: task +metadata: + name: example-task +task: + path: task.example.js diff --git a/packages/project/test/lib/build/ProjectBuilder.integration.js b/packages/project/test/lib/build/ProjectBuilder.integration.js index d0524f5da8d..6086e2e5e2c 100644 --- a/packages/project/test/lib/build/ProjectBuilder.integration.js +++ b/packages/project/test/lib/build/ProjectBuilder.integration.js @@ -111,6 +111,34 @@ test.serial("Build application.a project multiple times", async (t) => { projects: {} } }); + + // #6 build (with cache, no changes, with custom tasks) + await fixtureTester.buildProject({ + graphConfig: {rootConfigPath: "ui5-customTask.yaml"}, + config: {destPath, cleanDest: true}, + assertions: { + projects: { + "application.a": {} + } + } + }); + + // #7 build (with cache, no changes, with custom tasks) + await fixtureTester.buildProject({ + graphConfig: {rootConfigPath: "ui5-customTask.yaml"}, + config: {destPath, cleanDest: true}, + assertions: { + projects: {} + } + }); + + // #8 build (with cache, no changes, with dependencies) + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true, dependencyIncludes: {includeAllDependencies: true}}, + assertions: { + projects: {} + } + }); }); test.serial("Build library.d project multiple times", async (t) => { @@ -265,12 +293,13 @@ class FixtureTester { this._initialized = true; } - async buildProject({config = {}, assertions = {}} = {}) { + async buildProject({graphConfig = {}, config = {}, assertions = {}} = {}) { await this._initialize(); this._sinon.resetHistory(); const graph = await graphFromPackageDependencies({ - cwd: this.fixturePath + ...graphConfig, + cwd: this.fixturePath, }); // Execute the build From b4830ba7766d485a84b69286ccbac55abd752cfe Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Thu, 15 Jan 2026 18:05:04 +0100 Subject: [PATCH 087/110] fix(project): Fix custom task execution The missing log events caused to build to hang when a progress bar was rendered. --- packages/project/lib/build/TaskRunner.js | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index bc847997f57..49238a1d1ec 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -416,7 +416,7 @@ class TaskRunner { _createCustomTaskWrapper({ project, taskUtil, getDependenciesReaderCb, provideDependenciesReader, task, taskName, taskConfiguration }) { - return async function() { + return async () => { /* Custom Task Interface Parameters: {Object} parameters Parameters @@ -463,7 +463,9 @@ class TaskRunner { if (provideDependenciesReader) { params.dependencies = await getDependenciesReaderCb(); } - return taskFunction(params); + this._log.startTask(taskName, false); + await taskFunction(params); + this._log.endTask(taskName); }; } @@ -480,6 +482,8 @@ class TaskRunner { this._taskStart = performance.now(); await taskFunction(taskParams, this._log); if (this._log.isLevelEnabled("perf")) { + // FIXME: Standard tasks are currently additionally measured within taskFunction (See _addTask). + // The measurement here includes the time for checking whether the task can be skipped via cache. this._log.perf(`Task ${taskName} finished in ${Math.round((performance.now() - this._taskStart))} ms`); } } From 6758d64e09f2446e90868618b0c59268bc460441 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Fri, 16 Jan 2026 10:05:08 +0100 Subject: [PATCH 088/110] fix(project): Prevent writing cache when project build was skipped --- packages/project/lib/build/ProjectBuilder.js | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 9e6e79efe8e..5db2138de30 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -288,6 +288,7 @@ class ProjectBuilder { } else { if (await projectBuildContext.prepareProjectBuildAndValidateCache(true)) { this.#log.skipProjectBuild(projectName, projectType); + alreadyBuilt.push(projectName); } else { await this._buildProject(projectBuildContext); } From 9165b2abdc0e7b8107bfcdd64e4201a031ba047d Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Thu, 15 Jan 2026 16:13:53 +0100 Subject: [PATCH 089/110] refactor(project): Create dedicated SharedHashTree class The HashTree class implemented both working modes: "independent" and "shared". This change moves the "shared" parts into a dedicated subclass --- .../lib/build/cache/ResourceRequestManager.js | 2 +- .../project/lib/build/cache/index/HashTree.js | 251 +------------- .../lib/build/cache/index/ResourceIndex.js | 89 ++++- .../lib/build/cache/index/SharedHashTree.js | 122 +++++++ .../project/lib/build/cache/index/TreeNode.js | 107 ++++++ .../lib/build/cache/index/TreeRegistry.js | 31 +- .../lib/build/cache/index/SharedHashTree.js | 328 ++++++++++++++++++ .../lib/build/cache/index/TreeRegistry.js | 116 ++++--- 8 files changed, 716 insertions(+), 330 deletions(-) create mode 100644 packages/project/lib/build/cache/index/SharedHashTree.js create mode 100644 packages/project/lib/build/cache/index/TreeNode.js create mode 100644 packages/project/test/lib/build/cache/index/SharedHashTree.js diff --git a/packages/project/lib/build/cache/ResourceRequestManager.js b/packages/project/lib/build/cache/ResourceRequestManager.js index 6a2fcb05de1..d2d55cbeb3a 100644 --- a/packages/project/lib/build/cache/ResourceRequestManager.js +++ b/packages/project/lib/build/cache/ResourceRequestManager.js @@ -37,7 +37,7 @@ class ResourceRequestManager { const metadata = requestGraph.getMetadata(nodeId); const registry = resourceRequestManager.#newTreeRegistry(); registries.set(nodeId, registry); - metadata.resourceIndex = ResourceIndex.fromCache(serializedIndex, registry); + metadata.resourceIndex = ResourceIndex.fromCacheShared(serializedIndex, registry); } // Restore delta resource indices if (deltaIndices) { diff --git a/packages/project/lib/build/cache/index/HashTree.js b/packages/project/lib/build/cache/index/HashTree.js index adf354197d3..6f5743d87e1 100644 --- a/packages/project/lib/build/cache/index/HashTree.js +++ b/packages/project/lib/build/cache/index/HashTree.js @@ -1,5 +1,6 @@ import crypto from "node:crypto"; import path from "node:path/posix"; +import TreeNode from "./TreeNode.js"; import {matchResourceMetadataStrict} from "../utils.js"; /** @@ -11,119 +12,12 @@ import {matchResourceMetadataStrict} from "../utils.js"; * @property {string} integrity Content hash */ -/** - * Represents a node in the directory-based Merkle tree - */ -class TreeNode { - constructor(name, type, options = {}) { - this.name = name; // resource name or directory name - this.type = type; // 'resource' | 'directory' - this.hash = options.hash || null; // Buffer - - // Resource node properties - this.integrity = options.integrity; // Resource content hash - this.lastModified = options.lastModified; // Last modified timestamp - this.size = options.size; // File size in bytes - this.inode = options.inode; // File system inode number - - // Directory node properties - this.children = options.children || new Map(); // name -> TreeNode - } - - /** - * Get full path from root to this node - * - * @param {string} parentPath - * @returns {string} - */ - getPath(parentPath = "") { - return parentPath ? path.join(parentPath, this.name) : this.name; - } - - /** - * Serialize to JSON - * - * @returns {object} - */ - toJSON() { - const obj = { - name: this.name, - type: this.type, - hash: this.hash ? this.hash.toString("hex") : null - }; - - if (this.type === "resource") { - obj.integrity = this.integrity; - obj.lastModified = this.lastModified; - obj.size = this.size; - obj.inode = this.inode; - } else { - obj.children = {}; - for (const [name, child] of this.children) { - obj.children[name] = child.toJSON(); - } - } - - return obj; - } - - /** - * Deserialize from JSON - * - * @param {object} data - * @returns {TreeNode} - */ - static fromJSON(data) { - const options = { - hash: data.hash ? Buffer.from(data.hash, "hex") : null, - integrity: data.integrity, - lastModified: data.lastModified, - size: data.size, - inode: data.inode - }; - - if (data.type === "directory" && data.children) { - options.children = new Map(); - for (const [name, childData] of Object.entries(data.children)) { - options.children.set(name, TreeNode.fromJSON(childData)); - } - } - - return new TreeNode(data.name, data.type, options); - } - - /** - * Create a deep copy of this node - * - * @returns {TreeNode} - */ - clone() { - const options = { - hash: this.hash ? Buffer.from(this.hash) : null, - integrity: this.integrity, - lastModified: this.lastModified, - size: this.size, - inode: this.inode - }; - - if (this.type === "directory") { - options.children = new Map(); - for (const [name, child] of this.children) { - options.children.set(name, child.clone()); - } - } - - return new TreeNode(this.name, this.type, options); - } -} - /** * Directory-based Merkle Tree for efficient resource tracking with hierarchical structure. * * Computes deterministic SHA256 hashes for resources and directories, enabling: * - Fast change detection via root hash comparison * - Structural sharing through derived trees (memory efficient) - * - Coordinated multi-tree updates via TreeRegistry * - Batch upsert and removal operations * * Primary use case: Build caching systems where multiple related resource trees @@ -137,20 +31,13 @@ export default class HashTree { * @param {Array|null} resources * Initial resources to populate the tree. Each resource should have a path and optional metadata. * @param {object} options - * @param {TreeRegistry} [options.registry] Optional registry for coordinated batch updates across multiple trees * @param {number} [options.indexTimestamp] Timestamp of the latest resource metadata update * @param {TreeNode} [options._root] Internal: pre-existing root node for derived trees (enables structural sharing) */ constructor(resources = null, options = {}) { - this.registry = options.registry || null; this.root = options._root || new TreeNode("", "directory"); this.#indexTimestamp = options.indexTimestamp; - // Register with registry if provided - if (this.registry) { - this.registry.register(this); - } - if (resources && !options._root) { this._buildTree(resources); } else if (resources && options._root) { @@ -411,141 +298,25 @@ export default class HashTree { return current; } - /** - * Create a derived tree that shares subtrees with this tree. - * - * Derived trees are filtered views on shared data - they share node references with the parent tree, - * enabling efficient memory usage. Changes propagate through the TreeRegistry to all derived trees. - * - * Use case: Represent different resource sets (e.g., debug vs. production builds) that share common files. - * - * @param {Array} additionalResources - * Resources to add to the derived tree (in addition to shared resources from parent) - * @returns {HashTree} New tree sharing subtrees with this tree - */ - deriveTree(additionalResources = []) { - // Shallow copy root to allow adding new top-level directories - const derivedRoot = this._shallowCopyDirectory(this.root); - - // Create derived tree with shared root and same registry - const derived = new HashTree(additionalResources, { - registry: this.registry, - _root: derivedRoot - }); - - return derived; - } - - // /** - // * Update multiple resources efficiently. - // * - // * When a registry is attached, schedules updates for batch processing. - // * Otherwise, updates all resources immediately, collecting affected directories - // * and recomputing hashes bottom-up for optimal performance. - // * - // * Skips resources whose metadata hasn't changed (optimization). - // * - // * @param {Array<@ui5/fs/Resource>} resources - Array of Resource instances to update - // * @returns {Promise>} Paths of resources that actually changed - // */ - // async updateResources(resources) { - // if (!resources || resources.length === 0) { - // return []; - // } - - // const changedResources = []; - // const affectedPaths = new Set(); - - // // Update all resources and collect affected directory paths - // for (const resource of resources) { - // const resourcePath = resource.getOriginalPath(); - // const parts = resourcePath.split(path.sep).filter((p) => p.length > 0); - - // // Find the resource node - // const node = this._findNode(resourcePath); - // if (!node || node.type !== "resource") { - // throw new Error(`Resource not found: ${resourcePath}`); - // } - - // // Create metadata object from current node state - // const currentMetadata = { - // integrity: node.integrity, - // lastModified: node.lastModified, - // size: node.size, - // inode: node.inode - // }; - - // // Check whether resource actually changed - // const isUnchanged = await matchResourceMetadataStrict(resource, currentMetadata, this.#indexTimestamp); - // if (isUnchanged) { - // continue; // Skip unchanged resources - // } - - // // Update resource metadata - // node.integrity = await resource.getIntegrity(); - // node.lastModified = resource.getLastModified(); - // node.size = await resource.getSize(); - // node.inode = resource.getInode(); - // changedResources.push(resourcePath); - - // // Recompute resource hash - // this._computeHash(node); - - // // Mark all ancestor directories as needing recomputation - // for (let i = 0; i < parts.length; i++) { - // affectedPaths.add(parts.slice(0, i).join(path.sep)); - // } - // } - - // // Recompute directory hashes bottom-up - // const sortedPaths = Array.from(affectedPaths).sort((a, b) => { - // // Sort by depth (deeper first) and then alphabetically - // const depthA = a.split(path.sep).length; - // const depthB = b.split(path.sep).length; - // if (depthA !== depthB) return depthB - depthA; - // return a.localeCompare(b); - // }); - - // for (const dirPath of sortedPaths) { - // const node = this._findNode(dirPath); - // if (node && node.type === "directory") { - // this._computeHash(node); - // } - // } - - // this._updateIndexTimestamp(); - // return changedResources; - // } - /** * Upsert multiple resources (insert if new, update if exists). * * Intelligently determines whether each resource is new (insert) or existing (update). - * When a registry is attached, schedules operations for batch processing. - * Otherwise, applies operations immediately with optimized hash recomputation. + * Applies operations immediately with optimized hash recomputation. * * Automatically creates missing parent directories during insertion. * Skips resources whose metadata hasn't changed (optimization). * * @param {Array<@ui5/fs/Resource>} resources - Array of Resource instances to upsert * @param {number} newIndexTimestamp Timestamp at which the provided resources have been indexed - * @returns {Promise<{added: Array, updated: Array, unchanged: Array}|undefined>} + * @returns {Promise<{added: Array, updated: Array, unchanged: Array}>} * Status report: arrays of paths by operation type. - * Undefined if using registry (results determined during flush). */ async upsertResources(resources, newIndexTimestamp) { if (!resources || resources.length === 0) { return {added: [], updated: [], unchanged: []}; } - if (this.registry) { - for (const resource of resources) { - this.registry.scheduleUpsert(resource, newIndexTimestamp); - } - // When using registry, actual results are determined during flush - return; - } - // Immediate mode const added = []; const updated = []; @@ -629,29 +400,17 @@ export default class HashTree { /** * Remove multiple resources efficiently. * - * When a registry is attached, schedules removals for batch processing. - * Otherwise, removes resources immediately and recomputes affected ancestor hashes. - * - * Note: When using a registry with derived trees, removals propagate to all trees - * sharing the affected directories (intentional for the shared view model). + * Removes resources immediately and recomputes affected ancestor hashes. * * @param {Array} resourcePaths - Array of resource paths to remove - * @returns {Promise<{removed: Array, notFound: Array}|undefined>} + * @returns {Promise<{removed: Array, notFound: Array}>} * Status report: 'removed' contains successfully removed paths, 'notFound' contains paths that didn't exist. - * Undefined if using registry (results determined during flush). */ async removeResources(resourcePaths) { if (!resourcePaths || resourcePaths.length === 0) { return {removed: [], notFound: []}; } - if (this.registry) { - for (const resourcePath of resourcePaths) { - this.registry.scheduleRemoval(resourcePath); - } - return; - } - // Immediate mode const removed = []; const notFound = []; diff --git a/packages/project/lib/build/cache/index/ResourceIndex.js b/packages/project/lib/build/cache/index/ResourceIndex.js index ed17e533355..e345922da6b 100644 --- a/packages/project/lib/build/cache/index/ResourceIndex.js +++ b/packages/project/lib/build/cache/index/ResourceIndex.js @@ -6,6 +6,7 @@ * enabling fast delta detection and signature calculation for build caching. */ import HashTree from "./HashTree.js"; +import SharedHashTree from "./SharedHashTree.js"; import {createResourceIndex} from "../utils.js"; /** @@ -50,13 +51,31 @@ export default class ResourceIndex { * * @param {Array<@ui5/fs/Resource>} resources - Resources to index * @param {number} indexTimestamp Timestamp at which the provided resources have been indexed - * @param {TreeRegistry} [registry] - Optional tree registry for structural sharing within trees * @returns {Promise} A new resource index * @public */ - static async create(resources, indexTimestamp, registry) { + static async create(resources, indexTimestamp) { const resourceIndex = await createResourceIndex(resources); - const tree = new HashTree(resourceIndex, {registry, indexTimestamp}); + const tree = new HashTree(resourceIndex, {indexTimestamp}); + return new ResourceIndex(tree); + } + + /** + * Creates a new shared ResourceIndex from a set of resources. + * + * Creates a SharedHashTree that coordinates updates through a TreeRegistry. + * Use this for scenarios where multiple indices need to share nodes and + * coordinate batch updates. + * + * @param {Array<@ui5/fs/Resource>} resources - Resources to index + * @param {number} indexTimestamp Timestamp at which the provided resources have been indexed + * @param {TreeRegistry} registry - Registry for coordinated batch updates + * @returns {Promise} A new resource index with shared tree + * @public + */ + static async createShared(resources, indexTimestamp, registry) { + const resourceIndex = await createResourceIndex(resources); + const tree = new SharedHashTree(resourceIndex, registry, {indexTimestamp}); return new ResourceIndex(tree); } @@ -76,14 +95,13 @@ export default class ResourceIndex { * @param {object} indexCache.indexTree - Cached hash tree structure * @param {Array<@ui5/fs/Resource>} resources - Current resources to compare against cache * @param {number} newIndexTimestamp Timestamp at which the provided resources have been indexed - * @param {TreeRegistry} [registry] - Optional tree registry for structural sharing within trees * @returns {Promise<{changedPaths: string[], resourceIndex: ResourceIndex}>} * Object containing array of all changed resource paths and the updated index * @public */ - static async fromCacheWithDelta(indexCache, resources, newIndexTimestamp, registry) { + static async fromCacheWithDelta(indexCache, resources, newIndexTimestamp) { const {indexTimestamp, indexTree} = indexCache; - const tree = HashTree.fromCache(indexTree, {indexTimestamp, registry}); + const tree = HashTree.fromCache(indexTree, {indexTimestamp}); const currentResourcePaths = new Set(resources.map((resource) => resource.getOriginalPath())); const removedPaths = tree.getResourcePaths().filter((resourcePath) => { return !currentResourcePaths.has(resourcePath); @@ -96,6 +114,39 @@ export default class ResourceIndex { }; } + /** + * Restores a shared ResourceIndex from cache and applies delta updates. + * + * Same as fromCacheWithDelta, but creates a SharedHashTree that coordinates + * updates through a TreeRegistry. + * + * @param {object} indexCache - Cached index object from previous build + * @param {number} indexCache.indexTimestamp - Timestamp of cached index + * @param {object} indexCache.indexTree - Cached hash tree structure + * @param {Array<@ui5/fs/Resource>} resources - Current resources to compare against cache + * @param {number} newIndexTimestamp Timestamp at which the provided resources have been indexed + * @param {TreeRegistry} registry - Registry for coordinated batch updates + * @returns {Promise<{changedPaths: string[], resourceIndex: ResourceIndex}>} + * Object containing array of all changed resource paths and the updated index + * @public + */ + static async fromCacheWithDeltaShared(indexCache, resources, newIndexTimestamp, registry) { + const {indexTimestamp, indexTree} = indexCache; + const tree = SharedHashTree.fromCache(indexTree, registry, {indexTimestamp}); + const currentResourcePaths = new Set(resources.map((resource) => resource.getOriginalPath())); + const removedPaths = tree.getResourcePaths().filter((resourcePath) => { + return !currentResourcePaths.has(resourcePath); + }); + await tree.removeResources(removedPaths); + await tree.upsertResources(resources, newIndexTimestamp); + // For shared trees, we need to flush the registry to get results + const {added, updated, removed} = await registry.flush(); + return { + changedPaths: [...added, ...updated, ...removed], + resourceIndex: new ResourceIndex(tree), + }; + } + /** * Restores a ResourceIndex from cached metadata. * @@ -106,13 +157,31 @@ export default class ResourceIndex { * @param {object} indexCache - Cached index object * @param {number} indexCache.indexTimestamp - Timestamp of cached index * @param {object} indexCache.indexTree - Cached hash tree structure - * @param {TreeRegistry} [registry] - Optional tree registry for structural sharing within trees - * @returns {Promise} Restored resource index + * @returns {ResourceIndex} Restored resource index + * @public + */ + static fromCache(indexCache) { + const {indexTimestamp, indexTree} = indexCache; + const tree = HashTree.fromCache(indexTree, {indexTimestamp}); + return new ResourceIndex(tree); + } + + /** + * Restores a shared ResourceIndex from cached metadata. + * + * Same as fromCache, but creates a SharedHashTree that coordinates + * updates through a TreeRegistry. + * + * @param {object} indexCache - Cached index object + * @param {number} indexCache.indexTimestamp - Timestamp of cached index + * @param {object} indexCache.indexTree - Cached hash tree structure + * @param {TreeRegistry} registry - Registry for coordinated batch updates + * @returns {ResourceIndex} Restored resource index with shared tree * @public */ - static fromCache(indexCache, registry) { + static fromCacheShared(indexCache, registry) { const {indexTimestamp, indexTree} = indexCache; - const tree = HashTree.fromCache(indexTree, {indexTimestamp, registry}); + const tree = SharedHashTree.fromCache(indexTree, registry, {indexTimestamp}); return new ResourceIndex(tree); } diff --git a/packages/project/lib/build/cache/index/SharedHashTree.js b/packages/project/lib/build/cache/index/SharedHashTree.js new file mode 100644 index 00000000000..153b12b5d5c --- /dev/null +++ b/packages/project/lib/build/cache/index/SharedHashTree.js @@ -0,0 +1,122 @@ +import HashTree from "./HashTree.js"; +import TreeNode from "./TreeNode.js"; + +/** + * Shared HashTree that coordinates updates through a TreeRegistry. + * + * This variant of HashTree is designed for scenarios where multiple trees need + * to share nodes and coordinate batch updates. All modifications (upserts and removals) + * are delegated to the registry, which applies them atomically across all registered trees. + * + * Key differences from base HashTree: + * - Requires a TreeRegistry instance + * - upsertResources() and removeResources() return undefined (results available via registry.flush()) + * - Derived trees share the same registry + * - Changes to shared nodes propagate to all trees + * + * @extends HashTree + */ +export default class SharedHashTree extends HashTree { + /** + * Create a new SharedHashTree + * + * @param {Array|null} resources + * Initial resources to populate the tree. Each resource should have a path and optional metadata. + * @param {TreeRegistry} registry Required registry for coordinated batch updates across multiple trees + * @param {object} options + * @param {number} [options.indexTimestamp] Timestamp of the latest resource metadata update + * @param {TreeNode} [options._root] Internal: pre-existing root node for derived trees (enables structural sharing) + */ + constructor(resources = null, registry, options = {}) { + if (!registry) { + throw new Error("SharedHashTree requires a registry option"); + } + + super(resources, options); + + this.registry = registry; + this.registry.register(this); + } + + /** + * Schedule resource upserts (insert or update) to be applied during registry flush. + * + * Unlike base HashTree, this method doesn't immediately modify the tree. + * Instead, it schedules operations with the registry for batch processing. + * Call registry.flush() to apply all pending operations atomically. + * + * @param {Array<@ui5/fs/Resource>} resources - Array of Resource instances to upsert + * @param {number} newIndexTimestamp Timestamp at which the provided resources have been indexed + * @returns {Promise} Returns undefined; results available via registry.flush() + */ + async upsertResources(resources, newIndexTimestamp) { + if (!resources || resources.length === 0) { + return; + } + + for (const resource of resources) { + this.registry.scheduleUpsert(resource, newIndexTimestamp); + } + } + + /** + * Schedule resource removals to be applied during registry flush. + * + * Unlike base HashTree, this method doesn't immediately modify the tree. + * Instead, it schedules operations with the registry for batch processing. + * Call registry.flush() to apply all pending operations atomically. + * + * @param {Array} resourcePaths - Array of resource paths to remove + * @returns {Promise} Returns undefined; results available via registry.flush() + */ + async removeResources(resourcePaths) { + if (!resourcePaths || resourcePaths.length === 0) { + return; + } + + for (const resourcePath of resourcePaths) { + this.registry.scheduleRemoval(resourcePath); + } + } + + /** + * Create a derived shared tree that shares subtrees with this tree. + * + * The derived tree shares the same registry and will participate in + * coordinated batch updates. Changes to shared nodes propagate to all trees. + * + * @param {Array} additionalResources + * Resources to add to the derived tree (in addition to shared resources from parent) + * @returns {SharedHashTree} New shared tree sharing subtrees and registry with this tree + */ + deriveTree(additionalResources = []) { + // Shallow copy root to allow adding new top-level directories + const derivedRoot = this._shallowCopyDirectory(this.root); + + // Create derived tree with shared root and same registry + const derived = new SharedHashTree(additionalResources, this.registry, { + _root: derivedRoot + }); + + return derived; + } + + /** + * Deserialize tree from JSON + * + * @param {object} data + * @param {TreeRegistry} registry Required registry for coordinated batch updates across multiple trees + * @param {object} [options] + * @returns {HashTree} + */ + static fromCache(data, registry, options = {}) { + if (data.version !== 1) { + throw new Error(`Unsupported version: ${data.version}`); + } + + const tree = new SharedHashTree(null, registry, options); + tree.root = TreeNode.fromJSON(data.root); + + return tree; + } +} diff --git a/packages/project/lib/build/cache/index/TreeNode.js b/packages/project/lib/build/cache/index/TreeNode.js new file mode 100644 index 00000000000..130e9ef9152 --- /dev/null +++ b/packages/project/lib/build/cache/index/TreeNode.js @@ -0,0 +1,107 @@ +import path from "node:path/posix"; + +/** + * Represents a node in the directory-based Merkle tree + */ +export default class TreeNode { + constructor(name, type, options = {}) { + this.name = name; // resource name or directory name + this.type = type; // 'resource' | 'directory' + this.hash = options.hash || null; // Buffer + + // Resource node properties + this.integrity = options.integrity; // Resource content hash + this.lastModified = options.lastModified; // Last modified timestamp + this.size = options.size; // File size in bytes + this.inode = options.inode; // File system inode number + + // Directory node properties + this.children = options.children || new Map(); // name -> TreeNode + } + + /** + * Get full path from root to this node + * + * @param {string} parentPath + * @returns {string} + */ + getPath(parentPath = "") { + return parentPath ? path.join(parentPath, this.name) : this.name; + } + + /** + * Serialize to JSON + * + * @returns {object} + */ + toJSON() { + const obj = { + name: this.name, + type: this.type, + hash: this.hash ? this.hash.toString("hex") : null + }; + + if (this.type === "resource") { + obj.integrity = this.integrity; + obj.lastModified = this.lastModified; + obj.size = this.size; + obj.inode = this.inode; + } else { + obj.children = {}; + for (const [name, child] of this.children) { + obj.children[name] = child.toJSON(); + } + } + + return obj; + } + + /** + * Deserialize from JSON + * + * @param {object} data + * @returns {TreeNode} + */ + static fromJSON(data) { + const options = { + hash: data.hash ? Buffer.from(data.hash, "hex") : null, + integrity: data.integrity, + lastModified: data.lastModified, + size: data.size, + inode: data.inode + }; + + if (data.type === "directory" && data.children) { + options.children = new Map(); + for (const [name, childData] of Object.entries(data.children)) { + options.children.set(name, TreeNode.fromJSON(childData)); + } + } + + return new TreeNode(data.name, data.type, options); + } + + /** + * Create a deep copy of this node + * + * @returns {TreeNode} + */ + clone() { + const options = { + hash: this.hash ? Buffer.from(this.hash) : null, + integrity: this.integrity, + lastModified: this.lastModified, + size: this.size, + inode: this.inode + }; + + if (this.type === "directory") { + options.children = new Map(); + for (const [name, child] of this.children) { + options.children.set(name, child.clone()); + } + } + + return new TreeNode(this.name, this.type, options); + } +} diff --git a/packages/project/lib/build/cache/index/TreeRegistry.js b/packages/project/lib/build/cache/index/TreeRegistry.js index cba02d73729..a127e36db90 100644 --- a/packages/project/lib/build/cache/index/TreeRegistry.js +++ b/packages/project/lib/build/cache/index/TreeRegistry.js @@ -1,4 +1,5 @@ import path from "node:path/posix"; +import TreeNode from "./TreeNode.js"; import {matchResourceMetadataStrict} from "../utils.js"; /** @@ -15,7 +16,7 @@ import {matchResourceMetadataStrict} from "../utils.js"; * * This approach ensures consistency when multiple trees represent filtered views of the same underlying data. * - * @property {Set} trees - All registered HashTree instances + * @property {Set} trees - All registered HashTree/SharedHashTree instances * @property {Map} pendingUpserts - Resource path to resource mappings for scheduled upserts * @property {Set} pendingRemovals - Resource paths scheduled for removal */ @@ -26,24 +27,24 @@ export default class TreeRegistry { pendingTimestampUpdate; /** - * Register a HashTree instance with this registry for coordinated updates. + * Register a HashTree or SharedHashTree instance with this registry for coordinated updates. * * Once registered, the tree will participate in all batch operations triggered by flush(). * Multiple trees can share the same underlying nodes through structural sharing. * - * @param {import('./HashTree.js').default} tree - HashTree instance to register + * @param {import('./SharedHashTree.js').default} tree - HashTree or SharedHashTree instance to register */ register(tree) { this.trees.add(tree); } /** - * Remove a HashTree instance from this registry. + * Remove a HashTree or SharedHashTree instance from this registry. * * After unregistering, the tree will no longer participate in batch operations. * Any pending operations scheduled before unregistration will still be applied during flush(). * - * @param {import('./HashTree.js').default} tree - HashTree instance to unregister + * @param {import('./SharedHashTree.js').default} tree - HashTree or SharedHashTree instance to unregister */ unregister(tree) { this.trees.delete(tree); @@ -106,7 +107,7 @@ export default class TreeRegistry { * After successful completion, all pending operations are cleared. * * @returns {Promise<{added: string[], updated: string[], unchanged: string[], removed: string[], - * treeStats: Map}>} * Object containing arrays of resource paths categorized by operation result, * plus per-tree statistics showing which resource paths were added/updated/unchanged/removed in each tree @@ -233,7 +234,6 @@ export default class TreeRegistry { if (!resourceNode) { // INSERT: Create new resource node - const TreeNode = tree.root.constructor; resourceNode = new TreeNode(upsert.resourceName, "resource", { integrity: await upsert.resource.getIntegrity(), lastModified: upsert.resource.getLastModified(), @@ -358,10 +358,9 @@ export default class TreeRegistry { * Returns an array of TreeNode objects representing the full path, * starting with root at index 0 and ending with the target node. * - * @param {import('./HashTree.js').default} tree - Tree to traverse + * @param {import('./SharedHashTree.js').default} tree - Tree to traverse * @param {string[]} pathParts - Path components to follow - * @returns {Array} Array of TreeNode objects along the path - * @private + * @returns {Array} Array of TreeNode objects along the path */ _getPathNodes(tree, pathParts) { const nodes = [tree.root]; @@ -385,10 +384,10 @@ export default class TreeRegistry { * need their hashes recomputed to reflect the change. This method tracks those paths * in the affectedTrees map for later batch processing. * - * @param {import('./HashTree.js').default} tree - Tree containing the affected path + * @param {import('./SharedHashTree.js').default} tree - Tree containing the affected path * @param {string[]} pathParts - Path components of the modified resource/directory - * @param {Map>} affectedTrees - Map tracking affected paths per tree - * @private + * @param {Map>} affectedTrees + * Map tracking affected paths per tree */ _markAncestorsAffected(tree, pathParts, affectedTrees) { if (!affectedTrees.has(tree)) { @@ -407,14 +406,12 @@ export default class TreeRegistry { * It's used during upsert operations to automatically create parent directories * when inserting resources into paths that don't yet exist. * - * @param {import('./HashTree.js').default} tree - Tree to create directory path in + * @param {import('./SharedHashTree.js').default} tree - Tree to create directory path in * @param {string[]} pathParts - Path components of the directory to ensure exists - * @returns {object} The directory node at the end of the path - * @private + * @returns {TreeNode} The directory node at the end of the path */ _ensureDirectoryPath(tree, pathParts) { let current = tree.root; - const TreeNode = tree.root.constructor; for (const part of pathParts) { if (!current.children.has(part)) { diff --git a/packages/project/test/lib/build/cache/index/SharedHashTree.js b/packages/project/test/lib/build/cache/index/SharedHashTree.js new file mode 100644 index 00000000000..b5b265d78ee --- /dev/null +++ b/packages/project/test/lib/build/cache/index/SharedHashTree.js @@ -0,0 +1,328 @@ +import test from "ava"; +import sinon from "sinon"; +import SharedHashTree from "../../../../../lib/build/cache/index/SharedHashTree.js"; +import TreeRegistry from "../../../../../lib/build/cache/index/TreeRegistry.js"; + +// Helper to create mock Resource instances +function createMockResource(path, integrity, lastModified, size, inode) { + return { + getOriginalPath: () => path, + getIntegrity: async () => integrity, + getLastModified: () => lastModified, + getSize: async () => size, + getInode: () => inode + }; +} + +test.afterEach.always((t) => { + sinon.restore(); +}); + +// ============================================================================ +// SharedHashTree Construction Tests +// ============================================================================ + +test("SharedHashTree - requires registry option", (t) => { + t.throws(() => { + new SharedHashTree([{path: "a.js", integrity: "hash1"}]); + }, { + message: "SharedHashTree requires a registry option" + }, "Should throw error when registry is missing"); +}); + +test("SharedHashTree - auto-registers with registry", (t) => { + const registry = new TreeRegistry(); + new SharedHashTree([{path: "a.js", integrity: "hash1"}], registry); + + t.is(registry.getTreeCount(), 1, "Should auto-register with registry"); +}); + +test("SharedHashTree - creates tree with resources", (t) => { + const registry = new TreeRegistry(); + const resources = [ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"} + ]; + const tree = new SharedHashTree(resources, registry); + + t.truthy(tree.getRootHash(), "Should have root hash"); + t.true(tree.hasPath("a.js"), "Should have a.js"); + t.true(tree.hasPath("b.js"), "Should have b.js"); +}); + +// ============================================================================ +// SharedHashTree upsertResources Tests +// ============================================================================ + +test("SharedHashTree - upsertResources schedules with registry", async (t) => { + const registry = new TreeRegistry(); + const tree = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); + + const resource = createMockResource("b.js", "hash-b", Date.now(), 1024, 1); + const result = await tree.upsertResources([resource], Date.now()); + + t.is(result, undefined, "Should return undefined (scheduled mode)"); + t.is(registry.getPendingUpdateCount(), 1, "Should schedule upsert with registry"); +}); + +test("SharedHashTree - upsertResources with empty array returns immediately", async (t) => { + const registry = new TreeRegistry(); + const tree = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); + + const result = await tree.upsertResources([], Date.now()); + + t.is(result, undefined, "Should return undefined"); + t.is(registry.getPendingUpdateCount(), 0, "Should not schedule anything"); +}); + +test("SharedHashTree - multiple upserts are batched", async (t) => { + const registry = new TreeRegistry(); + const tree = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); + + await tree.upsertResources([createMockResource("b.js", "hash-b", Date.now(), 1024, 1)], Date.now()); + await tree.upsertResources([createMockResource("c.js", "hash-c", Date.now(), 2048, 2)], Date.now()); + + t.is(registry.getPendingUpdateCount(), 2, "Should have 2 pending upserts"); + + const result = await registry.flush(); + t.deepEqual(result.added.sort(), ["b.js", "c.js"], "Should add both resources"); +}); + +// ============================================================================ +// SharedHashTree removeResources Tests +// ============================================================================ + +test("SharedHashTree - removeResources schedules with registry", async (t) => { + const registry = new TreeRegistry(); + const tree = new SharedHashTree([ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"} + ], registry); + + const result = await tree.removeResources(["b.js"]); + + t.is(result, undefined, "Should return undefined (scheduled mode)"); + t.is(registry.getPendingUpdateCount(), 1, "Should schedule removal with registry"); +}); + +test("SharedHashTree - removeResources with empty array returns immediately", async (t) => { + const registry = new TreeRegistry(); + const tree = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); + + const result = await tree.removeResources([]); + + t.is(result, undefined, "Should return undefined"); + t.is(registry.getPendingUpdateCount(), 0, "Should not schedule anything"); +}); + +test("SharedHashTree - multiple removals are batched", async (t) => { + const registry = new TreeRegistry(); + const tree = new SharedHashTree([ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"}, + {path: "c.js", integrity: "hash-c"} + ], registry); + + await tree.removeResources(["b.js"]); + await tree.removeResources(["c.js"]); + + t.is(registry.getPendingUpdateCount(), 2, "Should have 2 pending removals"); + + const result = await registry.flush(); + t.deepEqual(result.removed.sort(), ["b.js", "c.js"], "Should remove both resources"); +}); + +// ============================================================================ +// SharedHashTree deriveTree Tests +// ============================================================================ + +test("SharedHashTree - deriveTree creates SharedHashTree", (t) => { + const registry = new TreeRegistry(); + const tree1 = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); + + const tree2 = tree1.deriveTree([{path: "b.js", integrity: "hash-b"}]); + + t.true(tree2 instanceof SharedHashTree, "Derived tree should be SharedHashTree"); + t.is(tree2.registry, registry, "Derived tree should share same registry"); +}); + +test("SharedHashTree - deriveTree registers derived tree", (t) => { + const registry = new TreeRegistry(); + const tree1 = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); + + t.is(registry.getTreeCount(), 1, "Should have 1 tree initially"); + + tree1.deriveTree([{path: "b.js", integrity: "hash-b"}]); + + t.is(registry.getTreeCount(), 2, "Should have 2 trees after derivation"); +}); + +test("SharedHashTree - deriveTree shares nodes with parent", (t) => { + const registry = new TreeRegistry(); + const tree1 = new SharedHashTree([ + {path: "shared/a.js", integrity: "hash-a"}, + {path: "shared/b.js", integrity: "hash-b"} + ], registry); + + const tree2 = tree1.deriveTree([{path: "unique/c.js", integrity: "hash-c"}]); + + // Verify they share the "shared" directory node + const sharedDir1 = tree1.root.children.get("shared"); + const sharedDir2 = tree2.root.children.get("shared"); + + t.is(sharedDir1, sharedDir2, "Should share the same 'shared' directory node"); +}); + +test("SharedHashTree - deriveTree with empty resources", (t) => { + const registry = new TreeRegistry(); + const tree1 = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); + + const tree2 = tree1.deriveTree([]); + + t.is(tree1.getRootHash(), tree2.getRootHash(), "Empty derivation should have same hash"); + t.true(tree2 instanceof SharedHashTree, "Should be SharedHashTree"); +}); + +// ============================================================================ +// SharedHashTree with Registry Integration Tests +// ============================================================================ + +test("SharedHashTree - changes via registry affect tree", async (t) => { + const registry = new TreeRegistry(); + const tree = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); + + const originalHash = tree.getRootHash(); + + await tree.upsertResources([createMockResource("b.js", "hash-b", Date.now(), 1024, 1)], Date.now()); + await registry.flush(); + + const newHash = tree.getRootHash(); + t.not(originalHash, newHash, "Root hash should change after flush"); + t.true(tree.hasPath("b.js"), "Tree should have new resource"); +}); + +test("SharedHashTree - batch updates via registry", async (t) => { + const registry = new TreeRegistry(); + const tree = new SharedHashTree([ + {path: "a.js", integrity: "hash-a", lastModified: 1000, size: 100} + ], registry); + + const indexTimestamp = tree.getIndexTimestamp(); + + // Schedule multiple operations + await tree.upsertResources([createMockResource("b.js", "hash-b", Date.now(), 1024, 1)], Date.now()); + await tree.upsertResources([createMockResource("a.js", "new-hash-a", indexTimestamp + 1, 101, 1)], Date.now()); + + const result = await registry.flush(); + + t.deepEqual(result.added, ["b.js"], "Should add b.js"); + t.deepEqual(result.updated, ["a.js"], "Should update a.js"); +}); + +test("SharedHashTree - multiple trees coordinate via registry", async (t) => { + const registry = new TreeRegistry(); + const tree1 = new SharedHashTree([ + {path: "shared/a.js", integrity: "hash-a"} + ], registry); + + const tree2 = tree1.deriveTree([{path: "unique/b.js", integrity: "hash-b"}]); + + // Verify they share directory nodes + const sharedDir1Before = tree1.root.children.get("shared"); + const sharedDir2Before = tree2.root.children.get("shared"); + t.is(sharedDir1Before, sharedDir2Before, "Should share nodes before update"); + + // Update shared resource via tree1 + const indexTimestamp = tree1.getIndexTimestamp(); + await tree1.upsertResources([ + createMockResource("shared/a.js", "new-hash-a", indexTimestamp + 1, 101, 1) + ], Date.now()); + + await registry.flush(); + + // Both trees see the change + const node1 = tree1.root.children.get("shared").children.get("a.js"); + const node2 = tree2.root.children.get("shared").children.get("a.js"); + + t.is(node1, node2, "Should share same resource node"); + t.is(node1.integrity, "new-hash-a", "Tree1 sees update"); + t.is(node2.integrity, "new-hash-a", "Tree2 sees update (shared node)"); +}); + +test("SharedHashTree - registry tracks per-tree statistics", async (t) => { + const registry = new TreeRegistry(); + const tree1 = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); + const tree2 = new SharedHashTree([{path: "b.js", integrity: "hash-b"}], registry); + + await tree1.upsertResources([createMockResource("c.js", "hash-c", Date.now(), 1024, 1)], Date.now()); + await tree2.upsertResources([createMockResource("d.js", "hash-d", Date.now(), 2048, 2)], Date.now()); + + const result = await registry.flush(); + + t.is(result.treeStats.size, 2, "Should have stats for 2 trees"); + // Each tree sees additions for resources added by any tree (since all trees get all resources) + const stats1 = result.treeStats.get(tree1); + const stats2 = result.treeStats.get(tree2); + + // Both c.js and d.js are added to both trees + t.deepEqual(stats1.added.sort(), ["c.js", "d.js"], "Tree1 should see both additions"); + t.deepEqual(stats2.added.sort(), ["c.js", "d.js"], "Tree2 should see both additions"); +}); + +test("SharedHashTree - unregister removes tree from coordination", async (t) => { + const registry = new TreeRegistry(); + const tree1 = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); + new SharedHashTree([{path: "b.js", integrity: "hash-b"}], registry); + + t.is(registry.getTreeCount(), 2, "Should have 2 trees"); + + registry.unregister(tree1); + + t.is(registry.getTreeCount(), 1, "Should have 1 tree after unregister"); + + // Operations on tree1 no longer coordinated + await tree1.upsertResources([createMockResource("c.js", "hash-c", Date.now(), 1024, 1)], Date.now()); + const result = await registry.flush(); + + // tree1 not in results since it's unregistered + t.is(result.treeStats.size, 1, "Should only have stats for tree2"); + t.false(result.treeStats.has(tree1), "Should not have stats for unregistered tree1"); +}); + +test("SharedHashTree - complex multi-tree coordination", async (t) => { + const registry = new TreeRegistry(); + + // Create base tree + const baseTree = new SharedHashTree([ + {path: "shared/a.js", integrity: "hash-a"}, + {path: "shared/b.js", integrity: "hash-b"} + ], registry); + + // Derive two trees from base + const derived1 = baseTree.deriveTree([{path: "d1/c.js", integrity: "hash-c"}]); + const derived2 = baseTree.deriveTree([{path: "d2/d.js", integrity: "hash-d"}]); + + t.is(registry.getTreeCount(), 3, "Should have 3 trees"); + + // Schedule updates to shared resource + const indexTimestamp = baseTree.getIndexTimestamp(); + await baseTree.upsertResources([ + createMockResource("shared/a.js", "new-hash-a", indexTimestamp + 1, 101, 1) + ], Date.now()); + + const result = await registry.flush(); + + // All trees see the update + t.deepEqual(result.treeStats.get(baseTree).updated, ["shared/a.js"]); + t.deepEqual(result.treeStats.get(derived1).updated, ["shared/a.js"]); + t.deepEqual(result.treeStats.get(derived2).updated, ["shared/a.js"]); + + // Verify shared nodes + const sharedA1 = baseTree.root.children.get("shared").children.get("a.js"); + const sharedA2 = derived1.root.children.get("shared").children.get("a.js"); + const sharedA3 = derived2.root.children.get("shared").children.get("a.js"); + + t.is(sharedA1, sharedA2, "baseTree and derived1 share node"); + t.is(sharedA1, sharedA3, "baseTree and derived2 share node"); + t.is(sharedA1.integrity, "new-hash-a", "All see updated value"); +}); diff --git a/packages/project/test/lib/build/cache/index/TreeRegistry.js b/packages/project/test/lib/build/cache/index/TreeRegistry.js index 41e8f1ece93..ff110d0d6fc 100644 --- a/packages/project/test/lib/build/cache/index/TreeRegistry.js +++ b/packages/project/test/lib/build/cache/index/TreeRegistry.js @@ -1,6 +1,6 @@ import test from "ava"; import sinon from "sinon"; -import HashTree from "../../../../../lib/build/cache/index/HashTree.js"; +import SharedHashTree from "../../../../../lib/build/cache/index/SharedHashTree.js"; import TreeRegistry from "../../../../../lib/build/cache/index/TreeRegistry.js"; // Helper to create mock Resource instances @@ -24,8 +24,8 @@ test.afterEach.always((t) => { test("TreeRegistry - register and track trees", (t) => { const registry = new TreeRegistry(); - new HashTree([{path: "a.js", integrity: "hash1"}], {registry}); - new HashTree([{path: "b.js", integrity: "hash2"}], {registry}); + new SharedHashTree([{path: "a.js", integrity: "hash1"}], registry); + new SharedHashTree([{path: "b.js", integrity: "hash2"}], registry); t.is(registry.getTreeCount(), 2, "Should track both trees"); }); @@ -33,7 +33,7 @@ test("TreeRegistry - register and track trees", (t) => { test("TreeRegistry - schedule and flush updates", async (t) => { const registry = new TreeRegistry(); const resources = [{path: "file.js", integrity: "hash1"}]; - const tree = new HashTree(resources, {registry}); + const tree = new SharedHashTree(resources, registry); const originalHash = tree.getRootHash(); @@ -56,7 +56,7 @@ test("TreeRegistry - flush returns only changed resources", async (t) => { {path: "file1.js", integrity: "hash1", lastModified: timestamp, size: 1024, inode: 123}, {path: "file2.js", integrity: "hash2", lastModified: timestamp, size: 2048, inode: 124} ]; - new HashTree(resources, {registry}); + new SharedHashTree(resources, registry); registry.scheduleUpsert(createMockResource("file1.js", "new-hash1", timestamp, 1024, 123)); registry.scheduleUpsert(createMockResource("file2.js", "hash2", timestamp, 2048, 124)); // unchanged @@ -69,7 +69,7 @@ test("TreeRegistry - flush returns empty array when no changes", async (t) => { const registry = new TreeRegistry(); const timestamp = Date.now(); const resources = [{path: "file.js", integrity: "hash1", lastModified: timestamp, size: 1024, inode: 123}]; - new HashTree(resources, {registry}); + new SharedHashTree(resources, registry); registry.scheduleUpsert(createMockResource("file.js", "hash1", timestamp, 1024, 123)); // same value @@ -84,7 +84,7 @@ test("TreeRegistry - batch updates affect all trees sharing nodes", async (t) => {path: "shared/b.js", integrity: "hash-b"} ]; - const tree1 = new HashTree(resources, {registry}); + const tree1 = new SharedHashTree(resources, registry); const originalHash1 = tree1.getRootHash(); // Create derived tree that shares "shared" directory @@ -120,7 +120,7 @@ test("TreeRegistry - batch updates affect all trees sharing nodes", async (t) => test("TreeRegistry - handles missing resources gracefully during flush", async (t) => { const registry = new TreeRegistry(); - new HashTree([{path: "exists.js", integrity: "hash1"}], {registry}); + new SharedHashTree([{path: "exists.js", integrity: "hash1"}], registry); // Schedule update for non-existent resource registry.scheduleUpsert(createMockResource("missing.js", "hash2", Date.now(), 1024, 444)); @@ -131,7 +131,7 @@ test("TreeRegistry - handles missing resources gracefully during flush", async ( test("TreeRegistry - multiple updates to same resource", async (t) => { const registry = new TreeRegistry(); - const tree = new HashTree([{path: "file.js", integrity: "v1"}], {registry}); + const tree = new SharedHashTree([{path: "file.js", integrity: "v1"}], registry); const timestamp = Date.now(); registry.scheduleUpsert(createMockResource("file.js", "v2", timestamp, 1024, 100)); @@ -149,13 +149,13 @@ test("TreeRegistry - multiple updates to same resource", async (t) => { test("TreeRegistry - updates without changes lead to same hash", async (t) => { const registry = new TreeRegistry(); const timestamp = Date.now(); - const tree = new HashTree([{ + const tree = new SharedHashTree([{ path: "/src/foo/file1.js", integrity: "v1", }, { path: "/src/foo/file3.js", integrity: "v1", }, { path: "/src/foo/file2.js", integrity: "v1", - }], {registry}); + }], registry); const initialHash = tree.getRootHash(); const file2Hash = tree.getResourceByPath("/src/foo/file2.js").hash; @@ -173,8 +173,8 @@ test("TreeRegistry - updates without changes lead to same hash", async (t) => { test("TreeRegistry - unregister tree", async (t) => { const registry = new TreeRegistry(); - const tree1 = new HashTree([{path: "a.js", integrity: "hash1"}], {registry}); - const tree2 = new HashTree([{path: "b.js", integrity: "hash2"}], {registry}); + const tree1 = new SharedHashTree([{path: "a.js", integrity: "hash1"}], registry); + const tree2 = new SharedHashTree([{path: "b.js", integrity: "hash2"}], registry); t.is(registry.getTreeCount(), 2); @@ -193,12 +193,13 @@ test("TreeRegistry - unregister tree", async (t) => { // ============================================================================ test("deriveTree - creates tree sharing subtrees", (t) => { + const registry = new TreeRegistry(); const resources = [ {path: "dir1/a.js", integrity: "hash-a"}, {path: "dir1/b.js", integrity: "hash-b"} ]; - const tree1 = new HashTree(resources); + const tree1 = new SharedHashTree(resources, registry); const tree2 = tree1.deriveTree([{path: "dir2/c.js", integrity: "hash-c"}]); // Both trees should have dir1 @@ -210,11 +211,12 @@ test("deriveTree - creates tree sharing subtrees", (t) => { }); test("deriveTree - shared nodes are the same reference", (t) => { + const registry = new TreeRegistry(); const resources = [ {path: "shared/file.js", integrity: "hash1"} ]; - const tree1 = new HashTree(resources); + const tree1 = new SharedHashTree(resources, registry); const tree2 = tree1.deriveTree([]); // Get the shared directory node from both trees @@ -236,7 +238,7 @@ test("deriveTree - updates to shared nodes visible in all trees", async (t) => { {path: "shared/file.js", integrity: "original"} ]; - const tree1 = new HashTree(resources, {registry}); + const tree1 = new SharedHashTree(resources, registry); const tree2 = tree1.deriveTree([]); // Get nodes before update @@ -258,7 +260,7 @@ test("deriveTree - updates to shared nodes visible in all trees", async (t) => { test("deriveTree - multiple levels of derivation", async (t) => { const registry = new TreeRegistry(); - const tree1 = new HashTree([{path: "a.js", integrity: "hash-a"}], {registry}); + const tree1 = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); const tree2 = tree1.deriveTree([{path: "b.js", integrity: "hash-b"}]); const tree3 = tree2.deriveTree([{path: "c.js", integrity: "hash-c"}]); @@ -284,7 +286,7 @@ test("deriveTree - efficient hash recomputation", async (t) => { {path: "dir2/c.js", integrity: "hash-c"} ]; - const tree1 = new HashTree(resources, {registry}); + const tree1 = new SharedHashTree(resources, registry); const tree2 = tree1.deriveTree([{path: "dir3/d.js", integrity: "hash-d"}]); // Spy on _computeHash to count calls @@ -307,7 +309,7 @@ test("deriveTree - independent updates to different directories", async (t) => { {path: "dir1/a.js", integrity: "hash-a"} ]; - const tree1 = new HashTree(resources, {registry}); + const tree1 = new SharedHashTree(resources, registry); const tree2 = tree1.deriveTree([{path: "dir2/b.js", integrity: "hash-b"}]); const hash1Before = tree1.getRootHash(); @@ -330,12 +332,13 @@ test("deriveTree - independent updates to different directories", async (t) => { }); test("deriveTree - preserves tree statistics correctly", (t) => { + const registry = new TreeRegistry(); const resources = [ {path: "dir1/a.js", integrity: "hash-a"}, {path: "dir1/b.js", integrity: "hash-b"} ]; - const tree1 = new HashTree(resources); + const tree1 = new SharedHashTree(resources, registry); const tree2 = tree1.deriveTree([ {path: "dir2/c.js", integrity: "hash-c"}, {path: "dir2/d.js", integrity: "hash-d"} @@ -350,11 +353,12 @@ test("deriveTree - preserves tree statistics correctly", (t) => { }); test("deriveTree - empty derivation creates exact copy with shared nodes", (t) => { + const registry = new TreeRegistry(); const resources = [ {path: "file.js", integrity: "hash1"} ]; - const tree1 = new HashTree(resources); + const tree1 = new SharedHashTree(resources, registry); const tree2 = tree1.deriveTree([]); // Should have same structure @@ -377,7 +381,7 @@ test("deriveTree - complex shared structure", async (t) => { {path: "shared/file3.js", integrity: "hash3"} ]; - const tree1 = new HashTree(resources, {registry}); + const tree1 = new SharedHashTree(resources, registry); const tree2 = tree1.deriveTree([ {path: "unique/file4.js", integrity: "hash4"} ]); @@ -404,7 +408,7 @@ test("deriveTree - complex shared structure", async (t) => { test("upsertResources - with registry schedules operations", async (t) => { const registry = new TreeRegistry(); - const tree = new HashTree([{path: "a.js", integrity: "hash-a"}], {registry}); + const tree = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); const result = await tree.upsertResources([ createMockResource("b.js", "hash-b", Date.now(), 1024, 1) @@ -415,7 +419,7 @@ test("upsertResources - with registry schedules operations", async (t) => { test("upsertResources - with registry and flush", async (t) => { const registry = new TreeRegistry(); - const tree = new HashTree([{path: "a.js", integrity: "hash-a"}], {registry}); + const tree = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); const originalHash = tree.getRootHash(); await tree.upsertResources([ @@ -436,7 +440,7 @@ test("upsertResources - with registry and flush", async (t) => { test("upsertResources - with derived trees", async (t) => { const registry = new TreeRegistry(); - const tree1 = new HashTree([{path: "shared/a.js", integrity: "hash-a"}], {registry}); + const tree1 = new SharedHashTree([{path: "shared/a.js", integrity: "hash-a"}], registry); const tree2 = tree1.deriveTree([{path: "unique/b.js", integrity: "hash-b"}]); await tree1.upsertResources([ @@ -457,10 +461,10 @@ test("upsertResources - with derived trees", async (t) => { test("removeResources - with registry schedules operations", async (t) => { const registry = new TreeRegistry(); - const tree = new HashTree([ + const tree = new SharedHashTree([ {path: "a.js", integrity: "hash-a"}, {path: "b.js", integrity: "hash-b"} - ], {registry}); + ], registry); const result = await tree.removeResources(["b.js"]); @@ -469,11 +473,11 @@ test("removeResources - with registry schedules operations", async (t) => { test("removeResources - with registry and flush", async (t) => { const registry = new TreeRegistry(); - const tree = new HashTree([ + const tree = new SharedHashTree([ {path: "a.js", integrity: "hash-a"}, {path: "b.js", integrity: "hash-b"}, {path: "c.js", integrity: "hash-c"} - ], {registry}); + ], registry); const originalHash = tree.getRootHash(); await tree.removeResources(["b.js", "c.js"]); @@ -492,10 +496,10 @@ test("removeResources - with registry and flush", async (t) => { test("removeResources - with derived trees propagates removal", async (t) => { const registry = new TreeRegistry(); - const tree1 = new HashTree([ + const tree1 = new SharedHashTree([ {path: "shared/a.js", integrity: "hash-a"}, {path: "shared/b.js", integrity: "hash-b"} - ], {registry}); + ], registry); const tree2 = tree1.deriveTree([{path: "unique/c.js", integrity: "hash-c"}]); // Verify both trees share the resources @@ -518,10 +522,10 @@ test("removeResources - with derived trees propagates removal", async (t) => { test("removeResources - with registry cleans up empty directories", async (t) => { const registry = new TreeRegistry(); - const tree = new HashTree([ + const tree = new SharedHashTree([ {path: "dir1/dir2/only.js", integrity: "hash-only"}, {path: "dir1/other.js", integrity: "hash-other"} - ], {registry}); + ], registry); // Verify structure before removal t.truthy(tree.hasPath("dir1/dir2/only.js"), "Should have dir1/dir2/only.js"); @@ -545,10 +549,10 @@ test("removeResources - with registry cleans up empty directories", async (t) => test("removeResources - with registry cleans up deeply nested empty directories", async (t) => { const registry = new TreeRegistry(); - const tree = new HashTree([ + const tree = new SharedHashTree([ {path: "a/b/c/d/e/deep.js", integrity: "hash-deep"}, {path: "a/sibling.js", integrity: "hash-sibling"} - ], {registry}); + ], registry); // Verify structure before removal t.truthy(tree.hasPath("a/b/c/d/e/deep.js"), "Should have deeply nested file"); @@ -573,10 +577,10 @@ test("removeResources - with registry cleans up deeply nested empty directories" test("removeResources - with derived trees cleans up empty directories in both trees", async (t) => { const registry = new TreeRegistry(); - const tree1 = new HashTree([ + const tree1 = new SharedHashTree([ {path: "shared/dir/only.js", integrity: "hash-only"}, {path: "shared/other.js", integrity: "hash-other"} - ], {registry}); + ], registry); const tree2 = tree1.deriveTree([{path: "unique/file.js", integrity: "hash-unique"}]); // Verify both trees share the directory structure @@ -604,11 +608,11 @@ test("removeResources - with derived trees cleans up empty directories in both t test("removeResources - multiple removals with registry clean up shared empty directories", async (t) => { const registry = new TreeRegistry(); - const tree = new HashTree([ + const tree = new SharedHashTree([ {path: "dir1/sub1/file1.js", integrity: "hash1"}, {path: "dir1/sub2/file2.js", integrity: "hash2"}, {path: "dir2/file3.js", integrity: "hash3"} - ], {registry}); + ], registry); // Remove both files from dir1 (making both sub1 and sub2 empty) await tree.removeResources(["dir1/sub1/file1.js", "dir1/sub2/file2.js"]); @@ -632,10 +636,10 @@ test("removeResources - multiple removals with registry clean up shared empty di test("upsertResources and removeResources - combined operations", async (t) => { const registry = new TreeRegistry(); - const tree = new HashTree([ + const tree = new SharedHashTree([ {path: "a.js", integrity: "hash-a"}, {path: "b.js", integrity: "hash-b"} - ], {registry}); + ], registry); const originalHash = tree.getRootHash(); // Schedule both operations @@ -657,7 +661,7 @@ test("upsertResources and removeResources - combined operations", async (t) => { test("upsertResources and removeResources - conflicting operations on same path", async (t) => { const registry = new TreeRegistry(); - const tree = new HashTree([{path: "a.js", integrity: "hash-a"}], {registry}); + const tree = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); // Schedule removal then upsert (upsert should win) await tree.removeResources(["a.js"]); @@ -679,8 +683,8 @@ test("upsertResources and removeResources - conflicting operations on same path" test("TreeRegistry - flush returns per-tree statistics", async (t) => { const registry = new TreeRegistry(); - const tree1 = new HashTree([{path: "a.js", integrity: "hash-a"}], {registry}); - const tree2 = new HashTree([{path: "b.js", integrity: "hash-b"}], {registry}); + const tree1 = new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); + const tree2 = new SharedHashTree([{path: "b.js", integrity: "hash-b"}], registry); // Update tree1 resource registry.scheduleUpsert(createMockResource("a.js", "new-hash-a", Date.now(), 1024, 1)); @@ -724,10 +728,10 @@ test("TreeRegistry - flush returns per-tree statistics", async (t) => { test("TreeRegistry - per-tree statistics with shared nodes", async (t) => { const registry = new TreeRegistry(); - const tree1 = new HashTree([ + const tree1 = new SharedHashTree([ {path: "shared/a.js", integrity: "hash-a"}, {path: "shared/b.js", integrity: "hash-b"} - ], {registry}); + ], registry); const tree2 = tree1.deriveTree([{path: "unique/c.js", integrity: "hash-c"}]); // Verify trees share the "shared" directory @@ -762,11 +766,11 @@ test("TreeRegistry - per-tree statistics with shared nodes", async (t) => { test("TreeRegistry - per-tree statistics with mixed operations", async (t) => { const registry = new TreeRegistry(); - const tree1 = new HashTree([ + const tree1 = new SharedHashTree([ {path: "a.js", integrity: "hash-a"}, {path: "b.js", integrity: "hash-b"}, {path: "c.js", integrity: "hash-c"} - ], {registry}); + ], registry); const tree2 = tree1.deriveTree([{path: "d.js", integrity: "hash-d"}]); // Update a.js (affects both trees - shared) @@ -808,20 +812,20 @@ test("TreeRegistry - per-tree statistics with mixed operations", async (t) => { test("TreeRegistry - per-tree statistics with no changes", async (t) => { const registry = new TreeRegistry(); const timestamp = Date.now(); - const tree1 = new HashTree([{ + const tree1 = new SharedHashTree([{ path: "a.js", integrity: "hash-a", lastModified: timestamp, size: 1024, inode: 100 - }], {registry}); - const tree2 = new HashTree([{ + }], registry); + const tree2 = new SharedHashTree([{ path: "b.js", integrity: "hash-b", lastModified: timestamp, size: 2048, inode: 200 - }], {registry}); + }], registry); // Schedule updates with unchanged metadata // Note: These will add missing resources to the other tree @@ -861,8 +865,8 @@ test("TreeRegistry - per-tree statistics with no changes", async (t) => { test("TreeRegistry - empty flush returns empty treeStats", async (t) => { const registry = new TreeRegistry(); - new HashTree([{path: "a.js", integrity: "hash-a"}], {registry}); - new HashTree([{path: "b.js", integrity: "hash-b"}], {registry}); + new SharedHashTree([{path: "a.js", integrity: "hash-a"}], registry); + new SharedHashTree([{path: "b.js", integrity: "hash-b"}], registry); // Flush without scheduling any operations const result = await registry.flush(); @@ -878,10 +882,10 @@ test("TreeRegistry - derived tree reflects base tree resource changes in statist const registry = new TreeRegistry(); // Create base tree with some resources - const baseTree = new HashTree([ + const baseTree = new SharedHashTree([ {path: "shared/resource1.js", integrity: "hash1"}, {path: "shared/resource2.js", integrity: "hash2"} - ], {registry}); + ], registry); // Derive a new tree from base tree (shares same registry) // Note: deriveTree doesn't schedule the new resources, it adds them directly to the derived tree From 044ca6d26c20944f3378ec8e701ba5b096e2b305 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Thu, 15 Jan 2026 18:06:57 +0100 Subject: [PATCH 090/110] refactor(project): Re-implement differential task build --- packages/project/lib/build/TaskRunner.js | 9 +- .../project/lib/build/cache/BuildTaskCache.js | 68 +++--- .../project/lib/build/cache/CacheManager.js | 2 +- .../lib/build/cache/ProjectBuildCache.js | 226 ++++++++++-------- .../lib/build/cache/ResourceRequestManager.js | 174 +++++++------- .../lib/build/helpers/ProjectBuildContext.js | 3 +- 6 files changed, 259 insertions(+), 223 deletions(-) diff --git a/packages/project/lib/build/TaskRunner.js b/packages/project/lib/build/TaskRunner.js index 49238a1d1ec..a93ed299e93 100644 --- a/packages/project/lib/build/TaskRunner.js +++ b/packages/project/lib/build/TaskRunner.js @@ -195,7 +195,7 @@ class TaskRunner { this._log.skipTask(taskName); return; } - const usingCache = supportsDifferentialUpdates && cacheInfo; + const usingCache = !!(supportsDifferentialUpdates && cacheInfo); const workspace = createMonitor(this._project.getWorkspace()); const params = { workspace, @@ -209,9 +209,9 @@ class TaskRunner { params.dependencies = dependencies; } if (usingCache) { - params.changedProjectResourcePaths = Array.from(cacheInfo.changedProjectResourcePaths); + params.changedProjectResourcePaths = cacheInfo.changedProjectResourcePaths; if (requiresDependencies) { - params.changedDependencyResourcePaths = Array.from(cacheInfo.changedDependencyResourcePaths); + params.changedDependencyResourcePaths = cacheInfo.changedDependencyResourcePaths; } } if (!taskFunction) { @@ -229,7 +229,8 @@ class TaskRunner { await this._buildCache.recordTaskResult(taskName, workspace.getResourceRequests(), dependencies?.getResourceRequests(), - usingCache ? cacheInfo : undefined); + usingCache ? cacheInfo : undefined, + supportsDifferentialUpdates); }; } this._tasks[taskName] = { diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index 9d82c78ff50..f9b8820800a 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -26,8 +26,9 @@ const log = getLogger("build:cache:BuildTaskCache"); * to reuse existing resource indices, optimizing both memory and computation. */ export default class BuildTaskCache { - #taskName; #projectName; + #taskName; + #supportsDifferentialUpdates; #projectRequestManager; #dependencyRequestManager; @@ -35,24 +36,32 @@ export default class BuildTaskCache { /** * Creates a new BuildTaskCache instance * - * @param {string} taskName - Name of the task this cache manages * @param {string} projectName - Name of the project this task belongs to - * @param {object} [cachedTaskMetadata] + * @param {string} taskName - Name of the task this cache manages + * @param {boolean} supportsDifferentialUpdates + * @param {ResourceRequestManager} [projectRequestManager] + * @param {ResourceRequestManager} [dependencyRequestManager] */ - constructor(taskName, projectName, cachedTaskMetadata) { - this.#taskName = taskName; + constructor(projectName, taskName, supportsDifferentialUpdates, projectRequestManager, dependencyRequestManager) { this.#projectName = projectName; + this.#taskName = taskName; + this.#supportsDifferentialUpdates = supportsDifferentialUpdates; + log.verbose(`Initializing BuildTaskCache for task "${taskName}" of project "${this.#projectName}" ` + + `(supportsDifferentialUpdates=${supportsDifferentialUpdates})`); + + this.#projectRequestManager = projectRequestManager ?? + new ResourceRequestManager(projectName, taskName, supportsDifferentialUpdates); + this.#dependencyRequestManager = dependencyRequestManager ?? + new ResourceRequestManager(projectName, taskName, supportsDifferentialUpdates); + } - if (cachedTaskMetadata) { - this.#projectRequestManager = ResourceRequestManager.fromCache(taskName, projectName, - cachedTaskMetadata.projectRequests); - this.#dependencyRequestManager = ResourceRequestManager.fromCache(taskName, projectName, - cachedTaskMetadata.dependencyRequests); - } else { - // No cache reader provided, start with empty graph - this.#projectRequestManager = new ResourceRequestManager(taskName, projectName); - this.#dependencyRequestManager = new ResourceRequestManager(taskName, projectName); - } + static fromCache(projectName, taskName, supportsDifferentialUpdates, projectRequests, dependencyRequests) { + const projectRequestManager = ResourceRequestManager.fromCache(projectName, taskName, + supportsDifferentialUpdates, projectRequests); + const dependencyRequestManager = ResourceRequestManager.fromCache(projectName, taskName, + supportsDifferentialUpdates, dependencyRequests); + return new BuildTaskCache(projectName, taskName, supportsDifferentialUpdates, + projectRequestManager, dependencyRequestManager); } // ===== METADATA ACCESS ===== @@ -66,6 +75,10 @@ export default class BuildTaskCache { return this.#taskName; } + getSupportsDifferentialUpdates() { + return this.#supportsDifferentialUpdates; + } + hasNewOrModifiedCacheEntries() { return this.#projectRequestManager.hasNewOrModifiedCacheEntries() || this.#dependencyRequestManager.hasNewOrModifiedCacheEntries(); @@ -105,7 +118,7 @@ export default class BuildTaskCache { * a unique combination of resources, belonging to the current project, that were accessed * during task execution. This can be used to form a cache keys for restoring cached task results. * - * @returns {Promise} Array of signature strings + * @returns {string[]} Array of signature strings * @throws {Error} If resource index is missing for any request set */ getProjectIndexSignatures() { @@ -119,13 +132,21 @@ export default class BuildTaskCache { * a unique combination of resources, belonging to all dependencies of the current project, that were accessed * during task execution. This can be used to form a cache keys for restoring cached task results. * - * @returns {Promise} Array of signature strings + * @returns {string[]} Array of signature strings * @throws {Error} If resource index is missing for any request set */ getDependencyIndexSignatures() { return this.#dependencyRequestManager.getIndexSignatures(); } + getProjectIndexDeltas() { + return this.#projectRequestManager.getDeltas(); + } + + getDependencyIndexDeltas() { + return this.#dependencyRequestManager.getDeltas(); + } + /** * Calculates a signature for the task based on accessed resources * @@ -159,27 +180,20 @@ export default class BuildTaskCache { this.#projectRequestManager.addAffiliatedRequestSet(projectReqSetId, depReqSetId); dependencyReqSignature = depReqSignature; } else { - dependencyReqSignature = "X"; // No dependencies accessed + dependencyReqSignature = this.#dependencyRequestManager.recordNoRequests(); } return [projectReqSignature, dependencyReqSignature]; } - findDelta() { - // TODO: Implement - } - /** * Serializes the task cache to a plain object for persistence * * Exports the resource request graph in a format suitable for JSON serialization. * The serialized data can be passed to the constructor to restore the cache state. * - * @returns {TaskCacheMetadata} Serialized cache metadata containing the request set graph + * @returns {object[]} Serialized cache metadata containing the request set graphs */ toCacheObjects() { - return { - projectRequests: this.#projectRequestManager.toCacheObject(), - dependencyRequests: this.#dependencyRequestManager.toCacheObject(), - }; + return [this.#projectRequestManager.toCacheObject(), this.#dependencyRequestManager.toCacheObject()]; } } diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index 28a91425305..d8088e3f4ee 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -20,7 +20,7 @@ const chacheManagerInstances = new Map(); const CACACHE_OPTIONS = {algorithms: ["sha256"]}; // Cache version for compatibility management -const CACHE_VERSION = "v0"; +const CACHE_VERSION = "v0_0"; /** * Manages persistence for the build cache using file-based storage and cacache diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 469c748ac6b..e7605309bd7 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -94,7 +94,8 @@ export default class ProjectBuildCache { * * @param {@ui5/fs/AbstractReader} dependencyReader - Reader for dependency resources * @param {boolean} [forceDependencyUpdate=false] - * @returns {Promise} True if cache is fresh and can be fully utilized, false otherwise + * @returns {Promise} Undefined if no cache has been found. Otherwise a list of changed + * resources */ async prepareProjectBuildAndValidateCache(dependencyReader, forceDependencyUpdate = false) { this.#currentProjectReader = this.#project.getReader(); @@ -271,27 +272,15 @@ export default class ProjectBuildCache { await taskCache.updateProjectIndices(this.#currentProjectReader, this.#writtenResultResourcePaths); } - // let deltaInfo; - // if (this.#invalidatedTasks.has(taskName)) { - // const invalidationInfo = - // this.#invalidatedTasks.get(taskName); - // log.verbose(`Task cache for task ${taskName} has been invalidated, updating indices ` + - // `with ${invalidationInfo.changedProjectResourcePaths.size} changed project resource paths and ` + - // `${invalidationInfo.changedDependencyResourcePaths.size} changed dependency resource paths...`); - - - // // deltaInfo = await taskCache.updateIndices( - // // invalidationInfo.changedProjectResourcePaths, - // // invalidationInfo.changedDependencyResourcePaths, - // // this.#currentProjectReader, this.#currentDependencyReader); - // } // else: Index will be created upon task completion - + // TODO: Implement: // After index update, try to find cached stages for the new signatures - // let stageSignatures = taskCache.getAffiliatedSignaturePairs(); // TODO: Implement + // let stageSignatures = taskCache.getAffiliatedSignaturePairs(); + const projectSignatures = taskCache.getProjectIndexSignatures(); + const dependencySignatures = taskCache.getDependencyIndexSignatures(); const stageSignatures = combineTwoArraysFast( - taskCache.getProjectIndexSignatures(), - taskCache.getDependencyIndexSignatures() + projectSignatures, + dependencySignatures, ).map((signaturePair) => { return createStageSignature(...signaturePair); }); @@ -303,14 +292,9 @@ export default class ProjectBuildCache { // Store dependency signature for later use in result stage signature calculation this.#currentDependencySignatures.set(taskName, stageCache.signature.split("-")[1]); - // Task can be skipped, use cached stage as project reader - // if (this.#invalidatedTasks.has(taskName)) { - // this.#invalidatedTasks.delete(taskName); - // } - - if (!stageChanged) { - // Invalidate following tasks - // this.#invalidateFollowingTasks(taskName, Array.from(stageCache.writtenResourcePaths)); + // Cached stage might differ from the previous one + // Add all resources written by the cached stage to the set of written/potentially changed resources + if (stageChanged) { for (const resourcePath of stageCache.writtenResourcePaths) { if (!this.#writtenResultResourcePaths.includes(resourcePath)) { this.#writtenResultResourcePaths.push(resourcePath); @@ -320,24 +304,65 @@ export default class ProjectBuildCache { return true; // No need to execute the task } else { log.verbose(`No cached stage found for task ${taskName} in project ${this.#project.getName()}`); - // TODO: Re-implement - // const deltaInfo = taskCache.findDelta(); + // TODO: Optimize this crazy thing + const projectDeltas = taskCache.getProjectIndexDeltas(); + const depDeltas = taskCache.getDependencyIndexDeltas(); + + // Combine deltas of project stages with cached dependency signatures + const projDeltaSignatures = combineTwoArraysFast( + Array.from(projectDeltas.keys()), + dependencySignatures, + ).map((signaturePair) => { + return createStageSignature(...signaturePair); + }); + // Combine deltas of dependency stages with cached project signatures + const depDeltaSignatures = combineTwoArraysFast( + projectSignatures, + Array.from(projectDeltas.keys()), + ).map((signaturePair) => { + return createStageSignature(...signaturePair); + }); + // Combine deltas of both project and dependency stages + const deltaDeltaSignatures = combineTwoArraysFast( + Array.from(projectDeltas.keys()), + Array.from(depDeltas.keys()), + ).map((signaturePair) => { + return createStageSignature(...signaturePair); + }); + const deltaSignatures = [...projDeltaSignatures, ...depDeltaSignatures, ...deltaDeltaSignatures]; + const deltaStageCache = await this.#findStageCache(stageName, deltaSignatures); + if (deltaStageCache) { + // Store dependency signature for later use in result stage signature calculation + const [foundProjectSig, foundDepSig] = deltaStageCache.signature.split("-"); + this.#currentDependencySignatures.set(taskName, foundDepSig); + const projectDeltaInfo = projectDeltas.get(foundProjectSig); + const dependencyDeltaInfo = depDeltas.get(foundDepSig); + + const newSignature = createStageSignature( + projectDeltaInfo?.newSignature ?? foundProjectSig, + dependencyDeltaInfo?.newSignature ?? foundDepSig); + + // Using cached stage which might differ from the previous one + // Add all resources written by the cached stage to the set of written/potentially changed resources + for (const resourcePath of deltaStageCache.writtenResourcePaths) { + if (!this.#writtenResultResourcePaths.includes(resourcePath)) { + this.#writtenResultResourcePaths.push(resourcePath); + } + } - // const deltaStageCache = await this.#findStageCache(stageName, [deltaInfo.originalSignature]); - // if (deltaStageCache) { - // log.verbose( - // `Using delta cached stage for task ${taskName} in project ${this.#project.getName()} ` + - // `with original signature ${deltaInfo.originalSignature} (now ${deltaInfo.newSignature}) ` + - // `and ${deltaInfo.changedProjectResourcePaths.size} changed project resource paths and ` + - // `${deltaInfo.changedDependencyResourcePaths.size} changed dependency resource paths.`); - - // return { - // previousStageCache: deltaStageCache, - // newSignature: deltaInfo.newSignature, - // changedProjectResourcePaths: deltaInfo.changedProjectResourcePaths, - // changedDependencyResourcePaths: deltaInfo.changedDependencyResourcePaths - // }; - // } + log.verbose( + `Using delta cached stage for task ${taskName} in project ${this.#project.getName()} ` + + `with original signature ${deltaStageCache.signature} (now ${newSignature}) ` + + `and ${projectDeltaInfo?.changedPaths.length ?? "unknown"} changed project resource paths and ` + + `${dependencyDeltaInfo?.changedPaths.length ?? "unknown"} changed dependency resource paths.`); + + return { + previousStageCache: deltaStageCache, + newSignature: newSignature, + changedProjectResourcePaths: projectDeltaInfo?.changedPaths ?? [], + changedDependencyResourcePaths: dependencyDeltaInfo?.changedPaths ?? [] + }; + } } return false; // Task needs to be executed } @@ -354,35 +379,36 @@ export default class ProjectBuildCache { * @returns {Promise} Cached stage entry or null if not found */ async #findStageCache(stageName, stageSignatures) { + if (!stageSignatures.length) { + return; + } // Check cache exists and ensure it's still valid before using it log.verbose(`Looking for cached stage for task ${stageName} in project ${this.#project.getName()} ` + `with ${stageSignatures.length} possible signatures:\n - ${stageSignatures.join("\n - ")}`); - if (stageSignatures.length) { - for (const stageSignature of stageSignatures) { - const stageCache = this.#stageCache.getCacheForSignature(stageName, stageSignature); - if (stageCache) { - return stageCache; - } + for (const stageSignature of stageSignatures) { + const stageCache = this.#stageCache.getCacheForSignature(stageName, stageSignature); + if (stageCache) { + return stageCache; } - // TODO: If list of signatures is longer than N, - // retrieve all available signatures from cache manager first. - // Later maybe add a bloom filter for even larger sets - const stageCache = await firstTruthy(stageSignatures.map(async (stageSignature) => { - const stageMetadata = await this.#cacheManager.readStageCache( - this.#project.getId(), this.#buildSignature, stageName, stageSignature); - if (stageMetadata) { - log.verbose(`Found cached stage with signature ${stageSignature}`); - const reader = this.#createReaderForStageCache( - stageName, stageSignature, stageMetadata.resourceMetadata); - return { - signature: stageSignature, - stage: reader, - writtenResourcePaths: Object.keys(stageMetadata.resourceMetadata), - }; - } - })); - return stageCache; } + // TODO: If list of signatures is longer than N, + // retrieve all available signatures from cache manager first. + // Later maybe add a bloom filter for even larger sets + const stageCache = await firstTruthy(stageSignatures.map(async (stageSignature) => { + const stageMetadata = await this.#cacheManager.readStageCache( + this.#project.getId(), this.#buildSignature, stageName, stageSignature); + if (stageMetadata) { + log.verbose(`Found cached stage with signature ${stageSignature}`); + const reader = this.#createReaderForStageCache( + stageName, stageSignature, stageMetadata.resourceMetadata); + return { + signature: stageSignature, + stage: reader, + writtenResourcePaths: Object.keys(stageMetadata.resourceMetadata), + }; + } + })); + return stageCache; } /** @@ -400,12 +426,16 @@ export default class ProjectBuildCache { * @param {@ui5/project/build/cache/BuildTaskCache~ResourceRequests|undefined} dependencyResourceRequests * Resource requests for dependency resources * @param {object} cacheInfo + * @param {boolean} supportsDifferentialUpdates - Whether the task supports differential updates * @returns {Promise} */ - async recordTaskResult(taskName, projectResourceRequests, dependencyResourceRequests, cacheInfo) { + async recordTaskResult( + taskName, projectResourceRequests, dependencyResourceRequests, cacheInfo, supportsDifferentialUpdates + ) { if (!this.#taskCache.has(taskName)) { // Initialize task cache - this.#taskCache.set(taskName, new BuildTaskCache(taskName, this.#project.getName())); + this.#taskCache.set(taskName, + new BuildTaskCache(this.#project.getName(), taskName, supportsDifferentialUpdates)); } log.verbose(`Recording results of task ${taskName} in project ${this.#project.getName()}...`); const taskCache = this.#taskCache.get(taskName); @@ -457,11 +487,6 @@ export default class ProjectBuildCache { this.#getStageNameForTask(taskName), stageSignature, this.#project.getStage(), writtenResourcePaths); - // // Task has been successfully executed, remove from invalidated tasks - // if (this.#invalidatedTasks.has(taskName)) { - // this.#invalidatedTasks.delete(taskName); - // } - // Update task cache with new metadata log.verbose(`Task ${taskName} produced ${writtenResourcePaths.length} resources`); @@ -590,24 +615,24 @@ export default class ProjectBuildCache { await ResourceIndex.fromCacheWithDelta(indexCache, resources, Date.now()); // Import task caches - const buildTaskCaches = await Promise.all(indexCache.taskList.map(async (taskName) => { - const projectRequests = await this.#cacheManager.readTaskMetadata( - this.#project.getId(), this.#buildSignature, `${taskName}-pr`); - if (!projectRequests) { - throw new Error(`Failed to load project request cache for task ` + - `${taskName} in project ${this.#project.getName()}`); - } - const dependencyRequests = await this.#cacheManager.readTaskMetadata( - this.#project.getId(), this.#buildSignature, `${taskName}-dr`); - if (!dependencyRequests) { - throw new Error(`Failed to load dependency request cache for task ` + - `${taskName} in project ${this.#project.getName()}`); - } - return new BuildTaskCache(taskName, this.#project.getName(), { - projectRequests, - dependencyRequests, - }); - })); + const buildTaskCaches = await Promise.all( + indexCache.tasks.map(async ([taskName, supportsDifferentialUpdates]) => { + const projectRequests = await this.#cacheManager.readTaskMetadata( + this.#project.getId(), this.#buildSignature, `${taskName}-pr`); + if (!projectRequests) { + throw new Error(`Failed to load project request cache for task ` + + `${taskName} in project ${this.#project.getName()}`); + } + const dependencyRequests = await this.#cacheManager.readTaskMetadata( + this.#project.getId(), this.#buildSignature, `${taskName}-dr`); + if (!dependencyRequests) { + throw new Error(`Failed to load dependency request cache for task ` + + `${taskName} in project ${this.#project.getName()}`); + } + return BuildTaskCache.fromCache(this.#project.getName(), taskName, !!supportsDifferentialUpdates, + projectRequests, dependencyRequests); + }) + ); // Ensure taskCache is filled in the order of task execution for (const buildTaskCache of buildTaskCaches) { this.#taskCache.set(buildTaskCache.getTaskName(), buildTaskCache); @@ -728,9 +753,10 @@ export default class ProjectBuildCache { const deltaReader = this.#project.getReader({excludeSourceReader: true}); const resources = await deltaReader.byGlob("/**/*"); const resourceMetadata = Object.create(null); - log.verbose(`Project ${this.#project.getName()} result stage signature is: ${stageSignature}`); - log.verbose(`Cache state: ${this.#cacheState}`); - log.verbose(`Storing result stage cache with ${resources.length} resources`); + log.verbose(`Writing result cache for project ${this.#project.getName()}:\n` + + `- Result stage signature is: ${stageSignature}\n` + + `- Cache state: ${this.#cacheState}\n` + + `- Storing ${resources.length} resources`); await Promise.all(resources.map(async (res) => { // Store resource content in cacache via CacheManager @@ -789,7 +815,7 @@ export default class ProjectBuildCache { // Store task caches for (const [taskName, taskCache] of this.#taskCache) { if (taskCache.hasNewOrModifiedCacheEntries()) { - const {projectRequests, dependencyRequests} = taskCache.toCacheObjects(); + const [projectRequests, dependencyRequests] = taskCache.toCacheObjects(); log.verbose(`Storing task cache metadata for task ${taskName} in project ${this.#project.getName()} ` + `with build signature ${this.#buildSignature}`); const writes = []; @@ -814,9 +840,13 @@ export default class ProjectBuildCache { log.verbose(`Storing resource index cache for project ${this.#project.getName()} ` + `with build signature ${this.#buildSignature}`); const sourceIndexObject = this.#sourceIndex.toCacheObject(); + const tasks = []; + for (const [taskName, taskCache] of this.#taskCache) { + tasks.push([taskName, taskCache.getSupportsDifferentialUpdates() ? 1 : 0]); + } await this.#cacheManager.writeIndexCache(this.#project.getId(), this.#buildSignature, "source", { ...sourceIndexObject, - taskList: Array.from(this.#taskCache.keys()), + tasks, }); } diff --git a/packages/project/lib/build/cache/ResourceRequestManager.js b/packages/project/lib/build/cache/ResourceRequestManager.js index d2d55cbeb3a..4ae8880ce0a 100644 --- a/packages/project/lib/build/cache/ResourceRequestManager.js +++ b/packages/project/lib/build/cache/ResourceRequestManager.js @@ -11,14 +11,17 @@ class ResourceRequestManager { #requestGraph; #treeRegistries = []; - #treeDiffs = new Map(); + #treeUpdateDeltas = new Map(); #hasNewOrModifiedCacheEntries; - #useDifferentialUpdate = true; + #useDifferentialUpdate; + #unusedAtLeastOnce; - constructor(taskName, projectName, requestGraph) { - this.#taskName = taskName; + constructor(projectName, taskName, useDifferentialUpdate, requestGraph, unusedAtLeastOnce = false) { this.#projectName = projectName; + this.#taskName = taskName; + this.#useDifferentialUpdate = useDifferentialUpdate; + this.#unusedAtLeastOnce = unusedAtLeastOnce; if (requestGraph) { this.#requestGraph = requestGraph; this.#hasNewOrModifiedCacheEntries = false; // Using cache @@ -28,9 +31,12 @@ class ResourceRequestManager { } } - static fromCache(taskName, projectName, {requestSetGraph, rootIndices, deltaIndices}) { + static fromCache(projectName, taskName, useDifferentialUpdate, { + requestSetGraph, rootIndices, deltaIndices, unusedAtLeastOnce + }) { const requestGraph = ResourceRequestGraph.fromCacheObject(requestSetGraph); - const resourceRequestManager = new ResourceRequestManager(taskName, projectName, requestGraph); + const resourceRequestManager = new ResourceRequestManager( + projectName, taskName, useDifferentialUpdate, requestGraph, unusedAtLeastOnce); const registries = new Map(); // Restore root resource indices for (const {nodeId, resourceIndex: serializedIndex} of rootIndices) { @@ -71,9 +77,6 @@ class ResourceRequestManager { */ getIndexSignatures() { const requestSetIds = this.#requestGraph.getAllNodeIds(); - if (requestSetIds.length === 0) { - return ["X"]; // No requests recorded, return static signature - } const signatures = requestSetIds.map((requestSetId) => { const {resourceIndex} = this.#requestGraph.getMetadata(requestSetId); if (!resourceIndex) { @@ -81,6 +84,9 @@ class ResourceRequestManager { } return resourceIndex.getSignature(); }); + if (this.#unusedAtLeastOnce) { + signatures.push("X"); // Signature for when no requests were made + } return signatures; } @@ -155,6 +161,9 @@ class ResourceRequestManager { matchingRequestSetIds.push(nodeId); } } + if (!matchingRequestSetIds.length) { + return false; // No relevant changes for any request set + } const resourceCache = new Map(); // Update matching resource indices @@ -245,19 +254,15 @@ class ResourceRequestManager { */ async #flushTreeChangesWithDiffTracking() { const requestSetIds = this.#requestGraph.getAllNodeIds(); + const previousTreeSignatures = new Map(); // Record current signatures and create mapping between trees and request sets requestSetIds.map((requestSetId) => { const {resourceIndex} = this.#requestGraph.getMetadata(requestSetId); if (!resourceIndex) { throw new Error(`Resource index missing for request set ID ${requestSetId}`); } - // Store original signatures for all trees that are not yet tracked - if (!this.#treeDiffs.has(resourceIndex.getTree())) { - this.#treeDiffs.set(resourceIndex.getTree(), { - requestSetId, - signature: resourceIndex.getSignature(), - }); - } + // Remember the original signature + previousTreeSignatures.set(resourceIndex.getTree(), [requestSetId, resourceIndex.getSignature()]); }); const results = await this.#flushTreeChanges(); let hasChanges = false; @@ -265,68 +270,13 @@ class ResourceRequestManager { if (res.added.length || res.updated.length || res.unchanged.length || res.removed.length) { hasChanges = true; } - for (const [tree, stats] of res.treeStats) { - this.#addStatsToTreeDiff(this.#treeDiffs.get(tree), stats); + for (const [tree, diff] of res.treeStats) { + const [requestSetId, originalSignature] = previousTreeSignatures.get(tree); + const newSignature = tree.getRootHash(); + this.#addDeltaEntry(requestSetId, originalSignature, newSignature, diff); } } return hasChanges; - - // let greatestNumberOfChanges = 0; - // let relevantTree; - // let relevantStats; - // let hasChanges = false; - // const results = await this.#flushTreeChanges(); - - // // Based on the returned stats, find the tree with the greatest difference - // // If none of the updated trees lead to a valid cache, this tree can be used to execute a differential - // // build (assuming there's a cache for its previous signature) - // for (const res of results) { - // if (res.added.length || res.updated.length || res.unchanged.length || res.removed.length) { - // hasChanges = true; - // } - // for (const [tree, stats] of res.treeStats) { - // if (stats.removed.length > 0) { - // // If the update process removed resources from that tree, this means that using it in a - // // differential build might lead to stale removed resources - // return; // TODO: continue; instead? - // } - // const numberOfChanges = stats.added.length + stats.updated.length; - // if (numberOfChanges > greatestNumberOfChanges) { - // greatestNumberOfChanges = numberOfChanges; - // relevantTree = tree; - // relevantStats = stats; - // } - // } - // } - // if (hasChanges) { - // this.#hasNewOrModifiedCacheEntries = true; - // } - - // if (!relevantTree) { - // return hasChanges; - // } - - // // Update signatures for affected request sets - // const {requestSetId, signature: originalSignature} = trees.get(relevantTree); - // const newSignature = relevantTree.getRootHash(); - // log.verbose(`Task '${this.#taskName}' of project '${this.#projectName}' ` + - // `updated resource index for request set ID ${requestSetId} ` + - // `from signature ${originalSignature} ` + - // `to ${newSignature}`); - - // const changedPaths = new Set(); - // for (const path of relevantStats.added) { - // changedPaths.add(path); - // } - // for (const path of relevantStats.updated) { - // changedPaths.add(path); - // } - - // return { - // originalSignature, - // newSignature, - // changedPaths, - // }; } /** @@ -341,27 +291,61 @@ class ResourceRequestManager { return await Promise.all(this.#treeRegistries.map((registry) => registry.flush())); } - #addStatsToTreeDiff(treeDiff, stats) { - if (!treeDiff.stats) { - treeDiff.stats = { - added: new Set(), - updated: new Set(), - unchanged: new Set(), - removed: new Set(), - }; + #addDeltaEntry(requestSetId, originalSignature, newSignature, diff) { + if (!this.#treeUpdateDeltas.has(requestSetId)) { + this.#treeUpdateDeltas.set(requestSetId, { + originalSignature, + newSignature, + diff + }); + return; + } + const entry = this.#treeUpdateDeltas.get(requestSetId); + + entry.previousSignatures ??= []; + entry.previousSignatures.push(entry.originalSignature); + entry.originalSignature = originalSignature; + entry.newSignature = newSignature; + + const {added, updated, unchanged, removed} = entry.diff; + for (const resourcePath of diff.added) { + if (!added.includes(resourcePath)) { + added.push(resourcePath); + } } - for (const path of stats.added) { - treeDiff.stats.added.add(path); + for (const resourcePath of diff.updated) { + if (!updated.includes(resourcePath)) { + updated.push(resourcePath); + } } - for (const path of stats.updated) { - treeDiff.stats.updated.add(path); + for (const resourcePath of diff.unchanged) { + if (!unchanged.includes(resourcePath)) { + unchanged.push(resourcePath); + } } - for (const path of stats.unchanged) { - treeDiff.stats.unchanged.add(path); + for (const resourcePath of diff.removed) { + if (!removed.includes(resourcePath)) { + removed.push(resourcePath); + } } - for (const path of stats.removed) { - treeDiff.stats.removed.add(path); + } + + getDeltas() { + const deltas = new Map(); + for (const {originalSignature, newSignature, diff} of this.#treeUpdateDeltas.values()) { + let changedPaths; + if (diff) { + const {added, updated, removed} = diff; + changedPaths = Array.from(new Set([...added, ...updated, ...removed])); + } else { + changedPaths = []; + } + deltas.set(originalSignature, { + newSignature, + changedPaths, + }); } + return deltas; } /** @@ -381,6 +365,11 @@ class ResourceRequestManager { return await this.#addRequestSet(projectRequests, reader); } + recordNoRequests() { + this.#unusedAtLeastOnce = true; + return "X"; // Signature for when no requests were made + } + async #addRequestSet(requests, reader) { // Try to find an existing request set that we can reuse let setId = this.#requestGraph.findExactMatch(requests); @@ -413,7 +402,7 @@ class ResourceRequestManager { } else { const resourcesRead = await this.#getResourcesForRequests(requests, reader); - resourceIndex = await ResourceIndex.create(resourcesRead, Date.now(), this.#newTreeRegistry()); + resourceIndex = await ResourceIndex.createShared(resourcesRead, Date.now(), this.#newTreeRegistry()); } metadata.resourceIndex = resourceIndex; } @@ -526,6 +515,7 @@ class ResourceRequestManager { requestSetGraph: this.#requestGraph.toCacheObject(), rootIndices, deltaIndices, + unusedAtLeastOnce: this.#unusedAtLeastOnce, }; } } diff --git a/packages/project/lib/build/helpers/ProjectBuildContext.js b/packages/project/lib/build/helpers/ProjectBuildContext.js index 8372b831c49..5cc25f8e0c9 100644 --- a/packages/project/lib/build/helpers/ProjectBuildContext.js +++ b/packages/project/lib/build/helpers/ProjectBuildContext.js @@ -180,7 +180,8 @@ class ProjectBuildContext { * Prepares the project build by updating, and then validating the build cache as needed * * @param {boolean} initialBuild - * @returns {Promise} True if project cache is fresh and can be used, false otherwise + * @returns {Promise} Undefined if no cache has been found. Otherwise a list of changed + * resources */ async prepareProjectBuildAndValidateCache(initialBuild) { // if (this.getBuildCache().hasCache() && this.getBuildCache().requiresDependencyIndexInitialization()) { From d6e9c43c55cc8e19f536517ae382d152f07ff4bc Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Fri, 16 Jan 2026 15:07:06 +0100 Subject: [PATCH 091/110] refactor(project): Fix HashTree tests --- .../project/lib/build/cache/index/HashTree.js | 76 ------ .../lib/build/cache/index/SharedHashTree.js | 77 ++++++ .../lib/build/cache/ResourceRequestGraph.js | 31 +-- .../test/lib/build/cache/index/HashTree.js | 224 ----------------- .../lib/build/cache/index/SharedHashTree.js | 237 ++++++++++++++++++ 5 files changed, 316 insertions(+), 329 deletions(-) diff --git a/packages/project/lib/build/cache/index/HashTree.js b/packages/project/lib/build/cache/index/HashTree.js index 6f5743d87e1..dea4105c04a 100644 --- a/packages/project/lib/build/cache/index/HashTree.js +++ b/packages/project/lib/build/cache/index/HashTree.js @@ -711,80 +711,4 @@ export default class HashTree { traverse(this.root, "/"); return paths.sort(); } - - /** - * For a tree derived from a base tree, get the list of resource nodes - * that were added compared to the base tree. - * - * @param {HashTree} rootTree - The base tree to compare against - * @returns {Array} - * Array of added resource metadata - */ - getAddedResources(rootTree) { - const added = []; - - const traverse = (node, currentPath, implicitlyAdded = false) => { - if (implicitlyAdded) { - // We're in a subtree that's entirely new - add all resources - if (node.type === "resource") { - added.push({ - path: currentPath, - integrity: node.integrity, - size: node.size, - lastModified: node.lastModified, - inode: node.inode - }); - } - } else { - const baseNode = rootTree._findNode(currentPath); - if (baseNode && baseNode === node) { - // Node exists in base tree and is the same object (structural sharing) - // Neither node nor children are added - return; - } else if (baseNode && node.type === "directory") { - // Directory exists in both trees but may have been shallow-copied - // Check children individually - only process children that differ - for (const [name, child] of node.children) { - const childPath = currentPath ? path.join(currentPath, name) : name; - const baseChild = baseNode.children.get(name); - - if (!baseChild || baseChild !== child) { - // Child doesn't exist in base or is different - determine if added - if (!baseChild) { - // Entirely new - all descendants are added - traverse(child, childPath, true); - } else { - // Child was modified/replaced - recurse normally - traverse(child, childPath, false); - } - } - // If baseChild === child, skip it (shared) - } - return; // Don't continue with normal traversal - } else if (!baseNode && node.type === "resource") { - // Resource doesn't exist in base tree - it's added - added.push({ - path: currentPath, - integrity: node.integrity, - size: node.size, - lastModified: node.lastModified, - inode: node.inode - }); - return; - } else if (!baseNode && node.type === "directory") { - // Directory doesn't exist in base tree - all children are added - implicitlyAdded = true; - } - } - - if (node.type === "directory") { - for (const [name, child] of node.children) { - const childPath = currentPath ? path.join(currentPath, name) : name; - traverse(child, childPath, implicitlyAdded); - } - } - }; - traverse(this.root, "/"); - return added; - } } diff --git a/packages/project/lib/build/cache/index/SharedHashTree.js b/packages/project/lib/build/cache/index/SharedHashTree.js index 153b12b5d5c..abea227cd5b 100644 --- a/packages/project/lib/build/cache/index/SharedHashTree.js +++ b/packages/project/lib/build/cache/index/SharedHashTree.js @@ -1,3 +1,4 @@ +import path from "node:path/posix"; import HashTree from "./HashTree.js"; import TreeNode from "./TreeNode.js"; @@ -101,6 +102,82 @@ export default class SharedHashTree extends HashTree { return derived; } + /** + * For a tree derived from a base tree, get the list of resource nodes + * that were added compared to the base tree. + * + * @param {HashTree} rootTree - The base tree to compare against + * @returns {Array} + * Array of added resource metadata + */ + getAddedResources(rootTree) { + const added = []; + + const traverse = (node, currentPath, implicitlyAdded = false) => { + if (implicitlyAdded) { + // We're in a subtree that's entirely new - add all resources + if (node.type === "resource") { + added.push({ + path: currentPath, + integrity: node.integrity, + size: node.size, + lastModified: node.lastModified, + inode: node.inode + }); + } + } else { + const baseNode = rootTree._findNode(currentPath); + if (baseNode && baseNode === node) { + // Node exists in base tree and is the same object (structural sharing) + // Neither node nor children are added + return; + } else if (baseNode && node.type === "directory") { + // Directory exists in both trees but may have been shallow-copied + // Check children individually - only process children that differ + for (const [name, child] of node.children) { + const childPath = currentPath ? path.join(currentPath, name) : name; + const baseChild = baseNode.children.get(name); + + if (!baseChild || baseChild !== child) { + // Child doesn't exist in base or is different - determine if added + if (!baseChild) { + // Entirely new - all descendants are added + traverse(child, childPath, true); + } else { + // Child was modified/replaced - recurse normally + traverse(child, childPath, false); + } + } + // If baseChild === child, skip it (shared) + } + return; // Don't continue with normal traversal + } else if (!baseNode && node.type === "resource") { + // Resource doesn't exist in base tree - it's added + added.push({ + path: currentPath, + integrity: node.integrity, + size: node.size, + lastModified: node.lastModified, + inode: node.inode + }); + return; + } else if (!baseNode && node.type === "directory") { + // Directory doesn't exist in base tree - all children are added + implicitlyAdded = true; + } + } + + if (node.type === "directory") { + for (const [name, child] of node.children) { + const childPath = currentPath ? path.join(currentPath, name) : name; + traverse(child, childPath, implicitlyAdded); + } + } + }; + traverse(this.root, "/"); + return added; + } + /** * Deserialize tree from JSON * diff --git a/packages/project/test/lib/build/cache/ResourceRequestGraph.js b/packages/project/test/lib/build/cache/ResourceRequestGraph.js index b705c96625c..36ee2387c4d 100644 --- a/packages/project/test/lib/build/cache/ResourceRequestGraph.js +++ b/packages/project/test/lib/build/cache/ResourceRequestGraph.js @@ -14,18 +14,6 @@ test("Request: Create patterns request", (t) => { t.deepEqual(request.value, ["*.js", "*.css"]); }); -test("Request: Create dep-path request", (t) => { - const request = new Request("dep-path", "dependency/file.js"); - t.is(request.type, "dep-path"); - t.is(request.value, "dependency/file.js"); -}); - -test("Request: Create dep-patterns request", (t) => { - const request = new Request("dep-patterns", ["dep/*.js"]); - t.is(request.type, "dep-patterns"); - t.deepEqual(request.value, ["dep/*.js"]); -}); - test("Request: Reject invalid type", (t) => { const error = t.throws(() => { new Request("invalid-type", "value"); @@ -40,13 +28,6 @@ test("Request: Reject non-string value for path type", (t) => { t.is(error.message, "Request type 'path' requires value to be a string"); }); -test("Request: Reject non-string value for dep-path type", (t) => { - const error = t.throws(() => { - new Request("dep-path", ["array", "value"]); - }, {instanceOf: Error}); - t.is(error.message, "Request type 'dep-path' requires value to be a string"); -}); - test("Request: toKey with string value", (t) => { const request = new Request("path", "a.js"); t.is(request.toKey(), "path:a.js"); @@ -75,12 +56,6 @@ test("Request: equals returns true for identical requests", (t) => { t.true(req1.equals(req2)); }); -test("Request: equals returns false for different types", (t) => { - const req1 = new Request("path", "a.js"); - const req2 = new Request("dep-path", "a.js"); - t.false(req1.equals(req2)); -}); - test("Request: equals returns false for different values", (t) => { const req1 = new Request("path", "a.js"); const req2 = new Request("path", "b.js"); @@ -484,18 +459,16 @@ test("ResourceRequestGraph: Handles different request types", (t) => { const set1 = [ new Request("path", "a.js"), new Request("patterns", ["*.js"]), - new Request("dep-path", "dep/file.js"), - new Request("dep-patterns", ["dep/*.js"]) ]; const nodeId = graph.addRequestSet(set1); const node = graph.getNode(nodeId); const materialized = node.getMaterializedRequests(graph); - t.is(materialized.length, 4); + t.is(materialized.length, 2); const types = materialized.map((r) => r.type).sort(); - t.deepEqual(types, ["dep-path", "dep-patterns", "path", "patterns"]); + t.deepEqual(types, ["path", "patterns"]); }); test("ResourceRequestGraph: Complex parent hierarchy", (t) => { diff --git a/packages/project/test/lib/build/cache/index/HashTree.js b/packages/project/test/lib/build/cache/index/HashTree.js index 7617852893c..aa462840b69 100644 --- a/packages/project/test/lib/build/cache/index/HashTree.js +++ b/packages/project/test/lib/build/cache/index/HashTree.js @@ -502,227 +502,3 @@ test("removeResources - cleans up deeply nested empty directories", async (t) => t.truthy(tree._findNode("a"), "Directory a should still exist (has sibling.js)"); t.truthy(tree.hasPath("a/sibling.js"), "Sibling file should still exist"); }); - -test("deriveTree - copies only modified directories (copy-on-write)", (t) => { - const tree1 = new HashTree([ - {path: "shared/a.js", integrity: "hash-a"}, - {path: "shared/b.js", integrity: "hash-b"} - ]); - - // Derive a new tree (should share structure per design goal) - const tree2 = tree1.deriveTree([]); - - // Check if they share the "shared" directory node initially - const dir1Before = tree1.root.children.get("shared"); - const dir2Before = tree2.root.children.get("shared"); - - t.is(dir1Before, dir2Before, "Should share same directory node after deriveTree"); - - // Now insert into tree2 via the intended API (not directly) - tree2._insertResourceWithSharing("shared/c.js", {integrity: "hash-c"}); - - // Check what happened - const dir1After = tree1.root.children.get("shared"); - const dir2After = tree2.root.children.get("shared"); - - // EXPECTED BEHAVIOR (per copy-on-write): - // - Tree2 should copy "shared" directory to add "c.js" without affecting tree1 - // - dir2After !== dir1After (tree2 has its own copy) - // - dir1After === dir1Before (tree1 unchanged) - - t.is(dir1After, dir1Before, "Tree1 should be unaffected"); - t.not(dir2After, dir1After, "Tree2 should have its own copy after modification"); -}); - -test("deriveTree - preserves structural sharing for unmodified paths", (t) => { - const tree1 = new HashTree([ - {path: "shared/nested/deep/a.js", integrity: "hash-a"}, - {path: "other/b.js", integrity: "hash-b"} - ]); - - // Derive tree and add to "other" directory - const tree2 = tree1.deriveTree([]); - tree2._insertResourceWithSharing("other/c.js", {integrity: "hash-c"}); - - // The "shared" directory should still be shared (not copied) - // because we didn't modify it - const sharedDir1 = tree1.root.children.get("shared"); - const sharedDir2 = tree2.root.children.get("shared"); - - t.is(sharedDir1, sharedDir2, - "Unmodified 'shared' directory should remain shared between trees"); - - // But "other" should be copied (we modified it) - const otherDir1 = tree1.root.children.get("other"); - const otherDir2 = tree2.root.children.get("other"); - - t.not(otherDir1, otherDir2, - "Modified 'other' directory should be copied in tree2"); - - // Verify tree1 wasn't affected - t.false(tree1.hasPath("other/c.js"), "Tree1 should not have c.js"); - t.true(tree2.hasPath("other/c.js"), "Tree2 should have c.js"); -}); - -test("deriveTree - changes propagate to derived trees (shared view)", async (t) => { - const tree1 = new HashTree([ - {path: "shared/a.js", integrity: "hash-a", lastModified: 1000, size: 100} - ]); - - // Create derived tree - it's a view on the same data, not an independent copy - const tree2 = tree1.deriveTree([ - {path: "unique/b.js", integrity: "hash-b"} - ]); - - // Get reference to shared directory in both trees - const sharedDir1 = tree1.root.children.get("shared"); - const sharedDir2 = tree2.root.children.get("shared"); - - // By design: They SHOULD share the same node reference - t.is(sharedDir1, sharedDir2, "Trees share directory nodes (intentional design)"); - - // When tree1 is updated, tree2 sees the change (filtered view behavior) - const indexTimestamp = tree1.getIndexTimestamp(); - await tree1.upsertResources([ - createMockResource("shared/a.js", "new-hash-a", indexTimestamp + 1, 101, 1) - ]); - - // Both trees see the update as per design - const node1 = tree1.root.children.get("shared").children.get("a.js"); - const node2 = tree2.root.children.get("shared").children.get("a.js"); - - t.is(node1, node2, "Same resource node (shared reference)"); - t.is(node1.integrity, "new-hash-a", "Tree1 sees update"); - t.is(node2.integrity, "new-hash-a", "Tree2 also sees update (intentional)"); - - // This is the intended behavior: derived trees are views, not snapshots - // Tree2 filters which resources it exposes, but underlying data is shared -}); - -// ============================================================================ -// getAddedResources Tests -// ============================================================================ - -test("getAddedResources - returns empty array when no resources added", (t) => { - const baseTree = new HashTree([ - {path: "a.js", integrity: "hash-a"}, - {path: "b.js", integrity: "hash-b"} - ]); - - const derivedTree = baseTree.deriveTree([]); - - const added = derivedTree.getAddedResources(baseTree); - - t.deepEqual(added, [], "Should return empty array when no resources added"); -}); - -test("getAddedResources - returns added resources from derived tree", (t) => { - const baseTree = new HashTree([ - {path: "a.js", integrity: "hash-a"}, - {path: "b.js", integrity: "hash-b"} - ]); - - const derivedTree = baseTree.deriveTree([ - {path: "c.js", integrity: "hash-c", size: 100, lastModified: 1000, inode: 1}, - {path: "d.js", integrity: "hash-d", size: 200, lastModified: 2000, inode: 2} - ]); - - const added = derivedTree.getAddedResources(baseTree); - - t.is(added.length, 2, "Should return 2 added resources"); - t.deepEqual(added, [ - {path: "/c.js", integrity: "hash-c", size: 100, lastModified: 1000, inode: 1}, - {path: "/d.js", integrity: "hash-d", size: 200, lastModified: 2000, inode: 2} - ], "Should return correct added resources with metadata"); -}); - -test("getAddedResources - handles nested directory additions", (t) => { - const baseTree = new HashTree([ - {path: "root/a.js", integrity: "hash-a"} - ]); - - const derivedTree = baseTree.deriveTree([ - {path: "root/nested/b.js", integrity: "hash-b", size: 100, lastModified: 1000, inode: 1}, - {path: "root/nested/c.js", integrity: "hash-c", size: 200, lastModified: 2000, inode: 2} - ]); - - const added = derivedTree.getAddedResources(baseTree); - - t.is(added.length, 2, "Should return 2 added resources"); - t.true(added.some((r) => r.path === "/root/nested/b.js"), "Should include nested b.js"); - t.true(added.some((r) => r.path === "/root/nested/c.js"), "Should include nested c.js"); -}); - -test("getAddedResources - handles new directory with multiple resources", (t) => { - const baseTree = new HashTree([ - {path: "src/a.js", integrity: "hash-a"} - ]); - - const derivedTree = baseTree.deriveTree([ - {path: "lib/b.js", integrity: "hash-b", size: 100, lastModified: 1000, inode: 1}, - {path: "lib/c.js", integrity: "hash-c", size: 200, lastModified: 2000, inode: 2}, - {path: "lib/nested/d.js", integrity: "hash-d", size: 300, lastModified: 3000, inode: 3} - ]); - - const added = derivedTree.getAddedResources(baseTree); - - t.is(added.length, 3, "Should return 3 added resources"); - t.true(added.some((r) => r.path === "/lib/b.js"), "Should include lib/b.js"); - t.true(added.some((r) => r.path === "/lib/c.js"), "Should include lib/c.js"); - t.true(added.some((r) => r.path === "/lib/nested/d.js"), "Should include nested resource"); -}); - -test("getAddedResources - preserves metadata for added resources", (t) => { - const baseTree = new HashTree([ - {path: "a.js", integrity: "hash-a"} - ]); - - const derivedTree = baseTree.deriveTree([ - {path: "b.js", integrity: "hash-b", size: 12345, lastModified: 9999, inode: 7777} - ]); - - const added = derivedTree.getAddedResources(baseTree); - - t.is(added.length, 1, "Should return 1 added resource"); - t.is(added[0].path, "/b.js", "Should have correct path"); - t.is(added[0].integrity, "hash-b", "Should preserve integrity"); - t.is(added[0].size, 12345, "Should preserve size"); - t.is(added[0].lastModified, 9999, "Should preserve lastModified"); - t.is(added[0].inode, 7777, "Should preserve inode"); -}); - -test("getAddedResources - handles mixed shared and added resources", (t) => { - const baseTree = new HashTree([ - {path: "shared/a.js", integrity: "hash-a"}, - {path: "shared/b.js", integrity: "hash-b"} - ]); - - const derivedTree = baseTree.deriveTree([ - {path: "shared/c.js", integrity: "hash-c", size: 100, lastModified: 1000, inode: 1}, - {path: "unique/d.js", integrity: "hash-d", size: 200, lastModified: 2000, inode: 2} - ]); - - const added = derivedTree.getAddedResources(baseTree); - - t.is(added.length, 2, "Should return 2 added resources"); - t.true(added.some((r) => r.path === "/shared/c.js"), "Should include c.js in shared dir"); - t.true(added.some((r) => r.path === "/unique/d.js"), "Should include d.js in unique dir"); - t.false(added.some((r) => r.path === "/shared/a.js"), "Should not include shared a.js"); - t.false(added.some((r) => r.path === "/shared/b.js"), "Should not include shared b.js"); -}); - -test("getAddedResources - handles deeply nested additions", (t) => { - const baseTree = new HashTree([ - {path: "a.js", integrity: "hash-a"} - ]); - - const derivedTree = baseTree.deriveTree([ - {path: "dir1/dir2/dir3/dir4/deep.js", integrity: "hash-deep", size: 100, lastModified: 1000, inode: 1} - ]); - - const added = derivedTree.getAddedResources(baseTree); - - t.is(added.length, 1, "Should return 1 added resource"); - t.is(added[0].path, "/dir1/dir2/dir3/dir4/deep.js", "Should have correct deeply nested path"); - t.is(added[0].integrity, "hash-deep", "Should preserve integrity"); -}); diff --git a/packages/project/test/lib/build/cache/index/SharedHashTree.js b/packages/project/test/lib/build/cache/index/SharedHashTree.js index b5b265d78ee..78a7adfbe94 100644 --- a/packages/project/test/lib/build/cache/index/SharedHashTree.js +++ b/packages/project/test/lib/build/cache/index/SharedHashTree.js @@ -183,6 +183,243 @@ test("SharedHashTree - deriveTree with empty resources", (t) => { t.true(tree2 instanceof SharedHashTree, "Should be SharedHashTree"); }); +test("deriveTree - copies only modified directories (copy-on-write)", (t) => { + const registry = new TreeRegistry(); + const tree1 = new SharedHashTree([ + {path: "shared/a.js", integrity: "hash-a"}, + {path: "shared/b.js", integrity: "hash-b"} + ], registry); + + // Derive a new tree (should share structure per design goal) + const tree2 = tree1.deriveTree([]); + + // Check if they share the "shared" directory node initially + const dir1Before = tree1.root.children.get("shared"); + const dir2Before = tree2.root.children.get("shared"); + + t.is(dir1Before, dir2Before, "Should share same directory node after deriveTree"); + + // Now insert into tree2 via the intended API (not directly) + tree2._insertResourceWithSharing("shared/c.js", {integrity: "hash-c"}); + + // Check what happened + const dir1After = tree1.root.children.get("shared"); + const dir2After = tree2.root.children.get("shared"); + + // EXPECTED BEHAVIOR (per copy-on-write): + // - Tree2 should copy "shared" directory to add "c.js" without affecting tree1 + // - dir2After !== dir1After (tree2 has its own copy) + // - dir1After === dir1Before (tree1 unchanged) + + t.is(dir1After, dir1Before, "Tree1 should be unaffected"); + t.not(dir2After, dir1After, "Tree2 should have its own copy after modification"); +}); + +test("deriveTree - preserves structural sharing for unmodified paths", (t) => { + const registry = new TreeRegistry(); + const tree1 = new SharedHashTree([ + {path: "shared/nested/deep/a.js", integrity: "hash-a"}, + {path: "other/b.js", integrity: "hash-b"} + ], registry); + + // Derive tree and add to "other" directory + const tree2 = tree1.deriveTree([]); + tree2._insertResourceWithSharing("other/c.js", {integrity: "hash-c"}); + + // The "shared" directory should still be shared (not copied) + // because we didn't modify it + const sharedDir1 = tree1.root.children.get("shared"); + const sharedDir2 = tree2.root.children.get("shared"); + + t.is(sharedDir1, sharedDir2, + "Unmodified 'shared' directory should remain shared between trees"); + + // But "other" should be copied (we modified it) + const otherDir1 = tree1.root.children.get("other"); + const otherDir2 = tree2.root.children.get("other"); + + t.not(otherDir1, otherDir2, + "Modified 'other' directory should be copied in tree2"); + + // Verify tree1 wasn't affected + t.false(tree1.hasPath("other/c.js"), "Tree1 should not have c.js"); + t.true(tree2.hasPath("other/c.js"), "Tree2 should have c.js"); +}); + +test("deriveTree - changes propagate to derived trees (shared view)", async (t) => { + const registry = new TreeRegistry(); + const tree1 = new SharedHashTree([ + {path: "shared/a.js", integrity: "hash-a", lastModified: 1000, size: 100} + ], registry); + + // Create derived tree - it's a view on the same data, not an independent copy + const tree2 = tree1.deriveTree([ + {path: "unique/b.js", integrity: "hash-b"} + ]); + + // Get reference to shared directory in both trees + const sharedDir1 = tree1.root.children.get("shared"); + const sharedDir2 = tree2.root.children.get("shared"); + + // By design: They SHOULD share the same node reference + t.is(sharedDir1, sharedDir2, "Trees share directory nodes (intentional design)"); + + // When tree1 is updated, tree2 sees the change (filtered view behavior) + const indexTimestamp = tree1.getIndexTimestamp(); + await tree1.upsertResources([ + createMockResource("shared/a.js", "new-hash-a", indexTimestamp + 1, 101, 1) + ]); + await registry.flush(); + + // Both trees see the update as per design + const node1 = tree1.root.children.get("shared").children.get("a.js"); + const node2 = tree2.root.children.get("shared").children.get("a.js"); + + t.is(node1, node2, "Same resource node (shared reference)"); + t.is(node1.integrity, "new-hash-a", "Tree1 sees update"); + t.is(node2.integrity, "new-hash-a", "Tree2 also sees update (intentional)"); + + // This is the intended behavior: derived trees are views, not snapshots + // Tree2 filters which resources it exposes, but underlying data is shared +}); + + +// ============================================================================ +// getAddedResources Tests +// ============================================================================ + +test("getAddedResources - returns empty array when no resources added", (t) => { + const registry = new TreeRegistry(); + const baseTree = new SharedHashTree([ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"} + ], registry); + + const derivedTree = baseTree.deriveTree([]); + + const added = derivedTree.getAddedResources(baseTree); + + t.deepEqual(added, [], "Should return empty array when no resources added"); +}); + +test("getAddedResources - returns added resources from derived tree", (t) => { + const registry = new TreeRegistry(); + const baseTree = new SharedHashTree([ + {path: "a.js", integrity: "hash-a"}, + {path: "b.js", integrity: "hash-b"} + ], registry); + + const derivedTree = baseTree.deriveTree([ + {path: "c.js", integrity: "hash-c", size: 100, lastModified: 1000, inode: 1}, + {path: "d.js", integrity: "hash-d", size: 200, lastModified: 2000, inode: 2} + ]); + + const added = derivedTree.getAddedResources(baseTree); + + t.is(added.length, 2, "Should return 2 added resources"); + t.deepEqual(added, [ + {path: "/c.js", integrity: "hash-c", size: 100, lastModified: 1000, inode: 1}, + {path: "/d.js", integrity: "hash-d", size: 200, lastModified: 2000, inode: 2} + ], "Should return correct added resources with metadata"); +}); + +test("getAddedResources - handles nested directory additions", (t) => { + const registry = new TreeRegistry(); + const baseTree = new SharedHashTree([ + {path: "root/a.js", integrity: "hash-a"} + ], registry); + + const derivedTree = baseTree.deriveTree([ + {path: "root/nested/b.js", integrity: "hash-b", size: 100, lastModified: 1000, inode: 1}, + {path: "root/nested/c.js", integrity: "hash-c", size: 200, lastModified: 2000, inode: 2} + ]); + + const added = derivedTree.getAddedResources(baseTree); + + t.is(added.length, 2, "Should return 2 added resources"); + t.true(added.some((r) => r.path === "/root/nested/b.js"), "Should include nested b.js"); + t.true(added.some((r) => r.path === "/root/nested/c.js"), "Should include nested c.js"); +}); + +test("getAddedResources - handles new directory with multiple resources", (t) => { + const registry = new TreeRegistry(); + const baseTree = new SharedHashTree([ + {path: "src/a.js", integrity: "hash-a"} + ], registry); + + const derivedTree = baseTree.deriveTree([ + {path: "lib/b.js", integrity: "hash-b", size: 100, lastModified: 1000, inode: 1}, + {path: "lib/c.js", integrity: "hash-c", size: 200, lastModified: 2000, inode: 2}, + {path: "lib/nested/d.js", integrity: "hash-d", size: 300, lastModified: 3000, inode: 3} + ]); + + const added = derivedTree.getAddedResources(baseTree); + + t.is(added.length, 3, "Should return 3 added resources"); + t.true(added.some((r) => r.path === "/lib/b.js"), "Should include lib/b.js"); + t.true(added.some((r) => r.path === "/lib/c.js"), "Should include lib/c.js"); + t.true(added.some((r) => r.path === "/lib/nested/d.js"), "Should include nested resource"); +}); + +test("getAddedResources - preserves metadata for added resources", (t) => { + const registry = new TreeRegistry(); + const baseTree = new SharedHashTree([ + {path: "a.js", integrity: "hash-a"} + ], registry); + + const derivedTree = baseTree.deriveTree([ + {path: "b.js", integrity: "hash-b", size: 12345, lastModified: 9999, inode: 7777} + ]); + + const added = derivedTree.getAddedResources(baseTree); + + t.is(added.length, 1, "Should return 1 added resource"); + t.is(added[0].path, "/b.js", "Should have correct path"); + t.is(added[0].integrity, "hash-b", "Should preserve integrity"); + t.is(added[0].size, 12345, "Should preserve size"); + t.is(added[0].lastModified, 9999, "Should preserve lastModified"); + t.is(added[0].inode, 7777, "Should preserve inode"); +}); + +test("getAddedResources - handles mixed shared and added resources", (t) => { + const registry = new TreeRegistry(); + const baseTree = new SharedHashTree([ + {path: "shared/a.js", integrity: "hash-a"}, + {path: "shared/b.js", integrity: "hash-b"} + ], registry); + + const derivedTree = baseTree.deriveTree([ + {path: "shared/c.js", integrity: "hash-c", size: 100, lastModified: 1000, inode: 1}, + {path: "unique/d.js", integrity: "hash-d", size: 200, lastModified: 2000, inode: 2} + ]); + + const added = derivedTree.getAddedResources(baseTree); + + t.is(added.length, 2, "Should return 2 added resources"); + t.true(added.some((r) => r.path === "/shared/c.js"), "Should include c.js in shared dir"); + t.true(added.some((r) => r.path === "/unique/d.js"), "Should include d.js in unique dir"); + t.false(added.some((r) => r.path === "/shared/a.js"), "Should not include shared a.js"); + t.false(added.some((r) => r.path === "/shared/b.js"), "Should not include shared b.js"); +}); + +test("getAddedResources - handles deeply nested additions", (t) => { + const registry = new TreeRegistry(); + const baseTree = new SharedHashTree([ + {path: "a.js", integrity: "hash-a"} + ], registry); + + const derivedTree = baseTree.deriveTree([ + {path: "dir1/dir2/dir3/dir4/deep.js", integrity: "hash-deep", size: 100, lastModified: 1000, inode: 1} + ]); + + const added = derivedTree.getAddedResources(baseTree); + + t.is(added.length, 1, "Should return 1 added resource"); + t.is(added[0].path, "/dir1/dir2/dir3/dir4/deep.js", "Should have correct deeply nested path"); + t.is(added[0].integrity, "hash-deep", "Should preserve integrity"); +}); + + // ============================================================================ // SharedHashTree with Registry Integration Tests // ============================================================================ From 267907f62fea8ed829eb39ae6edd606cf93c2031 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Fri, 16 Jan 2026 15:31:14 +0100 Subject: [PATCH 092/110] refactor(project): Fix handling cache handling of removed resources --- .../lib/build/cache/ProjectBuildCache.js | 23 +++++++++---------- .../lib/build/cache/ResourceRequestManager.js | 6 ++++- 2 files changed, 16 insertions(+), 13 deletions(-) diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index e7605309bd7..e7dab3246dd 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -680,19 +680,18 @@ export default class ProjectBuildCache { async #updateSourceIndex(changedResourcePaths) { const sourceReader = this.#project.getSourceReader(); - const resources = await Promise.all(changedResourcePaths.map((resourcePath) => { - return sourceReader.byPath(resourcePath); - })); - const removedResources = []; - const foundResources = resources.filter((resource) => { - if (!resource) { - removedResources.push(resource); - return false; + const resources = []; + const removedResourcePaths = []; + await Promise.all(changedResourcePaths.map(async (resourcePath) => { + const resource = await sourceReader.byPath(resourcePath); + if (resource) { + resources.push(resource); + } else { + removedResourcePaths.push(resourcePath); } - return true; - }); - const {removed} = await this.#sourceIndex.removeResources(removedResources); - const {added, updated} = await this.#sourceIndex.upsertResources(foundResources, Date.now()); + })); + const {removed} = await this.#sourceIndex.removeResources(removedResourcePaths); + const {added, updated} = await this.#sourceIndex.upsertResources(resources, Date.now()); if (removed.length || added.length || updated.length) { log.verbose(`Source resource index for project ${this.#project.getName()} updated: ` + diff --git a/packages/project/lib/build/cache/ResourceRequestManager.js b/packages/project/lib/build/cache/ResourceRequestManager.js index 4ae8880ce0a..19e3eb64a41 100644 --- a/packages/project/lib/build/cache/ResourceRequestManager.js +++ b/packages/project/lib/build/cache/ResourceRequestManager.js @@ -336,7 +336,11 @@ class ResourceRequestManager { let changedPaths; if (diff) { const {added, updated, removed} = diff; - changedPaths = Array.from(new Set([...added, ...updated, ...removed])); + if (removed.length) { + // Cannot use differential build if a resource has been removed + continue; + } + changedPaths = Array.from(new Set([...added, ...updated])); } else { changedPaths = []; } From 10c55c635108066cf3007ff04f8c5ffba2d28ccd Mon Sep 17 00:00:00 2001 From: Max Reichmann Date: Tue, 20 Jan 2026 10:59:38 +0100 Subject: [PATCH 093/110] test(project): Add cases for theme.library.e with seperate less files --- .../lib/build/ProjectBuilder.integration.js | 73 +++++++++++++++++-- 1 file changed, 66 insertions(+), 7 deletions(-) diff --git a/packages/project/test/lib/build/ProjectBuilder.integration.js b/packages/project/test/lib/build/ProjectBuilder.integration.js index 6086e2e5e2c..0aab8ebbaf0 100644 --- a/packages/project/test/lib/build/ProjectBuilder.integration.js +++ b/packages/project/test/lib/build/ProjectBuilder.integration.js @@ -222,9 +222,9 @@ test.serial("Build theme.library.e project multiple times", async (t) => { }); // Change a source file in theme.library.e - const changedFilePath = `${fixtureTester.fixturePath}/src/theme/library/e/themes/my_theme/library.source.less`; - await fs.appendFile(changedFilePath, `\n.someNewClass {\n\tcolor: red;\n}\n`); - + const librarySourceFilePath = + `${fixtureTester.fixturePath}/src/theme/library/e/themes/my_theme/library.source.less`; + await fs.appendFile(librarySourceFilePath, `\n.someNewClass {\n\tcolor: red;\n}\n`); // #3 build (with cache, with changes) await fixtureTester.buildProject({ config: {destPath, cleanDest: true}, @@ -232,7 +232,6 @@ test.serial("Build theme.library.e project multiple times", async (t) => { projects: {"theme.library.e": {}} } }); - // Check whether the changed file is in the destPath const builtFileContent = await fs.readFile( `${destPath}/resources/theme/library/e/themes/my_theme/library.source.less`, {encoding: "utf8"} @@ -241,7 +240,7 @@ test.serial("Build theme.library.e project multiple times", async (t) => { builtFileContent.includes(`.someNewClass`), "Build dest contains changed file content" ); - // Check whether the updated copyright replacement took place + // Check whether the build output contains the new CSS rule const builtCssContent = await fs.readFile( `${destPath}/resources/theme/library/e/themes/my_theme/library.css`, {encoding: "utf8"} ); @@ -250,11 +249,71 @@ test.serial("Build theme.library.e project multiple times", async (t) => { "Build dest contains new rule in library.css" ); - // #4 build (with cache, no changes) + // Add a new less file and import it in library.source.less + await fs.writeFile(`${fixtureTester.fixturePath}/src/theme/library/e/themes/my_theme/newImportFile.less`, + `.someOtherNewClass {\n\tcolor: blue;\n}\n` + ); + await fs.appendFile(librarySourceFilePath, `\n@import "newImportFile.less";\n`); + // #4 build (with cache, with changes) await fixtureTester.buildProject({ config: {destPath, cleanDest: true}, assertions: { - projects: {} + projects: {"theme.library.e": {}}, + } + }); + // Check whether the build output contains the import to the new file + const builtCssContent2 = await fs.readFile( + `${destPath}/resources/theme/library/e/themes/my_theme/library.css`, {encoding: "utf8"} + ); + t.true( + builtCssContent2.includes(`.someOtherNewClass`), + "Build dest contains new rule in library.css" + ); + + // #5 build (with cache, no changes) + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true}, + assertions: { + projects: {}, + } + }); + + // Change content of new less file + await fs.writeFile(`${fixtureTester.fixturePath}/src/theme/library/e/themes/my_theme/newImportFile.less`, + `.someOtherNewClass {\n\tcolor: green;\n}\n` + ); + // #6 build (with cache, with changes) + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true}, + assertions: { + projects: {"theme.library.e": {}}, + } + }); + // Check whether the build output contains the changed content of the imported file + const builtCssContent3 = await fs.readFile( + `${destPath}/resources/theme/library/e/themes/my_theme/library.css`, {encoding: "utf8"} + ); + t.true( + builtCssContent3.includes(`.someOtherNewClass{color:green}`), + "Build dest contains new rule in library.css" + ); + + // Delete import of library.source.less + const librarySourceFileContent = (await fs.readFile(librarySourceFilePath)).toString(); + await fs.writeFile(librarySourceFilePath, + librarySourceFileContent.replace(`\n@import "newImportFile.less";\n`, "") + ); + // Change content of new less file again + await fs.writeFile(`${fixtureTester.fixturePath}/src/theme/library/e/themes/my_theme/newImportFile.less`, + `.someOtherNewClass {\n\tcolor: yellow;\n}\n` + ); + // #7 build (with cache, with changes) + await fixtureTester.buildProject({ + config: {destPath, cleanDest: true}, + assertions: { + projects: {"theme.library.e": { + skippedTasks: ["buildThemes"] + }}, } }); }); From 94d88292f21c4657ad37e807dc2483b028954eb9 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 20 Jan 2026 13:02:55 +0100 Subject: [PATCH 094/110] refactor(project): Update graph traversal --- packages/project/lib/graph/ProjectGraph.js | 81 +++ .../project/test/lib/graph/ProjectGraph.js | 540 ++++++++++++++++++ 2 files changed, 621 insertions(+) diff --git a/packages/project/lib/graph/ProjectGraph.js b/packages/project/lib/graph/ProjectGraph.js index 5a3b4576bcf..9e23647fee3 100644 --- a/packages/project/lib/graph/ProjectGraph.js +++ b/packages/project/lib/graph/ProjectGraph.js @@ -509,6 +509,87 @@ class ProjectGraph { })(); } + /** + * Generator function that traverses all dependencies of the given start project depth-first. + * Each dependency project is visited exactly once, and dependencies are fully explored + * before the dependent project is yielded (post-order traversal). + * In case a cycle is detected, an error is thrown. + * + * @public + * @generator + * @param {string|boolean} [startName] Name of the project to start the traversal at, + * or a boolean to set includeStartModule while using the root project as start. + * Defaults to the graph's root project. + * @param {boolean} [includeStartModule=false] Whether to include the start project itself in the results + * @yields {object} Object containing the project and its direct dependencies + * @yields {module:@ui5/project/specifications/Project} return.project The dependency project + * @yields {string[]} return.dependencies Array of direct dependency names for this project + * @throws {Error} If the start project cannot be found or if a cycle is detected + */ + * traverseDependenciesDepthFirst(startName, includeStartModule = false) { + if (typeof startName === "boolean") { + includeStartModule = startName; + startName = undefined; + } + if (!startName) { + startName = this._rootProjectName; + } else if (!this.getProject(startName)) { + throw new Error(`Failed to start graph traversal: Could not find project ${startName} in project graph`); + } + + const visited = Object.create(null); + const processing = Object.create(null); + + const traverse = function* (projectName, ancestors) { + this._checkCycle(ancestors, projectName); + + if (visited[projectName]) { + return; + } + + if (processing[projectName]) { + return; + } + + processing[projectName] = true; + const newAncestors = [...ancestors, projectName]; + const dependencies = this.getDependencies(projectName); + + for (const depName of dependencies) { + yield* traverse.call(this, depName, newAncestors); + } + + visited[projectName] = true; + processing[projectName] = false; + + if (includeStartModule || projectName !== startName) { + yield { + project: this.getProject(projectName), + dependencies + }; + } + }.bind(this); + + yield* traverse(startName, []); + } + + /** + * Generator function that traverses all projects that depend on the given start project. + * Traversal is breadth-first, visiting each dependent project exactly once. + * Projects are yielded in the order they are discovered as dependents. + * In case a cycle is detected, an error is thrown. + * + * @public + * @generator + * @param {string|boolean} [startName] Name of the project to start the traversal at, + * or a boolean to set includeStartModule while using the root project as start. + * Defaults to the graph's root project. + * @param {boolean} [includeStartModule=false] Whether to include the start project itself in the results + * @yields {object} Object containing the dependent project and its dependents + * @yields {module:@ui5/project/specifications/Project} return.project The dependent project + * @yields {string[]} return.dependents Array of project names that depend on this project + * @throws {Error} If the start project cannot be found or if a cycle is detected + */ * traverseDependents(startName, includeStartModule = false) { if (typeof startName === "boolean") { includeStartModule = startName; diff --git a/packages/project/test/lib/graph/ProjectGraph.js b/packages/project/test/lib/graph/ProjectGraph.js index 46295f96723..fdababc228c 100644 --- a/packages/project/test/lib/graph/ProjectGraph.js +++ b/packages/project/test/lib/graph/ProjectGraph.js @@ -1152,6 +1152,546 @@ test("traverseDepthFirst: Dependency declaration order is followed", async (t) = ]); }); +test("traverseDependenciesDepthFirst: Basic traversal without including start module", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + + graph.declareDependency("library.a", "library.b"); + graph.declareDependency("library.b", "library.c"); + + const results = []; + for (const result of graph.traverseDependenciesDepthFirst("library.a")) { + results.push(result.project.getName()); + } + + t.deepEqual(results, [ + "library.c", + "library.b" + ], "Should traverse dependencies in depth-first order, excluding start module"); +}); + +test("traverseDependenciesDepthFirst: Basic traversal including start module", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + + graph.declareDependency("library.a", "library.b"); + graph.declareDependency("library.b", "library.c"); + + const results = []; + for (const result of graph.traverseDependenciesDepthFirst("library.a", true)) { + results.push(result.project.getName()); + } + + t.deepEqual(results, [ + "library.c", + "library.b", + "library.a" + ], "Should traverse dependencies in depth-first order, including start module"); +}); + +test("traverseDependenciesDepthFirst: Using boolean as first parameter", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + + graph.declareDependency("library.a", "library.b"); + graph.declareDependency("library.b", "library.c"); + + const results = []; + for (const result of graph.traverseDependenciesDepthFirst(true)) { + results.push(result.project.getName()); + } + + t.deepEqual(results, [ + "library.c", + "library.b", + "library.a" + ], "Should traverse from root and include root when boolean is passed as first parameter"); +}); + +test("traverseDependenciesDepthFirst: No dependencies", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + + const results = []; + for (const result of graph.traverseDependenciesDepthFirst("library.a")) { + results.push(result.project.getName()); + } + + t.deepEqual(results, [], "Should return empty results when project has no dependencies"); +}); + +test("traverseDependenciesDepthFirst: Diamond dependency structure", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + graph.addProject(await createProject("library.d")); + + graph.declareDependency("library.a", "library.b"); + graph.declareDependency("library.a", "library.c"); + graph.declareDependency("library.b", "library.d"); + graph.declareDependency("library.c", "library.d"); + + const results = []; + for (const result of graph.traverseDependenciesDepthFirst("library.a")) { + results.push(result.project.getName()); + } + + t.deepEqual(results, [ + "library.d", + "library.b", + "library.c" + ], "Should visit library.d once, then library.b, then library.c"); +}); + +test("traverseDependenciesDepthFirst: Complex dependency chain", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + graph.addProject(await createProject("library.d")); + graph.addProject(await createProject("library.e")); + + graph.declareDependency("library.a", "library.b"); + graph.declareDependency("library.b", "library.c"); + graph.declareDependency("library.c", "library.d"); + graph.declareDependency("library.d", "library.e"); + + const results = []; + for (const result of graph.traverseDependenciesDepthFirst("library.a")) { + results.push(result.project.getName()); + } + + t.deepEqual(results, [ + "library.e", + "library.d", + "library.c", + "library.b" + ], "Should traverse entire dependency chain in depth-first order"); +}); + +test("traverseDependenciesDepthFirst: No project visited twice", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + graph.addProject(await createProject("library.d")); + + graph.declareDependency("library.a", "library.b"); + graph.declareDependency("library.a", "library.c"); + graph.declareDependency("library.b", "library.d"); + graph.declareDependency("library.c", "library.d"); + + const results = []; + for (const result of graph.traverseDependenciesDepthFirst("library.a")) { + results.push(result.project.getName()); + } + + // library.d should appear only once + const dCount = results.filter(name => name === "library.d").length; + t.is(dCount, 1, "library.d should be visited exactly once"); + t.is(results.length, 3, "Should visit exactly 3 projects"); +}); + +test("traverseDependenciesDepthFirst: Can't find start node", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + + const error = t.throws(() => { + for (const result of graph.traverseDependenciesDepthFirst("library.nonexistent")) { + // Should not reach here + } + }); + t.is(error.message, + "Failed to start graph traversal: Could not find project library.nonexistent in project graph", + "Should throw with expected error message"); +}); + +test("traverseDependenciesDepthFirst: dependencies parameter", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + graph.addProject(await createProject("library.d")); + + graph.declareDependency("library.a", "library.b"); + graph.declareDependency("library.a", "library.c"); + graph.declareDependency("library.b", "library.d"); + + const results = []; + const dependencies = []; + for (const result of graph.traverseDependenciesDepthFirst("library.a")) { + results.push(result.project.getName()); + dependencies.push(result.dependencies); + } + + t.deepEqual(results, [ + "library.d", + "library.b", + "library.c" + ], "Should visit dependencies in depth-first order"); + + const dIndex = results.indexOf("library.d"); + const bIndex = results.indexOf("library.b"); + const cIndex = results.indexOf("library.c"); + + t.deepEqual(dependencies[dIndex], [], "library.d should have no dependencies"); + t.deepEqual(dependencies[bIndex], ["library.d"], "library.b should have library.d as dependency"); + t.deepEqual(dependencies[cIndex], [], "library.c should have no dependencies"); +}); + +test("traverseDependenciesDepthFirst: Detect cycle", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + + graph.declareDependency("library.a", "library.b"); + graph.declareDependency("library.b", "library.a"); + + const error = t.throws(() => { + for (const result of graph.traverseDependenciesDepthFirst("library.a")) { + // Should not complete iteration + } + }); + t.is(error.message, + "Detected cyclic dependency chain: *library.a* -> library.b -> *library.a*", + "Should throw with expected error message"); +}); + +test("traverseDependenciesDepthFirst: Dependency declaration order is followed", async (t) => { + const {ProjectGraph} = t.context; + const graph1 = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph1.addProject(await createProject("library.a")); + graph1.addProject(await createProject("library.b")); + graph1.addProject(await createProject("library.c")); + graph1.addProject(await createProject("library.d")); + + graph1.declareDependency("library.a", "library.b"); + graph1.declareDependency("library.a", "library.c"); + graph1.declareDependency("library.a", "library.d"); + + const results1 = []; + for (const result of graph1.traverseDependenciesDepthFirst("library.a")) { + results1.push(result.project.getName()); + } + + t.deepEqual(results1, [ + "library.b", + "library.c", + "library.d" + ], "First graph should visit in declaration order"); + + const graph2 = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph2.addProject(await createProject("library.a")); + graph2.addProject(await createProject("library.b")); + graph2.addProject(await createProject("library.c")); + graph2.addProject(await createProject("library.d")); + + graph2.declareDependency("library.a", "library.d"); + graph2.declareDependency("library.a", "library.c"); + graph2.declareDependency("library.a", "library.b"); + + const results2 = []; + for (const result of graph2.traverseDependenciesDepthFirst("library.a")) { + results2.push(result.project.getName()); + } + + t.deepEqual(results2, [ + "library.d", + "library.c", + "library.b" + ], "Second graph should visit in reverse declaration order"); +}); + +test("traverseDependents: Basic traversal without including start module", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + + graph.declareDependency("library.b", "library.c"); + graph.declareDependency("library.a", "library.b"); + + const results = []; + for (const result of graph.traverseDependents("library.c")) { + results.push(result.project.getName()); + } + + t.deepEqual(results, [ + "library.b", + "library.a" + ], "Should traverse dependents in correct order, excluding start module"); +}); + +test("traverseDependents: Basic traversal including start module", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + + graph.declareDependency("library.b", "library.c"); + graph.declareDependency("library.a", "library.b"); + + const results = []; + for (const result of graph.traverseDependents("library.c", true)) { + results.push(result.project.getName()); + } + + t.deepEqual(results, [ + "library.c", + "library.b", + "library.a" + ], "Should traverse dependents in correct order, including start module"); +}); + +test("traverseDependents: Using boolean as first parameter", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.c" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + + graph.declareDependency("library.a", "library.c"); + graph.declareDependency("library.b", "library.c"); + + const results = []; + for (const result of graph.traverseDependents(true)) { + results.push(result.project.getName()); + } + + t.deepEqual(results.sort(), [ + "library.a", + "library.b", + "library.c" + ].sort(), "Should traverse from root and include root when boolean is passed as first parameter"); +}); + +test("traverseDependents: No dependents", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + + graph.declareDependency("library.a", "library.b"); + + const results = []; + for (const result of graph.traverseDependents("library.a")) { + results.push(result.project.getName()); + } + + t.deepEqual(results, [], "Should return empty results when project has no dependents"); +}); + +test("traverseDependents: Multiple dependents", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + graph.addProject(await createProject("library.d")); + + graph.declareDependency("library.a", "library.d"); + graph.declareDependency("library.b", "library.d"); + graph.declareDependency("library.c", "library.d"); + + const results = []; + for (const result of graph.traverseDependents("library.d")) { + results.push(result.project.getName()); + } + + t.deepEqual(results.sort(), [ + "library.a", + "library.b", + "library.c" + ].sort(), "Should return all projects that depend on the target project"); +}); + +test("traverseDependents: Complex chain", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + graph.addProject(await createProject("library.d")); + graph.addProject(await createProject("library.e")); + + graph.declareDependency("library.a", "library.b"); + graph.declareDependency("library.b", "library.c"); + graph.declareDependency("library.c", "library.d"); + graph.declareDependency("library.d", "library.e"); + + const results = []; + for (const result of graph.traverseDependents("library.e")) { + results.push(result.project.getName()); + } + + t.deepEqual(results, [ + "library.d", + "library.c", + "library.b", + "library.a" + ], "Should traverse entire dependent chain"); +}); + +test("traverseDependents: No project visited twice", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + graph.addProject(await createProject("library.d")); + + graph.declareDependency("library.a", "library.c"); + graph.declareDependency("library.b", "library.c"); + graph.declareDependency("library.a", "library.d"); + graph.declareDependency("library.b", "library.d"); + graph.declareDependency("library.c", "library.d"); + + const results = []; + for (const result of graph.traverseDependents("library.d")) { + results.push(result.project.getName()); + } + + t.deepEqual(results.sort(), [ + "library.a", + "library.b", + "library.c" + ].sort(), "Should visit each project exactly once"); +}); + +test("traverseDependents: Can't find start node", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + + const error = t.throws(() => { + // Consume the generator to trigger the error + for (const result of graph.traverseDependents("library.nonexistent")) { + // Should not reach here + } + }); + t.is(error.message, + "Failed to start graph traversal: Could not find project library.nonexistent in project graph", + "Should throw with expected error message"); +}); + +test("traverseDependents: dependents parameter", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + graph.addProject(await createProject("library.c")); + graph.addProject(await createProject("library.d")); + + graph.declareDependency("library.a", "library.d"); + graph.declareDependency("library.b", "library.d"); + graph.declareDependency("library.b", "library.c"); + graph.declareDependency("library.c", "library.d"); + + const results = []; + const dependents = []; + for (const result of graph.traverseDependents("library.d")) { + results.push(result.project.getName()); + dependents.push(result.dependents); + } + + t.deepEqual(results.sort(), [ + "library.a", + "library.b", + "library.c" + ].sort(), "Should visit all dependents"); + + // Check that dependents information is provided correctly + const aIndex = results.indexOf("library.a"); + const bIndex = results.indexOf("library.b"); + const cIndex = results.indexOf("library.c"); + + t.deepEqual(dependents[aIndex], [], "library.a should have no dependents"); + t.deepEqual(dependents[bIndex], [], "library.b should have no dependents"); + t.deepEqual(dependents[cIndex], ["library.b"], "library.c should have library.b as dependent"); +}); + +test("traverseDependents: Detect cycle", async (t) => { + const {ProjectGraph} = t.context; + const graph = new ProjectGraph({ + rootProjectName: "library.a" + }); + graph.addProject(await createProject("library.a")); + graph.addProject(await createProject("library.b")); + + graph.declareDependency("library.a", "library.b"); + graph.declareDependency("library.b", "library.a"); + + const error = t.throws(() => { + for (const result of graph.traverseDependents("library.a")) { + // Should not complete iteration + } + }); + t.is(error.message, + "Detected cyclic dependency chain: *library.a* -> library.b -> *library.a*", + "Should throw with expected error message"); +}); + test("join", async (t) => { const {ProjectGraph} = t.context; const graph1 = new ProjectGraph({ From 83919bfe4d88a5a24d5d0b22309a9952b124a21b Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Fri, 16 Jan 2026 16:42:14 +0100 Subject: [PATCH 095/110] refactor(project): Add BuildServer and BuildReader --- packages/project/lib/build/BuildReader.js | 92 +++++ packages/project/lib/build/BuildServer.js | 194 ++++++++++ packages/project/lib/build/ProjectBuilder.js | 330 +++++++++--------- .../project/lib/build/helpers/BuildContext.js | 71 ++-- .../lib/build/helpers/ProjectBuildContext.js | 4 +- .../project/lib/build/helpers/WatchHandler.js | 67 +--- .../lib/build/helpers/composeProjectList.js | 14 +- packages/project/lib/graph/ProjectGraph.js | 44 ++- .../project/lib/specifications/Project.js | 2 +- .../project/test/lib/graph/ProjectGraph.js | 2 +- 10 files changed, 552 insertions(+), 268 deletions(-) create mode 100644 packages/project/lib/build/BuildReader.js create mode 100644 packages/project/lib/build/BuildServer.js diff --git a/packages/project/lib/build/BuildReader.js b/packages/project/lib/build/BuildReader.js new file mode 100644 index 00000000000..f420ad2a171 --- /dev/null +++ b/packages/project/lib/build/BuildReader.js @@ -0,0 +1,92 @@ +import AbstractReader from "@ui5/fs/AbstractReader"; + +class BuildReader extends AbstractReader { + #projects; + #projectNames; + #namespaces = new Map(); + #getReaderForProject; + #getReaderForProjects; + + constructor(name, projects, getReaderForProject, getReaderForProjects) { + super(name); + this.#projects = projects; + this.#projectNames = projects.map((p) => p.getName()); + this.#getReaderForProject = getReaderForProject; + this.#getReaderForProjects = getReaderForProjects; + + for (const project of projects) { + const ns = project.getNamespace(); + // Not all projects have a namespace, e.g. modules or theme-libraries + if (ns) { + if (this.#namespaces.has(ns)) { + throw new Error(`Multiple projects with namespace '${ns}' found: ` + + `${this.#namespaces.get(ns)} and ${project.getName()}`); + } + this.#namespaces.set(ns, project.getName()); + } + } + } + + async byGlob(...args) { + const reader = await this.#getReaderForProjects(this.#projectNames); + return reader.byGlob(...args); + } + + async byPath(virPath, ...args) { + const reader = await this._getReaderForResource(virPath); + let res = await reader.byPath(virPath, ...args); + if (!res) { + // Fallback to unspecified projects + const allReader = await this.#getReaderForProjects(this.#projectNames); + res = await allReader.byPath(virPath, ...args); + } + return res; + } + + + async _getReaderForResource(virPath) { + let reader; + if (this.#projects.length === 1) { + // Filtering on a single project (typically the root project) + reader = await this.#getReaderForProject(this.#projectNames[0]); + } else { + // Determine project for resource path + const projects = this._getProjectsForResourcePath(virPath); + if (projects.length) { + reader = await this.#getReaderForProjects(projects); + } else { + // Unable to determine project for resource + // Request reader for all projects + reader = await this.#getReaderForProjects(this.#projectNames); + } + } + + return reader; + } + + /** + * Determine which projects might contain the resource for the given path. + * + * @param {string} virPath Virtual resource path + */ + _getProjectsForResourcePath(virPath) { + if (!virPath.startsWith("/resources/") && !virPath.startsWith("/test-resources/")) { + return []; + } + // Remove first two entries (e.g. "/resources/") + const parts = virPath.split("/").slice(2); + + const projectNames = []; + while (parts.length > 1) { + // Search for namespace, starting with the longest path + parts.pop(); + const ns = parts.join("/"); + if (this.#namespaces.has(ns)) { + projectNames.push(this.#namespaces.get(ns)); + } + } + return projectNames; + } +} + +export default BuildReader; diff --git a/packages/project/lib/build/BuildServer.js b/packages/project/lib/build/BuildServer.js new file mode 100644 index 00000000000..d1e720342f9 --- /dev/null +++ b/packages/project/lib/build/BuildServer.js @@ -0,0 +1,194 @@ +import EventEmitter from "node:events"; +import {createReaderCollectionPrioritized} from "@ui5/fs/resourceFactory"; +import BuildReader from "./BuildReader.js"; +import WatchHandler from "./helpers/WatchHandler.js"; + +class BuildServer extends EventEmitter { + #graph; + #projectBuilder; + #pCurrentBuild; + #allReader; + #rootReader; + #dependenciesReader; + #projectReaders = new Map(); + + constructor(graph, projectBuilder, initialBuildIncludedDependencies, initialBuildExcludedDependencies) { + super(); + this.#graph = graph; + this.#projectBuilder = projectBuilder; + this.#allReader = new BuildReader("Build Server: All Projects Reader", + Array.from(this.#graph.getProjects()), + this.#getReaderForProject.bind(this), + this.#getReaderForProjects.bind(this)); + const rootProject = this.#graph.getRoot(); + this.#rootReader = new BuildReader("Build Server: Root Project Reader", + [rootProject], + this.#getReaderForProject.bind(this), + this.#getReaderForProjects.bind(this)); + const dependencies = graph.getTransitiveDependencies(rootProject.getName()).map((dep) => graph.getProject(dep)); + this.#dependenciesReader = new BuildReader("Build Server: Dependencies Reader", + dependencies, + this.#getReaderForProject.bind(this), + this.#getReaderForProjects.bind(this)); + + if (initialBuildIncludedDependencies.length > 0) { + this.#pCurrentBuild = projectBuilder.build({ + includedDependencies: initialBuildIncludedDependencies, + excludedDependencies: initialBuildExcludedDependencies + }).then((builtProjects) => { + this.#projectBuildFinished(builtProjects); + }).catch((err) => { + this.emit("error", err); + }); + } + + const watchHandler = new WatchHandler(); + const allProjects = graph.getProjects(); + watchHandler.watch(allProjects).catch((err) => { + // Error during watch setup + this.emit("error", err); + }); + watchHandler.on("error", (err) => { + this.emit("error", err); + }); + watchHandler.on("sourcesChanged", (changes) => { + // Inform project builder + const affectedProjects = this.#projectBuilder.resourcesChanged(changes); + + for (const projectName of affectedProjects) { + this.#projectReaders.delete(projectName); + } + + const changedResourcePaths = [...changes.values()].flat(); + this.emit("sourcesChanged", changedResourcePaths); + }); + } + + getReader() { + return this.#allReader; + } + + getRootReader() { + return this.#rootReader; + } + + getDependenciesReader() { + return this.#dependenciesReader; + } + + async #getReaderForProject(projectName) { + if (this.#projectReaders.has(projectName)) { + return this.#projectReaders.get(projectName); + } + if (this.#pCurrentBuild) { + // If set, await currently running build + await this.#pCurrentBuild; + } + if (this.#projectReaders.has(projectName)) { + return this.#projectReaders.get(projectName); + } + this.#pCurrentBuild = this.#projectBuilder.build({ + includedDependencies: [projectName] + }).catch((err) => { + this.emit("error", err); + }); + const builtProjects = await this.#pCurrentBuild; + this.#projectBuildFinished(builtProjects); + + // Clear current build promise + this.#pCurrentBuild = null; + + return this.#projectReaders.get(projectName); + } + + async #getReaderForProjects(projectNames) { + let projectsRequiringBuild = []; + for (const projectName of projectNames) { + if (!this.#projectReaders.has(projectName)) { + projectsRequiringBuild.push(projectName); + } + } + if (projectsRequiringBuild.length === 0) { + // Projects already built + return this.#getReaderForCachedProjects(projectNames); + } + if (this.#pCurrentBuild) { + // If set, await currently running build + await this.#pCurrentBuild; + } + projectsRequiringBuild = []; + for (const projectName of projectNames) { + if (!this.#projectReaders.has(projectName)) { + projectsRequiringBuild.push(projectName); + } + } + if (projectsRequiringBuild.length === 0) { + // Projects already built + return this.#getReaderForCachedProjects(projectNames); + } + this.#pCurrentBuild = this.#projectBuilder.build({ + includedDependencies: projectsRequiringBuild + }).catch((err) => { + this.emit("error", err); + }); + const builtProjects = await this.#pCurrentBuild; + this.#projectBuildFinished(builtProjects); + + // Clear current build promise + this.#pCurrentBuild = null; + + return this.#getReaderForCachedProjects(projectNames); + } + + #getReaderForCachedProjects(projectNames) { + const readers = []; + for (const projectName of projectNames) { + const reader = this.#projectReaders.get(projectName); + if (reader) { + readers.push(reader); + } + } + return createReaderCollectionPrioritized({ + name: `Build Server: Reader for projects: ${projectNames.join(", ")}`, + readers + }); + } + + // async #getReaderForAllProjects() { + // if (this.#pCurrentBuild) { + // // If set, await initial build + // await this.#pCurrentBuild; + // } + // if (this.#allProjectsReader) { + // return this.#allProjectsReader; + // } + // this.#pCurrentBuild = this.#projectBuilder.build({ + // includedDependencies: ["*"] + // }).catch((err) => { + // this.emit("error", err); + // }); + // const builtProjects = await this.#pCurrentBuild; + // this.#projectBuildFinished(builtProjects); + + // // Clear current build promise + // this.#pCurrentBuild = null; + + // // Create a combined reader for all projects + // this.#allProjectsReader = createReaderCollectionPrioritized({ + // name: "All projects build reader", + // readers: [...this.#projectReaders.values()] + // }); + // return this.#allProjectsReader; + // } + + #projectBuildFinished(projectNames) { + for (const projectName of projectNames) { + this.#projectReaders.set(projectName, + this.#graph.getProject(projectName).getReader({style: "runtime"})); + } + this.emit("buildFinished", projectNames); + } +} + + +export default BuildServer; diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 5db2138de30..69ac852dca0 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -5,7 +5,6 @@ import composeProjectList from "./helpers/composeProjectList.js"; import BuildContext from "./helpers/BuildContext.js"; import prettyHrtime from "pretty-hrtime"; import OutputStyleEnum from "./helpers/ProjectBuilderOutputStyle.js"; -import createBuildManifest from "./helpers/createBuildManifest.js"; /** * @public @@ -14,6 +13,9 @@ import createBuildManifest from "./helpers/createBuildManifest.js"; */ class ProjectBuilder { #log; + #buildIsRunning = false; + // #resourceChanges = new Map(); + /** * Build Configuration * @@ -119,6 +121,35 @@ class ProjectBuilder { this.#log = new BuildLogger("ProjectBuilder"); } + resourcesChanged(changes) { + // if (!this.#resourceChanges.size) { + // this.#resourceChanges = changes; + // return; + // } + // for (const [project, resourcePaths] of changes.entries()) { + // if (!this.#resourceChanges.has(project.getName())) { + // this.#resourceChanges.set(project.getName(), []); + // } + // const projectChanges = this.#resourceChanges.get(project.getName()); + // projectChanges.push(...resourcePaths); + // } + + return this._buildContext.propagateResourceChanges(changes); + } + + // _flushResourceChanges() { + // this._buildContext.propagateResurceChanges(this.#resourceChanges); + // this.#resourceChanges = new Map(); + // } + + async build({ + includedDependencies = [], excludedDependencies = [], + }) { + const requestedProjects = this._determineRequestedProjects( + includedDependencies, excludedDependencies); + return await this.#build(requestedProjects); + } + /** * Executes a project build, including all necessary or requested dependencies * @@ -135,18 +166,17 @@ class ProjectBuilder { * Alternative to the includedDependencies and excludedDependencies parameters. * Allows for a more sophisticated configuration for defining which dependencies should be * part of the build result. If this is provided, the other mentioned parameters are ignored. - * @param {boolean} [parameters.watch] Whether to watch for file changes and re-execute the build automatically * @returns {Promise} Promise resolving once the build has finished */ - async build({ + async buildToTarget({ destPath, cleanDest = false, includedDependencies = [], excludedDependencies = [], dependencyIncludes, - watch, }) { - if (!destPath && !watch) { + if (!destPath) { throw new Error(`Missing parameter 'destPath'`); } + if (dependencyIncludes) { if (includedDependencies.length || excludedDependencies.length) { throw new Error( @@ -154,13 +184,27 @@ class ProjectBuilder { "with parameters 'includedDependencies' or 'excludedDependencies"); } } - const rootProjectName = this._graph.getRoot().getName(); - this.#log.info(`Preparing build for project ${rootProjectName}`); - this.#log.info(` Target directory: ${destPath}`); + this.#log.info(`Target directory: ${destPath}`); + const requestedProjects = this._determineRequestedProjects( + includedDependencies, excludedDependencies, dependencyIncludes); + + if (destPath && cleanDest) { + this.#log.info(`Cleaning target directory...`); + await rmrf(destPath); + } + const fsTarget = resourceFactory.createAdapter({ + fsBasePath: destPath, + virBasePath: "/" + }); + + await this.#build(requestedProjects, fsTarget); + } + + _determineRequestedProjects(includedDependencies, excludedDependencies, dependencyIncludes) { // Get project filter function based on include/exclude params // (also logs some info to console) - const filterProject = await this._getProjectFilter({ + const filterProject = this._createProjectFilter({ explicitIncludes: includedDependencies, explicitExcludes: excludedDependencies, dependencyIncludes @@ -180,20 +224,26 @@ class ProjectBuilder { } } - const projectBuildContexts = await this._buildContext.createRequiredProjectContexts(requestedProjects); - let fsTarget; - if (destPath) { - fsTarget = resourceFactory.createAdapter({ - fsBasePath: destPath, - virBasePath: "/" - }); + return requestedProjects; + } + + async #build(requestedProjects, fsTarget) { + if (this.#buildIsRunning) { + throw new Error("A build is already running"); } + this.#buildIsRunning = true; + const rootProjectName = this._graph.getRoot().getName(); + this.#log.info(`Preparing build for project ${rootProjectName}`); - const queue = []; + // this._flushResourceChanges(); + const projectBuildContexts = await this._buildContext.getRequiredProjectContexts(requestedProjects); // Create build queue based on graph depth-first search to ensure correct build order - await this._graph.traverseDepthFirst(async ({project}) => { + const queue = []; + const builtProjects = []; + for (const {project} of this._graph.traverseDependenciesDepthFirst(true)) { const projectName = project.getName(); + builtProjects.push(projectName); const projectBuildContext = projectBuildContexts.get(projectName); if (projectBuildContext) { // Build context exists @@ -201,76 +251,20 @@ class ProjectBuilder { // been built, it's build result needs to be written out (if requested) queue.push(projectBuildContext); } - }); - - if (destPath && cleanDest) { - this.#log.info(`Cleaning target directory...`); - await rmrf(destPath); } - let pWatchInit; - if (watch) { - const relevantProjects = queue.map((projectBuildContext) => { - return projectBuildContext.getProject(); - }); - // Start watching already while the initial build is running - pWatchInit = this._buildContext.initWatchHandler(relevantProjects, async () => { - await this.#updateBuild(projectBuildContexts, requestedProjects, fsTarget); - }); - } - - await this.#build(queue, projectBuildContexts, requestedProjects, fsTarget); - - if (watch) { - const watchHandler = await pWatchInit; - watchHandler.setReady(); - return watchHandler; - } else { - return null; - } - } - - async #build(queue, projectBuildContexts, requestedProjects, fsTarget) { this.#log.setProjects(queue.map((projectBuildContext) => { return projectBuildContext.getProject().getName(); })); const alreadyBuilt = []; for (const projectBuildContext of queue) { - if (!await projectBuildContext.possiblyRequiresBuild()) { + if (!projectBuildContext.possiblyRequiresBuild()) { const projectName = projectBuildContext.getProject().getName(); alreadyBuilt.push(projectName); } } - if (queue.length > 1) { // Do not log if only the root project is being built - this.#log.info(`Processing ${queue.length} projects`); - if (alreadyBuilt.length) { - this.#log.info(` Reusing build results of ${alreadyBuilt.length} projects`); - this.#log.info(` Building ${queue.length - alreadyBuilt.length} projects`); - } - if (this.#log.isLevelEnabled("verbose")) { - this.#log.verbose(` Required projects:`); - this.#log.verbose(` ${queue - .map((projectBuildContext) => { - const projectName = projectBuildContext.getProject().getName(); - let msg; - if (alreadyBuilt.includes(projectName)) { - const buildMetadata = projectBuildContext.getBuildMetadata(); - let buildAt = ""; - if (buildMetadata) { - const ts = new Date(buildMetadata.timestamp).toUTCString(); - buildAt = ` at ${ts}`; - } - msg = `*> ${projectName} /// already built${buildAt}`; - } else { - msg = `=> ${projectName}`; - } - return msg; - }) - .join("\n ")}`); - } - } const cleanupSigHooks = this._registerCleanupSigHooks(); try { const startTime = process.hrtime(); @@ -293,25 +287,18 @@ class ProjectBuilder { await this._buildProject(projectBuildContext); } } - if (!requestedProjects.includes(projectName)) { - // Project has not been requested - // => Its resources shall not be part of the build result - continue; - } - - if (fsTarget) { - this.#log.verbose(`Writing out files...`); - pWrites.push(this._writeResults(projectBuildContext, fsTarget)); - } if (!alreadyBuilt.includes(projectName) && !process.env.UI5_BUILD_NO_CACHE_UPDATE) { - this.#log.verbose(`Triggering cache write...`); - // const buildManifest = await createBuildManifest( - // project, - // this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), - // projectBuildContext.getBuildSignature()); + this.#log.verbose(`Triggering cache update for project ${projectName}...`); pWrites.push(projectBuildContext.getBuildCache().writeCache()); } + + if (fsTarget && requestedProjects.includes(projectName)) { + // Only write requested projects to target + // (excluding dependencies that were required to be built, but not requested) + this.#log.verbose(`Writing out files for project ${projectName}...`); + pWrites.push(this._writeResults(projectBuildContext, fsTarget)); + } } await Promise.all(pWrites); this.#log.info(`Build succeeded in ${this._getElapsedTime(startTime)}`); @@ -322,84 +309,86 @@ class ProjectBuilder { this._deregisterCleanupSigHooks(cleanupSigHooks); await this._executeCleanupTasks(); } + this.#buildIsRunning = false; + return builtProjects; } - async #updateBuild(projectBuildContexts, requestedProjects, fsTarget) { - const cleanupSigHooks = this._registerCleanupSigHooks(); - try { - const startTime = process.hrtime(); - await this.#update(projectBuildContexts, requestedProjects, fsTarget); - this.#log.info(`Update succeeded in ${this._getElapsedTime(startTime)}`); - } catch (err) { - this.#log.error(`Update failed`); - throw err; - } finally { - this._deregisterCleanupSigHooks(cleanupSigHooks); - await this._executeCleanupTasks(); - } - } - - async #update(projectBuildContexts, requestedProjects, fsTarget) { - const queue = []; - await this._graph.traverseDepthFirst(async ({project}) => { - const projectName = project.getName(); - const projectBuildContext = projectBuildContexts.get(projectName); - if (projectBuildContext) { - // Build context exists - // => This project needs to be built or, in case it has already - // been built, it's build result needs to be written out (if requested) - queue.push(projectBuildContext); - } - }); - - this.#log.setProjects(queue.map((projectBuildContext) => { - return projectBuildContext.getProject().getName(); - })); - - const pWrites = []; - while (queue.length) { - const projectBuildContext = queue.shift(); - const project = projectBuildContext.getProject(); - const projectName = project.getName(); - const projectType = project.getType(); - this.#log.verbose(`Updating project ${projectName}...`); - - let changedPaths = await projectBuildContext.prepareProjectBuildAndValidateCache(); - if (changedPaths) { - this.#log.skipProjectBuild(projectName, projectType); - } else { - changedPaths = await this._buildProject(projectBuildContext); - } - - if (changedPaths.length) { - for (const pbc of queue) { - // Propagate resource changes to following projects - pbc.getBuildCache().dependencyResourcesChanged(changedPaths); - } - } - if (!requestedProjects.includes(projectName)) { - // Project has not been requested - // => Its resources shall not be part of the build result - continue; - } - - if (fsTarget) { - this.#log.verbose(`Writing out files...`); - pWrites.push(this._writeResults(projectBuildContext, fsTarget)); - } - - if (process.env.UI5_BUILD_NO_CACHE_UPDATE) { - continue; - } - this.#log.verbose(`Triggering cache write...`); - // const buildManifest = await createBuildManifest( - // project, - // this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), - // projectBuildContext.getBuildSignature()); - pWrites.push(projectBuildContext.getBuildCache().writeCache()); - } - await Promise.all(pWrites); - } + // async #updateBuild(projectBuildContexts, requestedProjects, fsTarget) { + // const cleanupSigHooks = this._registerCleanupSigHooks(); + // try { + // const startTime = process.hrtime(); + // await this.#update(projectBuildContexts, requestedProjects, fsTarget); + // this.#log.info(`Update succeeded in ${this._getElapsedTime(startTime)}`); + // } catch (err) { + // this.#log.error(`Update failed`); + // throw err; + // } finally { + // this._deregisterCleanupSigHooks(cleanupSigHooks); + // await this._executeCleanupTasks(); + // } + // } + + // async #update(projectBuildContexts, requestedProjects, fsTarget) { + // const queue = []; + // // await this._graph.traverseDepthFirst(async ({project}) => { + // // const projectName = project.getName(); + // // const projectBuildContext = projectBuildContexts.get(projectName); + // // if (projectBuildContext) { + // // // Build context exists + // // // => This project needs to be built or, in case it has already + // // // been built, it's build result needs to be written out (if requested) + // // queue.push(projectBuildContext); + // // } + // // }); + + // // this.#log.setProjects(queue.map((projectBuildContext) => { + // // return projectBuildContext.getProject().getName(); + // // })); + + // const pWrites = []; + // while (queue.length) { + // const projectBuildContext = queue.shift(); + // const project = projectBuildContext.getProject(); + // const projectName = project.getName(); + // const projectType = project.getType(); + // this.#log.verbose(`Updating project ${projectName}...`); + + // let changedPaths = await projectBuildContext.prepareProjectBuildAndValidateCache(); + // if (changedPaths) { + // this.#log.skipProjectBuild(projectName, projectType); + // } else { + // changedPaths = await this._buildProject(projectBuildContext); + // } + + // if (changedPaths.length) { + // for (const pbc of queue) { + // // Propagate resource changes to following projects + // pbc.getBuildCache().dependencyResourcesChanged(changedPaths); + // } + // } + // if (!requestedProjects.includes(projectName)) { + // // Project has not been requested + // // => Its resources shall not be part of the build result + // continue; + // } + + // if (fsTarget) { + // this.#log.verbose(`Writing out files...`); + // pWrites.push(this._writeResults(projectBuildContext, fsTarget)); + // } + + // if (process.env.UI5_BUILD_NO_CACHE_UPDATE) { + // continue; + // } + // this.#log.verbose(`Triggering cache write...`); + // // const buildManifest = await createBuildManifest( + // // project, + // // this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), + // // projectBuildContext.getBuildSignature()); + // pWrites.push(projectBuildContext.getBuildCache().writeCache()); + // } + // await Promise.all(pWrites); + // } async _buildProject(projectBuildContext) { const project = projectBuildContext.getProject(); @@ -413,12 +402,12 @@ class ProjectBuilder { return {changedResources}; } - async _getProjectFilter({ + _createProjectFilter({ dependencyIncludes, explicitIncludes, explicitExcludes }) { - const {includedDependencies, excludedDependencies} = await composeProjectList( + const {includedDependencies, excludedDependencies} = composeProjectList( this._graph, dependencyIncludes || { includeDependencyTree: explicitIncludes, @@ -486,7 +475,10 @@ class ProjectBuilder { const resources = await reader.byGlob("/**/*"); if (createBuildManifest) { - // Create and write a build manifest metadata file + // Create and write a build manifest metadata file+ + const { + default: createBuildManifest + } = await import("./helpers/createBuildManifest.js"); const buildManifest = await createBuildManifest( project, this._graph, buildConfig, this._buildContext.getTaskRepository(), projectBuildContext.getBuildSignature()); diff --git a/packages/project/lib/build/helpers/BuildContext.js b/packages/project/lib/build/helpers/BuildContext.js index a4ec790f48f..438916cf359 100644 --- a/packages/project/lib/build/helpers/BuildContext.js +++ b/packages/project/lib/build/helpers/BuildContext.js @@ -1,6 +1,5 @@ import ProjectBuildContext from "./ProjectBuildContext.js"; import OutputStyleEnum from "./ProjectBuilderOutputStyle.js"; -import WatchHandler from "./WatchHandler.js"; import CacheManager from "../cache/CacheManager.js"; import {getBaseSignature} from "./getBuildSignature.js"; @@ -83,7 +82,7 @@ class BuildContext { this._options = { cssVariables: cssVariables }; - this._projectBuildContexts = []; + this._projectBuildContexts = new Map(); } getRootProject() { @@ -106,21 +105,23 @@ class BuildContext { return this._graph; } - async createProjectContext({project}) { + async getProjectContext(projectName) { + if (this._projectBuildContexts.has(projectName)) { + return this._projectBuildContexts.get(projectName); + } + const project = this._graph.getProject(projectName); const projectBuildContext = await ProjectBuildContext.create( this, project, await this.getCacheManager(), this._buildSignatureBase); - this._projectBuildContexts.push(projectBuildContext); + this._projectBuildContexts.set(projectName, projectBuildContext); return projectBuildContext; } - async createRequiredProjectContexts(requestedProjects) { + async getRequiredProjectContexts(requestedProjects) { const projectBuildContexts = new Map(); const requiredProjects = new Set(requestedProjects); for (const projectName of requiredProjects) { - const projectBuildContext = await this.createProjectContext({ - project: this._graph.getProject(projectName) - }); + const projectBuildContext = await this.getProjectContext(projectName); projectBuildContexts.set(projectName, projectBuildContext); @@ -135,17 +136,6 @@ class BuildContext { return projectBuildContexts; } - async initWatchHandler(projects, updateBuildResult) { - const watchHandler = new WatchHandler(this, updateBuildResult); - await watchHandler.watch(projects); - this.#watchHandler = watchHandler; - return watchHandler; - } - - getWatchHandler() { - return this.#watchHandler; - } - async getCacheManager() { if (this.#cacheManager) { return this.#cacheManager; @@ -155,16 +145,51 @@ class BuildContext { } getBuildContext(projectName) { - if (projectName) { - return this._projectBuildContexts.find((ctx) => ctx.getProject().getName() === projectName); - } + return this._projectBuildContexts.get(projectName); } async executeCleanupTasks(force = false) { - await Promise.all(this._projectBuildContexts.map((ctx) => { + await Promise.all(Array.from(this._projectBuildContexts.values()).map((ctx) => { return ctx.executeCleanupTasks(force); })); } + + /** + * + * @param {Map>} resourceChanges + * @returns {Set} Names of projects potentially affected by the resource changes + */ + propagateResourceChanges(resourceChanges) { + const affectedProjectNames = new Set(); + const dependencyChanges = new Map(); + for (const [projectName, changedResourcePaths] of resourceChanges) { + affectedProjectNames.add(projectName); + // Propagate changes to dependents of the project + for (const {project: dep} of this._graph.traverseDependents(projectName)) { + const depChanges = dependencyChanges.get(dep.getName()); + if (!depChanges) { + dependencyChanges.set(dep.getName(), new Set(changedResourcePaths)); + continue; + } + for (const res of changedResourcePaths) { + depChanges.add(res); + } + } + const projectBuildContext = this.getBuildContext(projectName); + if (projectBuildContext) { + projectBuildContext.projectSourcesChanged(Array.from(changedResourcePaths)); + } + } + + for (const [projectName, changedResourcePaths] of dependencyChanges) { + affectedProjectNames.add(projectName); + const projectBuildContext = this.getBuildContext(projectName); + if (projectBuildContext) { + projectBuildContext.dependencyResourcesChanged(Array.from(changedResourcePaths)); + } + } + return affectedProjectNames; + } } export default BuildContext; diff --git a/packages/project/lib/build/helpers/ProjectBuildContext.js b/packages/project/lib/build/helpers/ProjectBuildContext.js index 5cc25f8e0c9..d611d4fa6b0 100644 --- a/packages/project/lib/build/helpers/ProjectBuildContext.js +++ b/packages/project/lib/build/helpers/ProjectBuildContext.js @@ -165,9 +165,9 @@ class ProjectBuildContext { * * This method allows for an early check whether a project build can be skipped. * - * @returns {Promise} True if a build might required, false otherwise + * @returns {boolean} True if a build might required, false otherwise */ - async possiblyRequiresBuild() { + possiblyRequiresBuild() { if (this.#getBuildManifest()) { // Build manifest present -> No build required return false; diff --git a/packages/project/lib/build/helpers/WatchHandler.js b/packages/project/lib/build/helpers/WatchHandler.js index e85ee1b4e08..72ea95b65bc 100644 --- a/packages/project/lib/build/helpers/WatchHandler.js +++ b/packages/project/lib/build/helpers/WatchHandler.js @@ -10,23 +10,13 @@ const log = getLogger("build:helpers:WatchHandler"); * @memberof @ui5/project/build/helpers */ class WatchHandler extends EventEmitter { - #buildContext; - #updateBuildResult; #closeCallbacks = []; #sourceChanges = new Map(); #ready = false; - #updateInProgress = false; #fileChangeHandlerTimeout; - constructor(buildContext, updateBuildResult) { + constructor() { super(); - this.#buildContext = buildContext; - this.#updateBuildResult = updateBuildResult; - } - - setReady() { - this.#ready = true; - this.#processQueue(); } async watch(projects) { @@ -44,10 +34,11 @@ class WatchHandler extends EventEmitter { watcher.on("all", (event, filePath) => { this.#handleWatchEvents(event, filePath, project); }); - const {promise, resolve} = Promise.withResolvers(); + const {promise, resolve: ready} = Promise.withResolvers(); readyPromises.push(promise); watcher.on("ready", () => { - resolve(); + this.#ready = true; + ready(); }); watcher.on("error", (err) => { this.emit("error", err); @@ -56,7 +47,7 @@ class WatchHandler extends EventEmitter { return await Promise.all(readyPromises); } - async stop() { + async destroy() { for (const cb of this.#closeCallbacks) { await cb(); } @@ -80,12 +71,12 @@ class WatchHandler extends EventEmitter { } #processQueue() { - if (!this.#ready || this.#updateInProgress || !this.#sourceChanges.size) { - // Prevent concurrent or premature processing + if (!this.#ready || !this.#sourceChanges.size) { + // Prevent premature processing return; } - // Trigger callbacks debounced + // Trigger change event debounced if (this.#fileChangeHandlerTimeout) { clearTimeout(this.#fileChangeHandlerTimeout); } @@ -93,54 +84,16 @@ class WatchHandler extends EventEmitter { this.#fileChangeHandlerTimeout = null; const sourceChanges = this.#sourceChanges; - // Reset file changes before processing + // Reset file changes this.#sourceChanges = new Map(); - this.#updateInProgress = true; try { - await this.#handleResourceChanges(sourceChanges); + this.emit("sourcesChanged", sourceChanges); } catch (err) { this.emit("error", err); - } finally { - this.#updateInProgress = false; - } - - if (this.#sourceChanges.size > 0) { - // New changes have occurred during processing, trigger queue again - this.#processQueue(); } }, 100); } - - async #handleResourceChanges(sourceChanges) { - const dependencyChanges = new Map(); - - const graph = this.#buildContext.getGraph(); - for (const [projectName, changedResourcePaths] of sourceChanges) { - // Propagate changes to dependents of the project - for (const {project: dep} of graph.traverseDependents(projectName)) { - const depChanges = dependencyChanges.get(dep.getName()); - if (!depChanges) { - dependencyChanges.set(dep.getName(), new Set(changedResourcePaths)); - continue; - } - for (const res of changedResourcePaths) { - depChanges.add(res); - } - } - const projectBuildContext = this.#buildContext.getBuildContext(projectName); - projectBuildContext.projectSourcesChanged(Array.from(changedResourcePaths)); - } - - for (const [projectName, changedResourcePaths] of dependencyChanges) { - const projectBuildContext = this.#buildContext.getBuildContext(projectName); - projectBuildContext.dependencyResourcesChanged(Array.from(changedResourcePaths)); - } - - this.emit("projectResourcesInvalidated"); - await this.#updateBuildResult(); - this.emit("projectResourcesUpdated"); - } } export default WatchHandler; diff --git a/packages/project/lib/build/helpers/composeProjectList.js b/packages/project/lib/build/helpers/composeProjectList.js index d98ad17929e..0f4c5d6d01f 100644 --- a/packages/project/lib/build/helpers/composeProjectList.js +++ b/packages/project/lib/build/helpers/composeProjectList.js @@ -6,17 +6,17 @@ const log = getLogger("build:helpers:composeProjectList"); * its value is an array of all of its transitive dependencies. * * @param {@ui5/project/graph/ProjectGraph} graph - * @returns {Promise>} A promise resolving to an object with dependency names as + * @returns {Object} A promise resolving to an object with dependency names as * key and each with an array of its transitive dependencies as value */ -async function getFlattenedDependencyTree(graph) { +function getFlattenedDependencyTree(graph) { const dependencyMap = Object.create(null); const rootName = graph.getRoot().getName(); - await graph.traverseDepthFirst(({project, dependencies}) => { + for (const {project, dependencies} of graph.traverseDependenciesDepthFirst()) { if (project.getName() === rootName) { // Skip root project - return; + continue; } const projectDeps = []; dependencies.forEach((depName) => { @@ -26,7 +26,7 @@ async function getFlattenedDependencyTree(graph) { } }); dependencyMap[project.getName()] = projectDeps; - }); + } return dependencyMap; } @@ -41,7 +41,7 @@ async function getFlattenedDependencyTree(graph) { * @returns {{includedDependencies:string[],excludedDependencies:string[]}} An object containing the * 'includedDependencies' and 'excludedDependencies' */ -async function createDependencyLists(graph, { +function createDependencyLists(graph, { includeAllDependencies = false, includeDependency = [], includeDependencyRegExp = [], includeDependencyTree = [], excludeDependency = [], excludeDependencyRegExp = [], excludeDependencyTree = [], @@ -57,7 +57,7 @@ async function createDependencyLists(graph, { return {includedDependencies: [], excludedDependencies: []}; } - const flattenedDependencyTree = await getFlattenedDependencyTree(graph); + const flattenedDependencyTree = getFlattenedDependencyTree(graph); function isExcluded(excludeList, depName) { return excludeList && excludeList.has(depName); diff --git a/packages/project/lib/graph/ProjectGraph.js b/packages/project/lib/graph/ProjectGraph.js index 9e23647fee3..a738eede4a2 100644 --- a/packages/project/lib/graph/ProjectGraph.js +++ b/packages/project/lib/graph/ProjectGraph.js @@ -713,7 +713,6 @@ class ProjectGraph { * @param {Array.} [parameters.excludedTasks=[]] List of tasks to be excluded. * @param {module:@ui5/project/build/ProjectBuilderOutputStyle} [parameters.outputStyle=Default] * Processes build results into a specific directory structure. - * @param {boolean} [parameters.watch] Whether to watch for file changes and re-execute the build automatically * @returns {Promise} Promise resolving to undefined once build has finished */ async build({ @@ -723,15 +722,14 @@ class ProjectGraph { selfContained = false, cssVariables = false, jsdoc = false, createBuildManifest = false, includedTasks = [], excludedTasks = [], outputStyle = OutputStyleEnum.Default, - watch, }) { this.seal(); // Do not allow further changes to the graph - if (this._built) { + if (this._builtOrServed) { throw new Error( - `Project graph with root node ${this._rootProjectName} has already been built. ` + - `Each graph can only be built once`); + `Project graph with root node ${this._rootProjectName} has already been built or served. ` + + `Each graph can only be built or served once`); } - this._built = true; + this._builtOrServed = true; const { default: ProjectBuilder } = await import("../build/ProjectBuilder.js"); @@ -744,14 +742,44 @@ class ProjectGraph { includedTasks, excludedTasks, outputStyle, } }); - return await builder.build({ + return await builder.buildToTarget({ destPath, cleanDest, includedDependencies, excludedDependencies, dependencyIncludes, - watch, }); } + async serve({ + initialBuildIncludedDependencies = [], initialBuildExcludedDependencies = [], + selfContained = false, cssVariables = false, jsdoc = false, createBuildManifest = false, + includedTasks = [], excludedTasks = [], + }) { + this.seal(); // Do not allow further changes to the graph + if (this._builtOrServed) { + throw new Error( + `Project graph with root node ${this._rootProjectName} has already been built or served. ` + + `Each graph can only be built or served once`); + } + this._builtOrServed = true; + const { + default: ProjectBuilder + } = await import("../build/ProjectBuilder.js"); + const builder = new ProjectBuilder({ + graph: this, + taskRepository: await this._getTaskRepository(), + buildConfig: { + selfContained, cssVariables, jsdoc, + createBuildManifest, + includedTasks, excludedTasks, + outputStyle: OutputStyleEnum.Default, + } + }); + const { + default: BuildServer + } = await import("../build/BuildServer.js"); + return new BuildServer(this, builder, initialBuildIncludedDependencies, initialBuildExcludedDependencies); + } + /** * Seal the project graph so that no further changes can be made to it * diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index 0dd06e4a290..a3620887f12 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -294,7 +294,7 @@ class Project extends Specification { } else { const currentReader = this.#currentStage.getCacheReader(); if (currentReader) { - readers.push(currentReader); + this._addReadersForWriter(readers, currentReader, style); } } } diff --git a/packages/project/test/lib/graph/ProjectGraph.js b/packages/project/test/lib/graph/ProjectGraph.js index fdababc228c..449a7d0bcec 100644 --- a/packages/project/test/lib/graph/ProjectGraph.js +++ b/packages/project/test/lib/graph/ProjectGraph.js @@ -1315,7 +1315,7 @@ test("traverseDependenciesDepthFirst: No project visited twice", async (t) => { } // library.d should appear only once - const dCount = results.filter(name => name === "library.d").length; + const dCount = results.filter((name) => name === "library.d").length; t.is(dCount, 1, "library.d should be visited exactly once"); t.is(results.length, 3, "Should visit exactly 3 projects"); }); From c64e5cc1031b995017d6f2bcdda2eb078d6271c2 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 20 Jan 2026 11:39:45 +0100 Subject: [PATCH 096/110] refactor(project): Refactor project result cache Instead of storing it as a dedicated stage, save the relevant stage caches and import those --- packages/project/lib/build/ProjectBuilder.js | 2 +- .../project/lib/build/cache/CacheManager.js | 67 +++++- .../lib/build/cache/ProjectBuildCache.js | 225 ++++++++++++------ .../project/lib/specifications/Project.js | 63 ++--- 4 files changed, 239 insertions(+), 118 deletions(-) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 69ac852dca0..9ddd82c384f 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -243,13 +243,13 @@ class ProjectBuilder { const builtProjects = []; for (const {project} of this._graph.traverseDependenciesDepthFirst(true)) { const projectName = project.getName(); - builtProjects.push(projectName); const projectBuildContext = projectBuildContexts.get(projectName); if (projectBuildContext) { // Build context exists // => This project needs to be built or, in case it has already // been built, it's build result needs to be written out (if requested) queue.push(projectBuildContext); + builtProjects.push(projectName); } } diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index d8088e3f4ee..85f0b5b75d3 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -20,7 +20,7 @@ const chacheManagerInstances = new Map(); const CACACHE_OPTIONS = {algorithms: ["sha256"]}; // Cache version for compatibility management -const CACHE_VERSION = "v0_0"; +const CACHE_VERSION = "v0_1"; /** * Manages persistence for the build cache using file-based storage and cacache @@ -48,6 +48,7 @@ export default class CacheManager { #manifestDir; #stageMetadataDir; #taskMetadataDir; + #resultMetadataDir; #indexDir; /** @@ -65,6 +66,7 @@ export default class CacheManager { this.#manifestDir = path.join(cacheDir, "buildManifests"); this.#stageMetadataDir = path.join(cacheDir, "stageMetadata"); this.#taskMetadataDir = path.join(cacheDir, "taskMetadata"); + this.#resultMetadataDir = path.join(cacheDir, "resultMetadata"); this.#indexDir = path.join(cacheDir, "index"); } @@ -342,6 +344,69 @@ export default class CacheManager { await writeFile(metadataPath, JSON.stringify(metadata, null, 2), "utf8"); } + /** + * Generates the file path for result metadata + * + * @private + * @param {string} packageName - Package/project identifier + * @param {string} buildSignature - Build signature hash + * @param {string} stageSignature - Stage signature hash (based on input resources) + * @returns {string} Absolute path to the stage metadata file + */ + #getResultMetadataPath(packageName, buildSignature, stageSignature) { + const pkgDir = getPathFromPackageName(packageName); + return path.join(this.#resultMetadataDir, pkgDir, buildSignature, `${stageSignature}.json`); + } + + /** + * Reads result metadata from cache + * + * Stage metadata contains information about resources produced by a build stage, + * including resource paths and their metadata. + * + * @param {string} projectId - Project identifier (typically package name) + * @param {string} buildSignature - Build signature hash + * @param {string} stageSignature - Stage signature hash (based on input resources) + * @returns {Promise} Parsed stage metadata or null if not found + * @throws {Error} If file read fails for reasons other than file not existing + */ + async readResultMetadata(projectId, buildSignature, stageSignature) { + try { + const metadata = await readFile( + this.#getResultMetadataPath(projectId, buildSignature, stageSignature + ), "utf8"); + return JSON.parse(metadata); + } catch (err) { + if (err.code === "ENOENT") { + // Cache miss + return null; + } + throw new Error(`Failed to read stage metadata from cache for ` + + `${projectId} / ${buildSignature} / ${stageSignature}: ${err.message}`, { + cause: err, + }); + } + } + + /** + * Writes result metadata to cache + * + * Persists metadata about resources produced by a build stage. + * Creates parent directories if needed. + * + * @param {string} projectId - Project identifier (typically package name) + * @param {string} buildSignature - Build signature hash + * @param {string} stageSignature - Stage signature hash (based on input resources) + * @param {object} metadata - Stage metadata object to serialize + * @returns {Promise} + */ + async writeResultMetadata(projectId, buildSignature, stageSignature, metadata) { + const metadataPath = this.#getResultMetadataPath( + projectId, buildSignature, stageSignature); + await mkdir(path.dirname(metadataPath), {recursive: true}); + await writeFile(metadataPath, JSON.stringify(metadata, null, 2), "utf8"); + } + /** * Retrieves the file system path for a cached resource * diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index e7dab3246dd..adcb080ac76 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -1,4 +1,4 @@ -import {createResource, createProxy} from "@ui5/fs/resourceFactory"; +import {createResource, createProxy, createWriterCollection} from "@ui5/fs/resourceFactory"; import {getLogger} from "@ui5/logger"; import fs from "graceful-fs"; import {promisify} from "node:util"; @@ -42,7 +42,7 @@ export default class ProjectBuildCache { #currentDependencyReader; #sourceIndex; #cachedSourceSignature; - #currentDependencySignatures = new Map(); + #currentStageSignatures = new Map(); #cachedResultSignature; #currentResultSignature; @@ -177,7 +177,7 @@ export default class ProjectBuildCache { * If found, creates a reader for the cached stage and sets it as the project's * result stage. * - * @returns {Promise} + * @returns {Promise} Array of resource paths written by the cached result stage */ async #findResultCache() { if (this.#cacheState === CACHE_STATES.STALE && this.#currentResultSignature) { @@ -192,33 +192,66 @@ export default class ProjectBuildCache { `skipping result cache validation.`); return; } - const stageSignatures = this.#getPossibleResultStageSignatures(); - if (stageSignatures.includes(this.#currentResultSignature)) { + const resultSignatures = this.#getPossibleResultStageSignatures(); + if (resultSignatures.includes(this.#currentResultSignature)) { log.verbose( `Project ${this.#project.getName()} result stage signature unchanged: ${this.#currentResultSignature}`); this.#cacheState = CACHE_STATES.FRESH; return []; } - const stageCache = await this.#findStageCache("result", stageSignatures); - if (!stageCache) { + + const res = await firstTruthy(resultSignatures.map(async (resultSignature) => { + const metadata = await this.#cacheManager.readResultMetadata( + this.#project.getId(), this.#buildSignature, resultSignature); + if (!metadata) { + return; + } + return [resultSignature, metadata]; + })); + + if (!res) { log.verbose( - `No cached stage found for project ${this.#project.getName()}. Searching with ` + - `${stageSignatures.length} possible signatures.`); - // Cache state remains dirty - // this.#cacheState = CACHE_STATES.EMPTY; + `No cached stage found for project ${this.#project.getName()}. Searched with ` + + `${resultSignatures.length} possible signatures.`); return; } - const {stage, signature, writtenResourcePaths} = stageCache; + const [resultSignature, resultMetadata] = res; + log.verbose(`Found result cache with signature ${resultSignature}`); + const {stageSignatures} = resultMetadata; + + const writtenResourcePaths = await this.#importStages(stageSignatures); + log.verbose( - `Using cached result stage for project ${this.#project.getName()} with index signature ${signature}`); - this.#currentResultSignature = signature; - this.#cachedResultSignature = signature; - this.#project.setResultStage(stage); - this.#project.useResultStage(); + `Using cached result stage for project ${this.#project.getName()} with index signature ${resultSignature}`); + this.#currentResultSignature = resultSignature; + this.#cachedResultSignature = resultSignature; this.#cacheState = CACHE_STATES.FRESH; return writtenResourcePaths; } + async #importStages(stageSignatures) { + const stageNames = Object.keys(stageSignatures); + this.#project.initStages(stageNames); + const importedStages = await Promise.all(stageNames.map(async (stageName) => { + const stageSignature = stageSignatures[stageName]; + const stageCache = await this.#findStageCache(stageName, [stageSignature]); + if (!stageCache) { + throw new Error(`Inconsistent result cache: Could not find cached stage ` + + `${stageName} with signature ${stageSignature} for project ${this.#project.getName()}`); + } + return [stageName, stageCache]; + })); + this.#project.useResultStage(); + const writtenResourcePaths = new Set(); + for (const [stageName, stageCache] of importedStages) { + this.#project.setStage(stageName, stageCache.stage); + for (const resourcePath of stageCache.writtenResourcePaths) { + writtenResourcePaths.add(resourcePath); + } + } + return Array.from(writtenResourcePaths); + } + #getPossibleResultStageSignatures() { const projectSourceSignature = this.#sourceIndex.getSignature(); @@ -236,7 +269,11 @@ export default class ProjectBuildCache { #getResultStageSignature() { const projectSourceSignature = this.#sourceIndex.getSignature(); - const combinedDepSignature = createDependencySignature(Array.from(this.#currentDependencySignatures.values())); + const dependencySignatures = []; + for (const [, depSignature] of this.#currentStageSignatures.values()) { + dependencySignatures.push(depSignature); + } + const combinedDepSignature = createDependencySignature(dependencySignatures); return createStageSignature(projectSourceSignature, combinedDepSignature); } @@ -290,7 +327,7 @@ export default class ProjectBuildCache { const stageChanged = this.#project.setStage(stageName, stageCache.stage); // Store dependency signature for later use in result stage signature calculation - this.#currentDependencySignatures.set(taskName, stageCache.signature.split("-")[1]); + this.#currentStageSignatures.set(stageName, stageCache.signature.split("-")); // Cached stage might differ from the previous one // Add all resources written by the cached stage to the set of written/potentially changed resources @@ -334,7 +371,7 @@ export default class ProjectBuildCache { if (deltaStageCache) { // Store dependency signature for later use in result stage signature calculation const [foundProjectSig, foundDepSig] = deltaStageCache.signature.split("-"); - this.#currentDependencySignatures.set(taskName, foundDepSig); + this.#currentStageSignatures.set(stageName, [foundProjectSig, foundDepSig]); const projectDeltaInfo = projectDeltas.get(foundProjectSig); const dependencyDeltaInfo = depDeltas.get(foundDepSig); @@ -397,16 +434,44 @@ export default class ProjectBuildCache { const stageCache = await firstTruthy(stageSignatures.map(async (stageSignature) => { const stageMetadata = await this.#cacheManager.readStageCache( this.#project.getId(), this.#buildSignature, stageName, stageSignature); - if (stageMetadata) { - log.verbose(`Found cached stage with signature ${stageSignature}`); - const reader = this.#createReaderForStageCache( - stageName, stageSignature, stageMetadata.resourceMetadata); - return { - signature: stageSignature, - stage: reader, - writtenResourcePaths: Object.keys(stageMetadata.resourceMetadata), - }; + if (!stageMetadata) { + return; + } + log.verbose(`Found cached stage with signature ${stageSignature}`); + const {resourceMapping, resourceMetadata} = stageMetadata; + let writtenResourcePaths; + let stageReader; + if (resourceMapping) { + writtenResourcePaths = []; + // Restore writer collection + const readers = resourceMetadata.map((metadata) => { + writtenResourcePaths.push(...Object.keys(metadata)); + return this.#createReaderForStageCache( + stageName, stageSignature, metadata); + }); + + const writerMapping = Object.create(null); + for (const [resourcePath, metadataIndex] of Object.entries(resourceMapping)) { + if (!readers[metadataIndex]) { + throw new Error(`Inconsistent stage cache: No resource metadata ` + + `found at index ${metadataIndex} for resource ${resourcePath}`); + } + writerMapping[resourcePath] = readers[metadataIndex]; + } + + stageReader = createWriterCollection({ + name: `Restored cached stage ${stageName} for project ${this.#project.getName()}`, + writerMapping, + }); + } else { + writtenResourcePaths = Object.keys(resourceMetadata); + stageReader = this.#createReaderForStageCache(stageName, stageSignature, resourceMetadata); } + return { + signature: stageSignature, + stage: stageReader, + writtenResourcePaths, + }; })); return stageCache; } @@ -458,7 +523,7 @@ export default class ProjectBuildCache { } else { // Stage instance reader = cacheInfo.previousStageCache.stage.getWriter() ?? - cacheInfo.previousStageCache.stage.getReader(); + cacheInfo.previousStageCache.stage.getCachedWriter(); } const previousWrittenResources = await reader.byGlob("/**/*"); for (const res of previousWrittenResources) { @@ -475,7 +540,8 @@ export default class ProjectBuildCache { this.#currentDependencyReader ); // If provided, set dependency signature for later use in result stage signature calculation - this.#currentDependencySignatures.set(taskName, currentSignaturePair[1]); + const stageName = this.#getStageNameForTask(taskName); + this.#currentStageSignatures.set(stageName, currentSignaturePair); stageSignature = createStageSignature(...currentSignaturePair); } @@ -577,7 +643,6 @@ export default class ProjectBuildCache { // Reset updated resource paths this.#writtenResultResourcePaths = []; - this.#currentDependencySignatures = new Map(); return changedPaths; } @@ -724,7 +789,7 @@ export default class ProjectBuildCache { */ async writeCache(buildManifest) { await Promise.all([ - this.#writeResultStageCache(), + this.#writeResultCache(), this.#writeTaskStageCaches(), this.#writeTaskMetadataCaches(), @@ -734,7 +799,7 @@ export default class ProjectBuildCache { } /** - * Writes the result stage to persistent cache storage + * Writes the result metadata to persistent cache storage * * Collects all resources from the result stage (excluding source reader), * stores their content via the cache manager, and writes stage metadata @@ -742,38 +807,23 @@ export default class ProjectBuildCache { * * @returns {Promise} */ - async #writeResultStageCache() { + async #writeResultCache() { const stageSignature = this.#currentResultSignature; if (stageSignature === this.#cachedResultSignature) { // No changes to already cached result stage return; } - const stageId = "result"; - const deltaReader = this.#project.getReader({excludeSourceReader: true}); - const resources = await deltaReader.byGlob("/**/*"); - const resourceMetadata = Object.create(null); - log.verbose(`Writing result cache for project ${this.#project.getName()}:\n` + - `- Result stage signature is: ${stageSignature}\n` + - `- Cache state: ${this.#cacheState}\n` + - `- Storing ${resources.length} resources`); - - await Promise.all(resources.map(async (res) => { - // Store resource content in cacache via CacheManager - await this.#cacheManager.writeStageResource(this.#buildSignature, stageId, stageSignature, res); - - resourceMetadata[res.getOriginalPath()] = { - inode: res.getInode(), - lastModified: res.getLastModified(), - size: await res.getSize(), - integrity: await res.getIntegrity(), - }; - })); + log.verbose(`Storing result metadata for project ${this.#project.getName()}`); + const stageSignatures = Object.create(null); + for (const [stageName, stageSigs] of this.#currentStageSignatures.entries()) { + stageSignatures[stageName] = stageSigs.join("-"); + } const metadata = { - resourceMetadata, + stageSignatures, }; - await this.#cacheManager.writeStageCache( - this.#project.getId(), this.#buildSignature, stageId, stageSignature, metadata); + await this.#cacheManager.writeResultMetadata( + this.#project.getId(), this.#buildSignature, stageSignature, metadata); } async #writeTaskStageCaches() { @@ -787,29 +837,53 @@ export default class ProjectBuildCache { await Promise.all(stageQueue.map(async ([stageId, stageSignature]) => { const {stage} = this.#stageCache.getCacheForSignature(stageId, stageSignature); const writer = stage.getWriter(); - const reader = writer.collection ? writer.collection : writer; - const resources = await reader.byGlob("/**/*"); - const resourceMetadata = Object.create(null); - await Promise.all(resources.map(async (res) => { - // Store resource content in cacache via CacheManager - await this.#cacheManager.writeStageResource(this.#buildSignature, stageId, stageSignature, res); - - resourceMetadata[res.getOriginalPath()] = { - inode: res.getInode(), - lastModified: res.getLastModified(), - size: await res.getSize(), - integrity: await res.getIntegrity(), - }; - })); - const metadata = { - resourceMetadata, - }; + let metadata; + if (writer.getMapping) { + const writerMapping = writer.getMapping(); + // Ensure unique readers are used + const readers = Array.from(new Set(Object.values(writerMapping))); + // Map mapping entries to reader indices + const resourceMapping = Object.create(null); + for (const [virPath, reader] of Object.entries(writerMapping)) { + const readerIdx = readers.indexOf(reader); + resourceMapping[virPath] = readerIdx; + } + + const resourceMetadata = await Promise.all(readers.map(async (reader, idx) => { + const resources = await reader.byGlob("/**/*"); + + return await this.#writeStageResources(resources, stageId, stageSignature); + })); + + metadata = {resourceMapping, resourceMetadata}; + } else { + const resources = await writer.byGlob("/**/*"); + const resourceMetadata = await this.#writeStageResources(resources, stageId, stageSignature); + metadata = {resourceMetadata}; + } + await this.#cacheManager.writeStageCache( this.#project.getId(), this.#buildSignature, stageId, stageSignature, metadata); })); } + async #writeStageResources(resources, stageId, stageSignature) { + const resourceMetadata = Object.create(null); + await Promise.all(resources.map(async (res) => { + // Store resource content in cacache via CacheManager + await this.#cacheManager.writeStageResource(this.#buildSignature, stageId, stageSignature, res); + + resourceMetadata[res.getOriginalPath()] = { + inode: res.getInode(), + lastModified: res.getLastModified(), + size: await res.getSize(), + integrity: await res.getIntegrity(), + }; + })); + return resourceMetadata; + } + async #writeTaskMetadataCaches() { // Store task caches for (const [taskName, taskCache] of this.#taskCache) { @@ -903,6 +977,7 @@ export default class ProjectBuildCache { lastModified, integrity, inode, + project: this.#project, }); } }); diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index a3620887f12..dae4c8974d0 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -34,7 +34,6 @@ class Project extends Specification { } this._resourceTagCollection = null; - this._initStageMetadata(); } /** @@ -48,6 +47,7 @@ class Project extends Specification { async init(parameters) { await super.init(parameters); + this._initStageMetadata(); this._buildManifest = parameters.buildManifest; await this._configureAndValidatePaths(this._config); @@ -275,12 +275,11 @@ class Project extends Specification { * @param {object} [options] * @param {string} [options.style=buildtime] Path style to access resources. * Can be "buildtime", "dist", "runtime" or "flat" - * @param {boolean} [options.excludeSourceReader] If set to true, the source reader is omitted * @returns {@ui5/fs/ReaderCollection} A reader collection instance */ - getReader({style = "buildtime", excludeSourceReader} = {}) { + getReader({style = "buildtime"} = {}) { let reader = this.#currentStageReaders.get(style); - if (reader && !excludeSourceReader) { + if (reader) { // Use cached reader return reader; } @@ -292,28 +291,25 @@ class Project extends Specification { if (currentWriter) { this._addReadersForWriter(readers, currentWriter, style); } else { - const currentReader = this.#currentStage.getCacheReader(); + const currentReader = this.#currentStage.getCachedWriter(); if (currentReader) { this._addReadersForWriter(readers, currentReader, style); } } } // Add readers for previous stages and source - readers.push(...this.#getReaders(style, excludeSourceReader)); + readers.push(...this.#getReaders(style)); reader = createReaderCollectionPrioritized({ name: `Reader collection for stage '${this.#currentStageId}' of project ${this.getName()}`, readers }); - if (excludeSourceReader) { - return reader; - } this.#currentStageReaders.set(style, reader); return reader; } - #getReaders(style = "buildtime", excludeSourceReader) { + #getReaders(style = "buildtime") { const readers = []; // Add writers for previous stages as readers @@ -324,11 +320,9 @@ class Project extends Specification { this.#addReaderForStage(this.#stages[i], readers, style); } - if (excludeSourceReader) { - return readers; - } // Finally add the project's source reader readers.push(this._getStyledReader(style)); + return readers; } @@ -347,7 +341,7 @@ class Project extends Specification { * @returns {@ui5/fs/DuplexCollection} DuplexCollection */ getWorkspace() { - if (this.#currentStage.getId() === RESULT_STAGE_ID) { + if (this.#currentStageId === RESULT_STAGE_ID) { throw new Error( `Workspace of project ${this.getName()} is currently not available. ` + `This might indicate that the project has already finished building ` + @@ -378,7 +372,7 @@ class Project extends Specification { * */ useResultStage() { - this.#currentStage = this.#stages.find((s) => s.getId() === RESULT_STAGE_ID); + this.#currentStage = null; this.#currentStageId = RESULT_STAGE_ID; this.#currentStageReadIndex = this.#stages.length - 1; // Read from all stages @@ -402,9 +396,9 @@ class Project extends Specification { if (writer) { this._addReadersForWriter(readers, writer, style); } else { - const reader = stage.getCacheReader(); + const reader = stage.getCachedWriter(); if (reader) { - readers.push(reader); + this._addReadersForWriter(readers, reader, style); } } } @@ -444,12 +438,12 @@ class Project extends Specification { this.#currentStageWorkspace = null; } - setStage(stageId, stageOrCacheReader) { + setStage(stageId, stageOrCachedWriter) { const stageIdx = this.#stages.findIndex((s) => s.getId() === stageId); if (stageIdx === -1) { throw new Error(`Stage '${stageId}' does not exist in project ${this.getName()}`); } - if (!stageOrCacheReader) { + if (!stageOrCachedWriter) { throw new Error( `Invalid stage or cache reader provided for stage '${stageId}' in project ${this.getName()}`); } @@ -459,14 +453,14 @@ class Project extends Specification { `Stage ID mismatch for stage '${stageId}' in project ${this.getName()}`); } let newStage; - if (stageOrCacheReader instanceof Stage) { - newStage = stageOrCacheReader; + if (stageOrCachedWriter instanceof Stage) { + newStage = stageOrCachedWriter; if (oldStage === newStage) { // Same stage as before return false; // Stored stage has not changed } } else { - newStage = new Stage(stageId, undefined, stageOrCacheReader); + newStage = new Stage(stageId, undefined, stageOrCachedWriter); } this.#stages[stageIdx] = newStage; @@ -480,19 +474,6 @@ class Project extends Specification { return true; // Indicate that the stored stage has changed } - setResultStage(stageOrCacheReader) { - this._initStageMetadata(); - - let resultStage; - if (stageOrCacheReader instanceof Stage) { - resultStage = stageOrCacheReader; - } else { - resultStage = new Stage(RESULT_STAGE_ID, undefined, stageOrCacheReader); - } - - this.#stages.push(resultStage); - } - /* Overwritten in ComponentProject subclass */ _addReadersForWriter(readers, writer, style) { readers.unshift(writer); @@ -530,16 +511,16 @@ class Project extends Specification { class Stage { #id; #writer; - #cacheReader; + #cachedWriter; - constructor(id, writer, cacheReader) { - if (writer && cacheReader) { + constructor(id, writer, cachedWriter) { + if (writer && cachedWriter) { throw new Error( `Stage '${id}' cannot have both a writer and a cache reader`); } this.#id = id; this.#writer = writer; - this.#cacheReader = cacheReader; + this.#cachedWriter = cachedWriter; } getId() { @@ -550,8 +531,8 @@ class Stage { return this.#writer; } - getCacheReader() { - return this.#cacheReader; + getCachedWriter() { + return this.#cachedWriter; } } From 866c68074a1bc698ee2aa8bf6fe3823480abb3ce Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 20 Jan 2026 13:00:34 +0100 Subject: [PATCH 097/110] refactor(server): Integrate BuildServer --- .../lib/middleware/MiddlewareManager.js | 6 +- .../server/lib/middleware/serveResources.js | 2 +- packages/server/lib/server.js | 78 ++++++++++--------- 3 files changed, 45 insertions(+), 41 deletions(-) diff --git a/packages/server/lib/middleware/MiddlewareManager.js b/packages/server/lib/middleware/MiddlewareManager.js index 475dbec2420..10348b82154 100644 --- a/packages/server/lib/middleware/MiddlewareManager.js +++ b/packages/server/lib/middleware/MiddlewareManager.js @@ -21,17 +21,19 @@ const hasOwn = Function.prototype.call.bind(Object.prototype.hasOwnProperty); * @alias @ui5/server/internal/MiddlewareManager */ class MiddlewareManager { - constructor({graph, rootProject, resources, options = { + constructor({graph, rootProject, sources, resources, buildReader, options = { sendSAPTargetCSP: false, serveCSPReports: false }}) { - if (!graph || !rootProject || !resources || !resources.all || + if (!graph || !rootProject || !sources || !resources || !resources.all || !resources.rootProject || !resources.dependencies) { throw new Error("[MiddlewareManager]: One or more mandatory parameters not provided"); } this.graph = graph; this.rootProject = rootProject; + this.sources = sources; this.resources = resources; + this.buildReader = buildReader; this.options = options; this.middleware = Object.create(null); diff --git a/packages/server/lib/middleware/serveResources.js b/packages/server/lib/middleware/serveResources.js index 74528972ada..e0a96ce2441 100644 --- a/packages/server/lib/middleware/serveResources.js +++ b/packages/server/lib/middleware/serveResources.js @@ -47,7 +47,7 @@ function createMiddleware({resources, middlewareUtil}) { // Pipe resource stream to response // TODO: Check whether we can optimize this for small or even all resources by using getBuffer() - resource.getStream().pipe(res); + res.send(await resource.getBuffer()); } catch (err) { next(err); } diff --git a/packages/server/lib/server.js b/packages/server/lib/server.js index eb0a6c600c1..5025d335af8 100644 --- a/packages/server/lib/server.js +++ b/packages/server/lib/server.js @@ -137,51 +137,52 @@ export async function serve(graph, { acceptRemoteConnections = false, sendSAPTargetCSP = false, simpleIndex = false, serveCSPReports = false }) { const rootProject = graph.getRoot(); - const watchHandler = await graph.build({ - includedDependencies: ["*"], - watch: true, + + const readers = []; + await graph.traverseBreadthFirst(async function({project: dep}) { + if (dep.getName() === rootProject.getName()) { + // Ignore root project + return; + } + readers.push(dep.getSourceReader("runtime")); }); - async function createReaders() { - const readers = []; - await graph.traverseBreadthFirst(async function({project: dep}) { - if (dep.getName() === rootProject.getName()) { - // Ignore root project - return; - } - readers.push(dep.getReader({style: "runtime"})); - }); + const dependencies = createReaderCollection({ + name: `Dependency reader collection for sources of project ${rootProject.getName()}`, + readers + }); - const dependencies = createReaderCollection({ - name: `Dependency reader collection for project ${rootProject.getName()}`, - readers - }); + const rootReader = rootProject.getSourceReader("runtime"); - const rootReader = rootProject.getReader({style: "runtime"}); - // TODO change to ReaderCollection once duplicates are sorted out - const combo = new ReaderCollectionPrioritized({ - name: "server - prioritize workspace over dependencies", - readers: [rootReader, dependencies] - }); - const resources = { - rootProject: rootReader, - dependencies: dependencies, - all: combo - }; - return resources; + // TODO change to ReaderCollection once duplicates are sorted out + const combo = new ReaderCollectionPrioritized({ + name: "Server: Reader for sources of all projects", + readers: [rootReader, dependencies] + }); + const sources = { + rootProject: rootReader, + dependencies: dependencies, + all: combo + }; + + const initialBuildIncludedDependencies = []; + if (graph.getProject("sap.ui.core")) { + // Ensure sap.ui.core is always built initially (if present in the graph) + initialBuildIncludedDependencies.push("sap.ui.core"); } + const buildServer = await graph.serve({ + initialBuildIncludedDependencies, + excludedTasks: ["minify"], + }); - const resources = await createReaders(); + const resources = { + rootProject: buildServer.getRootReader(), + dependencies: buildServer.getDependenciesReader(), + all: buildServer.getReader(), + }; - watchHandler.on("projectResourcesUpdated", async () => { - const newResources = await createReaders(); - // Patch resources - resources.rootProject = newResources.rootProject; - resources.dependencies = newResources.dependencies; - resources.all = newResources.all; - }); - watchHandler.on("error", async (err) => { - log.error(`Watch handler error: ${err.message}`); + buildServer.on("error", async (err) => { + log.error(`Error during project build: ${err.message}`); log.verbose(err.stack); process.exit(1); }); @@ -189,6 +190,7 @@ export async function serve(graph, { const middlewareManager = new MiddlewareManager({ graph, rootProject, + sources, resources, options: { sendSAPTargetCSP, From b8844874d93f45c987fceeb124daf566f9f9d8b7 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 20 Jan 2026 14:42:56 +0100 Subject: [PATCH 098/110] refactor(project): Small build task cache restructuring, cleanup --- packages/project/lib/build/ProjectBuilder.js | 77 ------------------- .../project/lib/build/cache/CacheManager.js | 18 +++-- .../lib/build/cache/ProjectBuildCache.js | 31 +------- .../lib/specifications/ComponentProject.js | 17 ---- 4 files changed, 15 insertions(+), 128 deletions(-) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 9ddd82c384f..48fecb77e57 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -313,83 +313,6 @@ class ProjectBuilder { return builtProjects; } - // async #updateBuild(projectBuildContexts, requestedProjects, fsTarget) { - // const cleanupSigHooks = this._registerCleanupSigHooks(); - // try { - // const startTime = process.hrtime(); - // await this.#update(projectBuildContexts, requestedProjects, fsTarget); - // this.#log.info(`Update succeeded in ${this._getElapsedTime(startTime)}`); - // } catch (err) { - // this.#log.error(`Update failed`); - // throw err; - // } finally { - // this._deregisterCleanupSigHooks(cleanupSigHooks); - // await this._executeCleanupTasks(); - // } - // } - - // async #update(projectBuildContexts, requestedProjects, fsTarget) { - // const queue = []; - // // await this._graph.traverseDepthFirst(async ({project}) => { - // // const projectName = project.getName(); - // // const projectBuildContext = projectBuildContexts.get(projectName); - // // if (projectBuildContext) { - // // // Build context exists - // // // => This project needs to be built or, in case it has already - // // // been built, it's build result needs to be written out (if requested) - // // queue.push(projectBuildContext); - // // } - // // }); - - // // this.#log.setProjects(queue.map((projectBuildContext) => { - // // return projectBuildContext.getProject().getName(); - // // })); - - // const pWrites = []; - // while (queue.length) { - // const projectBuildContext = queue.shift(); - // const project = projectBuildContext.getProject(); - // const projectName = project.getName(); - // const projectType = project.getType(); - // this.#log.verbose(`Updating project ${projectName}...`); - - // let changedPaths = await projectBuildContext.prepareProjectBuildAndValidateCache(); - // if (changedPaths) { - // this.#log.skipProjectBuild(projectName, projectType); - // } else { - // changedPaths = await this._buildProject(projectBuildContext); - // } - - // if (changedPaths.length) { - // for (const pbc of queue) { - // // Propagate resource changes to following projects - // pbc.getBuildCache().dependencyResourcesChanged(changedPaths); - // } - // } - // if (!requestedProjects.includes(projectName)) { - // // Project has not been requested - // // => Its resources shall not be part of the build result - // continue; - // } - - // if (fsTarget) { - // this.#log.verbose(`Writing out files...`); - // pWrites.push(this._writeResults(projectBuildContext, fsTarget)); - // } - - // if (process.env.UI5_BUILD_NO_CACHE_UPDATE) { - // continue; - // } - // this.#log.verbose(`Triggering cache write...`); - // // const buildManifest = await createBuildManifest( - // // project, - // // this._graph, this._buildContext.getBuildConfig(), this._buildContext.getTaskRepository(), - // // projectBuildContext.getBuildSignature()); - // pWrites.push(projectBuildContext.getBuildCache().writeCache()); - // } - // await Promise.all(pWrites); - // } - async _buildProject(projectBuildContext) { const project = projectBuildContext.getProject(); const projectName = project.getName(); diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index 85f0b5b75d3..a2c6e476aab 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -291,11 +291,12 @@ export default class CacheManager { * @param {string} packageName - Package/project identifier * @param {string} buildSignature - Build signature hash * @param {string} taskName + * @param {string} type - "project" or "dependency" * @returns {string} Absolute path to the stage metadata file */ - #getTaskMetadataPath(packageName, buildSignature, taskName) { + #getTaskMetadataPath(packageName, buildSignature, taskName, type) { const pkgDir = getPathFromPackageName(packageName); - return path.join(this.#taskMetadataDir, pkgDir, buildSignature, taskName, `metadata.json`); + return path.join(this.#taskMetadataDir, pkgDir, buildSignature, taskName, `${type}.json`); } /** @@ -307,12 +308,14 @@ export default class CacheManager { * @param {string} projectId - Project identifier (typically package name) * @param {string} buildSignature - Build signature hash * @param {string} taskName + * @param {string} type - "project" or "dependency" * @returns {Promise} Parsed stage metadata or null if not found * @throws {Error} If file read fails for reasons other than file not existing */ - async readTaskMetadata(projectId, buildSignature, taskName) { + async readTaskMetadata(projectId, buildSignature, taskName, type) { try { - const metadata = await readFile(this.#getTaskMetadataPath(projectId, buildSignature, taskName), "utf8"); + const metadata = await readFile( + this.#getTaskMetadataPath(projectId, buildSignature, taskName, type), "utf8"); return JSON.parse(metadata); } catch (err) { if (err.code === "ENOENT") { @@ -320,7 +323,7 @@ export default class CacheManager { return null; } throw new Error(`Failed to read task metadata from cache for ` + - `${projectId} / ${buildSignature} / ${taskName}: ${err.message}`, { + `${projectId} / ${buildSignature} / ${taskName} / ${type}: ${err.message}`, { cause: err, }); } @@ -335,11 +338,12 @@ export default class CacheManager { * @param {string} projectId - Project identifier (typically package name) * @param {string} buildSignature - Build signature hash * @param {string} taskName + * @param {string} type - "project" or "dependency" * @param {object} metadata - Stage metadata object to serialize * @returns {Promise} */ - async writeTaskMetadata(projectId, buildSignature, taskName, metadata) { - const metadataPath = this.#getTaskMetadataPath(projectId, buildSignature, taskName); + async writeTaskMetadata(projectId, buildSignature, taskName, type, metadata) { + const metadataPath = this.#getTaskMetadataPath(projectId, buildSignature, taskName, type); await mkdir(path.dirname(metadataPath), {recursive: true}); await writeFile(metadataPath, JSON.stringify(metadata, null, 2), "utf8"); } diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index adcb080ac76..7725d64b6f0 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -683,13 +683,13 @@ export default class ProjectBuildCache { const buildTaskCaches = await Promise.all( indexCache.tasks.map(async ([taskName, supportsDifferentialUpdates]) => { const projectRequests = await this.#cacheManager.readTaskMetadata( - this.#project.getId(), this.#buildSignature, `${taskName}-pr`); + this.#project.getId(), this.#buildSignature, taskName, "project"); if (!projectRequests) { throw new Error(`Failed to load project request cache for task ` + `${taskName} in project ${this.#project.getName()}`); } const dependencyRequests = await this.#cacheManager.readTaskMetadata( - this.#project.getId(), this.#buildSignature, `${taskName}-dr`); + this.#project.getId(), this.#buildSignature, taskName, "dependencies"); if (!dependencyRequests) { throw new Error(`Failed to load dependency request cache for task ` + `${taskName} in project ${this.#project.getName()}`); @@ -708,29 +708,6 @@ export default class ProjectBuildCache { } else { this.#cacheState = CACHE_STATES.INITIALIZED; } - // // Invalidate tasks based on changed resources - // // Note: If the changed paths don't affect any task, the index cache still can't be used due to the - // // root hash mismatch. - // // Since no tasks have been invalidated, a rebuild is still necessary in this case, so that - // // each task can find and use its individual stage cache. - // // Hence requiresInitialBuild will be set to true in this case (and others. - // // const tasksInvalidated = await this.#invalidateTasks(changedPaths, []); - // // if (!tasksInvalidated) { - - // // } - // } else if (indexCache.indexTree.root.hash !== resourceIndex.getSignature()) { - // // Validate index signature matches with cached signature - // throw new Error( - // `Resource index signature mismatch for project ${this.#project.getName()}: ` + - // `expected ${indexCache.indexTree.root.hash}, got ${resourceIndex.getSignature()}`); - // } - - // else { - // log.verbose( - // `Resource index signature for project ${this.#project.getName()} matches cached signature: ` + - // `${resourceIndex.getSignature()}`); - // // this.#cachedSourceSignature = resourceIndex.getSignature(); - // } this.#sourceIndex = resourceIndex; this.#cachedSourceSignature = resourceIndex.getSignature(); this.#changedProjectSourcePaths = changedPaths; @@ -894,11 +871,11 @@ export default class ProjectBuildCache { const writes = []; if (projectRequests) { writes.push(this.#cacheManager.writeTaskMetadata( - this.#project.getId(), this.#buildSignature, `${taskName}-pr`, projectRequests)); + this.#project.getId(), this.#buildSignature, taskName, "project", projectRequests)); } if (dependencyRequests) { writes.push(this.#cacheManager.writeTaskMetadata( - this.#project.getId(), this.#buildSignature, `${taskName}-dr`, dependencyRequests)); + this.#project.getId(), this.#buildSignature, taskName, "dependencies", dependencyRequests)); } await Promise.all(writes); } diff --git a/packages/project/lib/specifications/ComponentProject.js b/packages/project/lib/specifications/ComponentProject.js index cea92e5b6e6..d595d0085ff 100644 --- a/packages/project/lib/specifications/ComponentProject.js +++ b/packages/project/lib/specifications/ComponentProject.js @@ -150,23 +150,6 @@ class ComponentProject extends Project { throw new Error(`_getTestReader must be implemented by subclass ${this.constructor.name}`); } - // /** - // * Get a resource reader/writer for accessing and modifying a project's resources - // * - // * @public - // * @returns {@ui5/fs/ReaderCollection} A reader collection instance - // */ - // getWorkspace() { - // // Workspace is always of style "buildtime" - // // Therefore builder resource-excludes are always to be applied - // const excludes = this.getBuilderResourcesExcludes(); - // return resourceFactory.createWorkspace({ - // name: `Workspace for project ${this.getName()}`, - // reader: this._getPlainReader(excludes), - // writer: this._createWriter().collection - // }); - // } - _createWriter() { // writer is always of style "buildtime" const namespaceWriter = resourceFactory.createAdapter({ From 23fa96b23a145e17b38a54ea7ee26fa6e5af3fcc Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 20 Jan 2026 15:00:38 +0100 Subject: [PATCH 099/110] refactor(project): JSDoc cleanup --- .../lib/build/cache/ProjectBuildCache.js | 197 +++++++++++++----- .../lib/build/cache/ResourceRequestManager.js | 162 ++++++++++++-- 2 files changed, 293 insertions(+), 66 deletions(-) diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 7725d64b6f0..16a9bb5725b 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -23,12 +23,14 @@ export const CACHE_STATES = Object.freeze({ /** * @typedef {object} StageMetadata * @property {Object} resourceMetadata + * Resource metadata indexed by resource path */ /** * @typedef {object} StageCacheEntry - * @property {@ui5/fs/AbstractReader} stage - Reader for the cached stage - * @property {string[]} writtenResourcePaths - Set of resource paths written by the task + * @property {string} signature Signature of the cached stage + * @property {@ui5/fs/AbstractReader} stage Reader for the cached stage + * @property {string[]} writtenResourcePaths Array of resource paths written by the task */ export default class ProjectBuildCache { @@ -55,11 +57,11 @@ export default class ProjectBuildCache { /** * Creates a new ProjectBuildCache instance + * Use ProjectBuildCache.create() instead * - * @private - Use ProjectBuildCache.create() instead - * @param {object} project - Project instance - * @param {string} buildSignature - Build signature for the current build - * @param {object} cacheManager - Cache manager instance for reading/writing cache data + * @param {@ui5/project/specifications/Project} project Project instance + * @param {string} buildSignature Build signature for the current build + * @param {object} cacheManager Cache manager instance for reading/writing cache data */ constructor(project, buildSignature, cacheManager) { log.verbose( @@ -75,10 +77,11 @@ export default class ProjectBuildCache { * This is the recommended way to create a ProjectBuildCache as it ensures * proper asynchronous initialization of the resource index and cache loading. * - * @param {object} project - Project instance - * @param {string} buildSignature - Build signature for the current build - * @param {object} cacheManager - Cache manager instance - * @returns {Promise} Initialized cache instance + * @public + * @param {@ui5/project/specifications/Project} project Project instance + * @param {string} buildSignature Build signature for the current build + * @param {object} cacheManager Cache manager instance + * @returns {Promise<@ui5/project/build/cache/ProjectBuildCache>} Initialized cache instance */ static async create(project, buildSignature, cacheManager) { const cache = new ProjectBuildCache(project, buildSignature, cacheManager); @@ -92,10 +95,12 @@ export default class ProjectBuildCache { * The dependency reader is used by tasks to access resources from project * dependencies. Must be set before tasks that require dependencies are executed. * - * @param {@ui5/fs/AbstractReader} dependencyReader - Reader for dependency resources - * @param {boolean} [forceDependencyUpdate=false] - * @returns {Promise} Undefined if no cache has been found. Otherwise a list of changed - * resources + * @public + * @param {@ui5/fs/AbstractReader} dependencyReader Reader for dependency resources + * @param {boolean} [forceDependencyUpdate=false] Force update of dependency indices + * @returns {Promise} + * Undefined if no cache has been found, false if cache is empty, + * or an array of changed resource paths */ async prepareProjectBuildAndValidateCache(dependencyReader, forceDependencyUpdate = false) { this.#currentProjectReader = this.#project.getReader(); @@ -115,7 +120,9 @@ export default class ProjectBuildCache { /** * Processes changed resources since last build, updating indices and invalidating tasks as needed - */ + * + * @returns {Promise} + */ async #flushPendingChanges() { if (this.#changedProjectSourcePaths.length === 0 && this.#changedDependencyResourcePaths.length === 0) { @@ -150,6 +157,12 @@ export default class ProjectBuildCache { this.#changedDependencyResourcePaths = []; } + /** + * Updates dependency indices for all tasks + * + * @param {@ui5/fs/AbstractReader} dependencyReader Reader for dependency resources + * @returns {Promise} + */ async #updateDependencyIndices(dependencyReader) { let depIndicesChanged = false; await Promise.all(Array.from(this.#taskCache.values()).map(async (taskCache) => { @@ -166,6 +179,12 @@ export default class ProjectBuildCache { this.#changedDependencyResourcePaths = []; } + /** + * Checks whether the cache is in a fresh state + * + * @public + * @returns {boolean} True if the cache is fresh + */ isFresh() { return this.#cacheState === CACHE_STATES.FRESH; } @@ -177,7 +196,8 @@ export default class ProjectBuildCache { * If found, creates a reader for the cached stage and sets it as the project's * result stage. * - * @returns {Promise} Array of resource paths written by the cached result stage + * @returns {Promise} + * Array of resource paths written by the cached result stage, or undefined if no cache found */ async #findResultCache() { if (this.#cacheState === CACHE_STATES.STALE && this.#currentResultSignature) { @@ -229,6 +249,12 @@ export default class ProjectBuildCache { return writtenResourcePaths; } + /** + * Imports cached stages and sets them in the project + * + * @param {Object} stageSignatures Map of stage names to their signatures + * @returns {Promise} Array of resource paths written by all imported stages + */ async #importStages(stageSignatures) { const stageNames = Object.keys(stageSignatures); this.#project.initStages(stageNames); @@ -252,6 +278,11 @@ export default class ProjectBuildCache { return Array.from(writtenResourcePaths); } + /** + * Calculates all possible result stage signatures based on current state + * + * @returns {string[]} Array of possible result stage signatures + */ #getPossibleResultStageSignatures() { const projectSourceSignature = this.#sourceIndex.getSignature(); @@ -267,6 +298,11 @@ export default class ProjectBuildCache { }); } + /** + * Gets the current result stage signature + * + * @returns {string} Current result stage signature + */ #getResultStageSignature() { const projectSourceSignature = this.#sourceIndex.getSignature(); const dependencySignatures = []; @@ -288,8 +324,11 @@ export default class ProjectBuildCache { * 3. Attempts to find a cached stage for the task * 4. Returns whether the task needs to be executed * - * @param {string} taskName - Name of the task to prepare - * @returns {Promise} True or object if task can use cache, false otherwise + * @public + * @param {string} taskName Name of the task to prepare + * @returns {Promise} + * True if task can use cache, false if task needs execution, + * or an object with cache information for differential updates */ async prepareTaskExecutionAndValidateCache(taskName) { const stageName = this.#getStageNameForTask(taskName); @@ -410,10 +449,10 @@ export default class ProjectBuildCache { * Checks both in-memory stage cache and persistent cache storage for a matching * stage signature. Returns the first matching cached stage found. * - * @private - * @param {string} stageName - Name of the stage to find - * @param {string[]} stageSignatures - Possible signatures for the stage - * @returns {Promise} Cached stage entry or null if not found + * @param {string} stageName Name of the stage to find + * @param {string[]} stageSignatures Possible signatures for the stage + * @returns {Promise<@ui5/project/build/cache/ProjectBuildCache~StageCacheEntry|undefined>} + * Cached stage entry or undefined if not found */ async #findStageCache(stageName, stageSignatures) { if (!stageSignatures.length) { @@ -485,13 +524,14 @@ export default class ProjectBuildCache { * 3. Invalidates downstream tasks if they depend on written resources * 4. Removes the task from the invalidated tasks list * - * @param {string} taskName - Name of the executed task + * @public + * @param {string} taskName Name of the executed task * @param {@ui5/project/build/cache/BuildTaskCache~ResourceRequests} projectResourceRequests - * Resource requests for project resources + * Resource requests for project resources * @param {@ui5/project/build/cache/BuildTaskCache~ResourceRequests|undefined} dependencyResourceRequests - * Resource requests for dependency resources - * @param {object} cacheInfo - * @param {boolean} supportsDifferentialUpdates - Whether the task supports differential updates + * Resource requests for dependency resources + * @param {object} cacheInfo Cache information for differential updates + * @param {boolean} supportsDifferentialUpdates Whether the task supports differential updates * @returns {Promise} */ async recordTaskResult( @@ -568,8 +608,10 @@ export default class ProjectBuildCache { /** * Returns the task cache for a specific task * - * @param {string} taskName - Name of the task - * @returns {BuildTaskCache|undefined} The task cache or undefined if not found + * @public + * @param {string} taskName Name of the task + * @returns {@ui5/project/build/cache/BuildTaskCache|undefined} + * The task cache or undefined if not found */ getTaskCache(taskName) { return this.#taskCache.get(taskName); @@ -578,7 +620,8 @@ export default class ProjectBuildCache { /** * Records changed source files of the project and marks cache as stale * - * @param {string[]} changedPaths - Changed project source file paths + * @public + * @param {string[]} changedPaths Changed project source file paths */ projectSourcesChanged(changedPaths) { for (const resourcePath of changedPaths) { @@ -595,7 +638,8 @@ export default class ProjectBuildCache { /** * Records changed dependency resources and marks cache as stale * - * @param {string[]} changedPaths - Changed dependency resource paths + * @public + * @param {string[]} changedPaths Changed dependency resource paths */ dependencyResourcesChanged(changedPaths) { for (const resourcePath of changedPaths) { @@ -615,7 +659,8 @@ export default class ProjectBuildCache { * Creates stage names for each task and initializes them in the project. * This must be called before task execution begins. * - * @param {string[]} taskNames - Array of task names to initialize stages for + * @public + * @param {string[]} taskNames Array of task names to initialize stages for * @returns {Promise} */ async setTasks(taskNames) { @@ -632,7 +677,8 @@ export default class ProjectBuildCache { * final result stage containing all build outputs. * Also updates the result resource index accordingly. * - * @returns {Promise} Resolves with list of changed resources since the last build + * @public + * @returns {Promise} Array of changed resource paths since the last build */ async allTasksCompleted() { this.#project.useResultStage(); @@ -649,8 +695,7 @@ export default class ProjectBuildCache { /** * Generates the stage name for a given task * - * @private - * @param {string} taskName - Name of the task + * @param {string} taskName Name of the task * @returns {string} Stage name in the format "task/{taskName}" */ #getStageNameForTask(taskName) { @@ -664,7 +709,7 @@ export default class ProjectBuildCache { * the index against current source files and invalidates affected tasks if * resources have changed. If no cache exists, creates a fresh index. * - * @private + * @returns {Promise} * @throws {Error} If cached index signature doesn't match computed signature */ async #initSourceIndex() { @@ -719,6 +764,12 @@ export default class ProjectBuildCache { } } + /** + * Updates the source index with changed resource paths + * + * @param {string[]} changedResourcePaths Array of changed resource paths + * @returns {Promise} True if index was updated + */ async #updateSourceIndex(changedResourcePaths) { const sourceReader = this.#project.getSourceReader(); @@ -755,13 +806,14 @@ export default class ProjectBuildCache { * Stores all cache data to persistent storage * * This method: - * 2. Stores the result stage with all resources - * 3. Writes the resource index and task metadata - * 4. Stores all stage caches from the queue + * 1. Stores the result stage with all resources + * 2. Writes the resource index and task metadata + * 3. Stores all stage caches from the queue * - * @param {object} buildManifest - Build manifest containing metadata about the build - * @param {string} buildManifest.manifestVersion - Version of the manifest format - * @param {string} buildManifest.signature - Build signature + * @public + * @param {object} buildManifest Build manifest containing metadata about the build + * @param {string} buildManifest.manifestVersion Version of the manifest format + * @param {string} buildManifest.signature Build signature * @returns {Promise} */ async writeCache(buildManifest) { @@ -803,6 +855,11 @@ export default class ProjectBuildCache { this.#project.getId(), this.#buildSignature, stageSignature, metadata); } + /** + * Writes all pending task stage caches to persistent storage + * + * @returns {Promise} + */ async #writeTaskStageCaches() { if (!this.#stageCache.hasPendingCacheQueue()) { return; @@ -845,6 +902,14 @@ export default class ProjectBuildCache { })); } + /** + * Writes stage resources to persistent storage and returns their metadata + * + * @param {@ui5/fs/Resource[]} resources Array of resources to write + * @param {string} stageId Stage identifier + * @param {string} stageSignature Stage signature + * @returns {Promise>} Resource metadata indexed by path + */ async #writeStageResources(resources, stageId, stageSignature) { const resourceMetadata = Object.create(null); await Promise.all(resources.map(async (res) => { @@ -861,6 +926,11 @@ export default class ProjectBuildCache { return resourceMetadata; } + /** + * Writes task metadata caches to persistent storage + * + * @returns {Promise} + */ async #writeTaskMetadataCaches() { // Store task caches for (const [taskName, taskCache] of this.#taskCache) { @@ -882,6 +952,11 @@ export default class ProjectBuildCache { } } + /** + * Writes the source index cache to persistent storage + * + * @returns {Promise} + */ async #writeSourceIndex() { if (this.#cachedSourceSignature === this.#sourceIndex.getSignature()) { // No changes to already cached result index @@ -906,11 +981,10 @@ export default class ProjectBuildCache { * The reader provides virtual access to cached resources by loading them from * the cache storage on demand. Resource metadata is used to validate cache entries. * - * @private - * @param {string} stageId - Identifier for the stage (e.g., "result" or "task/{taskName}") - * @param {string} stageSignature - Signature hash of the stage - * @param {Object} resourceMetadata - Metadata for all cached resources - * @returns {Promise<@ui5/fs/AbstractReader>} Proxy reader for cached resources + * @param {string} stageId Identifier for the stage (e.g., "result" or "task/{taskName}") + * @param {string} stageSignature Signature hash of the stage + * @param {Object} resourceMetadata Metadata for all cached resources + * @returns {@ui5/fs/AbstractReader} Proxy reader for cached resources */ #createReaderForStageCache(stageId, stageSignature, resourceMetadata) { const allResourcePaths = Object.keys(resourceMetadata); @@ -961,6 +1035,12 @@ export default class ProjectBuildCache { } } +/** + * Computes the cartesian product of an array of arrays + * + * @param {Array} arrays Array of arrays to compute the product of + * @returns {Array} Array of all possible combinations + */ function cartesianProduct(arrays) { if (arrays.length === 0) return [[]]; if (arrays.some((arr) => arr.length === 0)) return []; @@ -980,6 +1060,16 @@ function cartesianProduct(arrays) { return result; } +/** + * Fast combination of two arrays into pairs + * + * Creates all possible pairs by combining each element from the first array + * with each element from the second array. + * + * @param {Array} array1 First array + * @param {Array} array2 Second array + * @returns {Array} Array of two-element pairs + */ function combineTwoArraysFast(array1, array2) { const len1 = array1.length; const len2 = array2.length; @@ -995,10 +1085,23 @@ function combineTwoArraysFast(array1, array2) { return result; } +/** + * Creates a combined stage signature from project and dependency signatures + * + * @param {string} projectSignature Project resource signature + * @param {string} dependencySignature Dependency resource signature + * @returns {string} Combined stage signature in format "projectSignature-dependencySignature" + */ function createStageSignature(projectSignature, dependencySignature) { return `${projectSignature}-${dependencySignature}`; } +/** + * Creates a combined signature hash from multiple stage dependency signatures + * + * @param {string[]} stageDependencySignatures Array of dependency signatures to combine + * @returns {string} SHA-256 hash of the combined signatures + */ function createDependencySignature(stageDependencySignatures) { return crypto.createHash("sha256").update(stageDependencySignatures.join("")).digest("hex"); } diff --git a/packages/project/lib/build/cache/ResourceRequestManager.js b/packages/project/lib/build/cache/ResourceRequestManager.js index 19e3eb64a41..587218e65a6 100644 --- a/packages/project/lib/build/cache/ResourceRequestManager.js +++ b/packages/project/lib/build/cache/ResourceRequestManager.js @@ -5,6 +5,15 @@ import TreeRegistry from "./index/TreeRegistry.js"; import {getLogger} from "@ui5/logger"; const log = getLogger("build:cache:ResourceRequestManager"); +/** + * Manages resource requests and their associated indices for a single task + * + * Tracks all resources accessed by a task during execution and maintains resource indices + * for cache validation and differential updates. Supports both full and delta-based caching + * strategies. + * + * @class + */ class ResourceRequestManager { #taskName; #projectName; @@ -17,6 +26,15 @@ class ResourceRequestManager { #useDifferentialUpdate; #unusedAtLeastOnce; + /** + * Creates a new ResourceRequestManager instance + * + * @param {string} projectName Name of the project + * @param {string} taskName Name of the task + * @param {boolean} useDifferentialUpdate Whether to track differential updates + * @param {ResourceRequestGraph} [requestGraph] Optional pre-existing request graph from cache + * @param {boolean} [unusedAtLeastOnce=false] Whether the task has been unused at least once + */ constructor(projectName, taskName, useDifferentialUpdate, requestGraph, unusedAtLeastOnce = false) { this.#projectName = projectName; this.#taskName = taskName; @@ -31,6 +49,22 @@ class ResourceRequestManager { } } + /** + * Factory method to restore a ResourceRequestManager from cached data + * + * Deserializes a previously cached request graph and its associated resource indices, + * including both root indices and delta indices for differential updates. + * + * @param {string} projectName Name of the project + * @param {string} taskName Name of the task + * @param {boolean} useDifferentialUpdate Whether to track differential updates + * @param {object} cacheData Cached metadata object + * @param {object} cacheData.requestSetGraph Serialized request graph + * @param {Array} cacheData.rootIndices Array of root resource indices + * @param {Array} [cacheData.deltaIndices] Array of delta resource indices + * @param {boolean} [cacheData.unusedAtLeastOnce] Whether the task has been unused + * @returns {ResourceRequestManager} Restored manager instance + */ static fromCache(projectName, taskName, useDifferentialUpdate, { requestSetGraph, rootIndices, deltaIndices, unusedAtLeastOnce }) { @@ -70,9 +104,10 @@ class ResourceRequestManager { * * Returns signatures from all recorded project-request sets. Each signature represents * a unique combination of resources belonging to the current project that were accessed - * during task execution. This can be used to form a cache keys for restoring cached task results. + * during task execution. This can be used to form cache keys for restoring cached task results. * - * @returns {Promise} Array of signature strings + * @public + * @returns {string[]} Array of signature strings * @throws {Error} If resource index is missing for any request set */ getIndexSignatures() { @@ -91,9 +126,15 @@ class ResourceRequestManager { } /** - * Update all indices based on current resources (no delta update) + * Updates all indices based on current resources without delta tracking * - * @param {module:@ui5/fs.AbstractReader} reader - Reader for accessing project resources + * Performs a full refresh of all resource indices by fetching current resources + * and updating or removing indexed resources as needed. Does not track changes + * between the old and new state. + * + * @public + * @param {module:@ui5/fs.AbstractReader} reader Reader for accessing project resources + * @returns {Promise} True if any changes were detected, false otherwise */ async refreshIndices(reader) { if (this.#requestGraph.getSize() === 0) { @@ -126,10 +167,15 @@ class ResourceRequestManager { } /** - * Filter relevant resource changes and update the indices if necessary + * Filters relevant resource changes and updates the indices if necessary * - * @param {module:@ui5/fs.AbstractReader} reader - Reader for accessing project resources - * @param {string[]} changedResourcePaths - Array of changed project resource path + * Processes changed resource paths, identifies which request sets are affected, + * and updates their resource indices accordingly. Supports both full updates and + * differential tracking based on the manager configuration. + * + * @public + * @param {module:@ui5/fs.AbstractReader} reader Reader for accessing project resources + * @param {string[]} changedResourcePaths Array of changed project resource paths * @returns {Promise} True if any changes were detected, false otherwise */ async updateIndices(reader, changedResourcePaths) { @@ -211,7 +257,6 @@ class ResourceRequestManager { * Tests each request against the changed resource paths using exact path matching * for 'path'/'dep-path' requests and glob pattern matching for 'patterns'/'dep-patterns' requests. * - * @private * @param {Request[]} resourceRequests - Array of resource requests to match against * @param {string[]} resourcePaths - Changed project resource paths * @returns {string[]} Array of matched resource paths @@ -231,7 +276,10 @@ class ResourceRequestManager { } /** - * Flushes all tree registries to apply batched updates, ignoring how trees changed + * Flushes all tree registries to apply batched updates without tracking changes + * + * Commits all pending tree modifications but does not record the specific changes + * (added, updated, removed resources). Used when differential updates are disabled. * * @returns {Promise} True if any changes were detected, false otherwise */ @@ -248,7 +296,11 @@ class ResourceRequestManager { } /** - * Flushes all tree registries to apply batched updates, keeping track of how trees changed + * Flushes all tree registries to apply batched updates while tracking changes + * + * Commits all pending tree modifications and records detailed information about + * which resources were added, updated, or removed. Used when differential updates + * are enabled to support incremental cache invalidation. * * @returns {Promise} True if any changes were detected, false otherwise */ @@ -285,12 +337,24 @@ class ResourceRequestManager { * Commits all pending tree modifications across all registries in parallel. * Must be called after operations that schedule updates via registries. * - * @returns {Promise} Object containing sets of added, updated, and removed resource paths + * @returns {Promise>} Array of flush results from all registries, + * each containing added, updated, unchanged, and removed resource paths */ async #flushTreeChanges() { return await Promise.all(this.#treeRegistries.map((registry) => registry.flush())); } + /** + * Adds or updates a delta entry for tracking resource index changes + * + * Records the transition from an original signature to a new signature along with + * the specific resources that changed. Accumulates changes across multiple updates. + * + * @param {string} requestSetId Identifier of the request set + * @param {string} originalSignature Original resource index signature + * @param {string} newSignature New resource index signature + * @param {object} diff Object containing arrays of added, updated, unchanged, and removed resource paths + */ #addDeltaEntry(requestSetId, originalSignature, newSignature, diff) { if (!this.#treeUpdateDeltas.has(requestSetId)) { this.#treeUpdateDeltas.set(requestSetId, { @@ -330,6 +394,17 @@ class ResourceRequestManager { } } + /** + * Gets all delta entries for differential cache updates + * + * Returns a map of signature transitions and their associated changed resource paths. + * Only includes deltas where no resources were removed, as removed resources prevent + * differential updates. + * + * @public + * @returns {Map} Map from original signature to delta information + * containing newSignature and changedPaths array + */ getDeltas() { const deltas = new Map(); for (const {originalSignature, newSignature, diff} of this.#treeUpdateDeltas.values()) { @@ -353,10 +428,17 @@ class ResourceRequestManager { } /** + * Adds a new set of resource requests and returns their signature + * + * Processes recorded resource requests (both path and pattern-based), creates or reuses + * a request set in the graph, and returns the resulting resource index signature. * - * @param {ResourceRequests} requestRecording - Project resource requests (paths and patterns) - * @param {module:@ui5/fs.AbstractReader} reader - Reader for accessing project resources - * @returns {Promise} Signature hash string of the resource index + * @public + * @param {object} requestRecording Project resource requests + * @param {string[]} requestRecording.paths Array of requested resource paths + * @param {Array} requestRecording.patterns Array of glob pattern arrays + * @param {module:@ui5/fs.AbstractReader} reader Reader for accessing project resources + * @returns {Promise} Object containing setId and signature of the resource index */ async addRequests(requestRecording, reader) { const projectRequests = []; @@ -369,11 +451,31 @@ class ResourceRequestManager { return await this.#addRequestSet(projectRequests, reader); } + /** + * Records that a task made no resource requests + * + * Marks the manager as having been unused at least once and returns a special + * signature indicating no requests were made. + * + * @public + * @returns {string} Special signature "X" indicating no requests + */ recordNoRequests() { this.#unusedAtLeastOnce = true; return "X"; // Signature for when no requests were made } + /** + * Adds a request set and creates or reuses a resource index + * + * Attempts to find an existing matching request set to reuse. If not found, creates + * a new request set with either a derived or fresh resource index based on whether + * a parent request set exists. + * + * @param {Request[]} requests Array of resource requests + * @param {module:@ui5/fs.AbstractReader} reader Reader for accessing project resources + * @returns {Promise} Object containing setId and signature of the resource index + */ async #addRequestSet(requests, reader) { // Try to find an existing request set that we can reuse let setId = this.#requestGraph.findExactMatch(requests); @@ -416,6 +518,14 @@ class ResourceRequestManager { }; } + /** + * Associates a request set from this manager with one from another manager + * + * @public + * @param {string} ourRequestSetId Request set ID from this manager + * @param {string} foreignRequestSetId Request set ID from another manager + * @todo Implementation pending + */ addAffiliatedRequestSet(ourRequestSetId, foreignRequestSetId) { // TODO } @@ -441,7 +551,6 @@ class ResourceRequestManager { * - 'path': Retrieves single resource by path from the given reader * - 'patterns': Retrieves resources matching glob patterns from the given reader * - * @private * @param {Request[]|Array<{type: string, value: string|string[]}>} resourceRequests - Resource requests to process * @param {module:@ui5/fs.AbstractReader} reader - Resource reader * @param {Map} [resourceCache] @@ -473,17 +582,32 @@ class ResourceRequestManager { return Array.from(resourcesMap.values()); } + /** + * Checks whether new or modified cache entries exist + * + * Returns false if the manager was restored from cache and no modifications were made. + * Returns true if this is a new manager or if new request sets have been added. + * + * @public + * @returns {boolean} True if cache entries need to be written + */ hasNewOrModifiedCacheEntries() { return this.#hasNewOrModifiedCacheEntries; } /** - * Serializes the task cache to a plain object for persistence + * Serializes the manager to a plain object for persistence * - * Exports the resource request graph in a format suitable for JSON serialization. - * The serialized data can be passed to the constructor to restore the cache state. + * Exports the resource request graph and all resource indices in a format suitable + * for JSON serialization. The serialized data can be passed to fromCache() to restore + * the manager state. Returns undefined if no new or modified cache entries exist. * - * @returns {TaskCacheMetadata} Serialized cache metadata containing the request set graph + * @public + * @returns {object|undefined} Serialized cache metadata or undefined if no changes + * @returns {object} return.requestSetGraph Serialized request graph + * @returns {Array} return.rootIndices Array of root resource indices with node IDs + * @returns {Array} return.deltaIndices Array of delta resource indices with node IDs + * @returns {boolean} return.unusedAtLeastOnce Whether the task has been unused */ toCacheObject() { if (!this.#hasNewOrModifiedCacheEntries) { From 4a432721e81a58b5d1d35e2830851de0dbc148bb Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 20 Jan 2026 15:09:05 +0100 Subject: [PATCH 100/110] refactor(project): ProjectBuilder cleanup Add UI5_BUILD_NO_WRITE_DEST param, rename UI5_BUILD_NO_WRITE_CACHE --- packages/project/lib/build/ProjectBuilder.js | 24 +++---------------- .../lib/build/cache/ResourceRequestManager.js | 2 +- 2 files changed, 4 insertions(+), 22 deletions(-) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 48fecb77e57..79f43399048 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -14,7 +14,6 @@ import OutputStyleEnum from "./helpers/ProjectBuilderOutputStyle.js"; class ProjectBuilder { #log; #buildIsRunning = false; - // #resourceChanges = new Map(); /** * Build Configuration @@ -122,26 +121,9 @@ class ProjectBuilder { } resourcesChanged(changes) { - // if (!this.#resourceChanges.size) { - // this.#resourceChanges = changes; - // return; - // } - // for (const [project, resourcePaths] of changes.entries()) { - // if (!this.#resourceChanges.has(project.getName())) { - // this.#resourceChanges.set(project.getName(), []); - // } - // const projectChanges = this.#resourceChanges.get(project.getName()); - // projectChanges.push(...resourcePaths); - // } - return this._buildContext.propagateResourceChanges(changes); } - // _flushResourceChanges() { - // this._buildContext.propagateResurceChanges(this.#resourceChanges); - // this.#resourceChanges = new Map(); - // } - async build({ includedDependencies = [], excludedDependencies = [], }) { @@ -188,7 +170,7 @@ class ProjectBuilder { const requestedProjects = this._determineRequestedProjects( includedDependencies, excludedDependencies, dependencyIncludes); - if (destPath && cleanDest) { + if (cleanDest) { this.#log.info(`Cleaning target directory...`); await rmrf(destPath); } @@ -288,12 +270,12 @@ class ProjectBuilder { } } - if (!alreadyBuilt.includes(projectName) && !process.env.UI5_BUILD_NO_CACHE_UPDATE) { + if (!alreadyBuilt.includes(projectName) && !process.env.UI5_BUILD_NO_WRITE_CACHE) { this.#log.verbose(`Triggering cache update for project ${projectName}...`); pWrites.push(projectBuildContext.getBuildCache().writeCache()); } - if (fsTarget && requestedProjects.includes(projectName)) { + if (fsTarget && requestedProjects.includes(projectName) && !process.env.UI5_BUILD_NO_WRITE_DEST) { // Only write requested projects to target // (excluding dependencies that were required to be built, but not requested) this.#log.verbose(`Writing out files for project ${projectName}...`); diff --git a/packages/project/lib/build/cache/ResourceRequestManager.js b/packages/project/lib/build/cache/ResourceRequestManager.js index 587218e65a6..49bef2fd76f 100644 --- a/packages/project/lib/build/cache/ResourceRequestManager.js +++ b/packages/project/lib/build/cache/ResourceRequestManager.js @@ -87,7 +87,7 @@ class ResourceRequestManager { const registry = registries.get(node.getParentId()); if (!registry) { throw new Error(`Missing tree registry for parent of node ID ${nodeId} of task ` + - `'${this.#taskName}' of project '${this.#projectName}'`); + `'${taskName}' of project '${projectName}'`); } const resourceIndex = parentResourceIndex.deriveTreeWithIndex(addedResourceIndex); From 3540ee59a456863c907828dc7492f1ecd66fa279 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 20 Jan 2026 15:11:06 +0100 Subject: [PATCH 101/110] refactor(builder): Small stringReplacer cleanup --- packages/builder/lib/processors/stringReplacer.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/builder/lib/processors/stringReplacer.js b/packages/builder/lib/processors/stringReplacer.js index 5002d426239..8c4bf6560dc 100644 --- a/packages/builder/lib/processors/stringReplacer.js +++ b/packages/builder/lib/processors/stringReplacer.js @@ -21,10 +21,10 @@ export default function({resources, options: {pattern, replacement}}) { return Promise.all(resources.map(async (resource) => { const content = await resource.getString(); const newContent = content.replaceAll(pattern, replacement); + // only modify the resource's string if it was changed if (content !== newContent) { resource.setString(newContent); return resource; } - // return resource; })); } From 5acfa096360ffba76500c3e5743e1b0f9046e915 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 20 Jan 2026 15:11:13 +0100 Subject: [PATCH 102/110] revert(fs): Add Switch reader This reverts commit 1db48f9a67236c59b47c8eeada80b0b229b59213. --- packages/fs/lib/readers/Switch.js | 82 ------------------------------ packages/fs/lib/resourceFactory.js | 14 ----- 2 files changed, 96 deletions(-) delete mode 100644 packages/fs/lib/readers/Switch.js diff --git a/packages/fs/lib/readers/Switch.js b/packages/fs/lib/readers/Switch.js deleted file mode 100644 index ed2bf2cca83..00000000000 --- a/packages/fs/lib/readers/Switch.js +++ /dev/null @@ -1,82 +0,0 @@ -import AbstractReader from "../AbstractReader.js"; - -/** - * Reader allowing to switch its underlying reader at runtime. - * If no reader is set, read operations will be halted/paused until a reader is set. - */ -export default class Switch extends AbstractReader { - #reader; - #pendingCalls = []; - - constructor({name, reader}) { - super(name); - this.#reader = reader; - } - - /** - * Sets the underlying reader and processes any pending read operations. - * - * @param {@ui5/fs/AbstractReader} reader The reader to delegate to. - */ - setReader(reader) { - this.#reader = reader; - this._processPendingCalls(); - } - - /** - * Unsets the underlying reader. Future calls will be queued. - */ - unsetReader() { - this.#reader = null; - } - - async _byGlob(virPattern, options, trace) { - if (this.#reader) { - return this.#reader._byGlob(virPattern, options, trace); - } - - // No reader set, so we queue the call and return a pending promise - return this._enqueueCall("_byGlob", [virPattern, options, trace]); - } - - - async _byPath(virPath, options, trace) { - if (this.#reader) { - return this.#reader._byPath(virPath, options, trace); - } - - // No reader set, so we queue the call and return a pending promise - return this._enqueueCall("_byPath", [virPath, options, trace]); - } - - /** - * Queues a method call by returning a promise and storing its resolver. - * - * @param {string} methodName The method name to call later. - * @param {Array} args The arguments to pass to the method. - * @returns {Promise} A promise that will be resolved/rejected when the call is processed. - */ - _enqueueCall(methodName, args) { - return new Promise((resolve, reject) => { - this.#pendingCalls.push({methodName, args, resolve, reject}); - }); - } - - /** - * Processes all pending calls in the queue using the current reader. - * - * @private - */ - _processPendingCalls() { - const callsToProcess = this.#pendingCalls; - this.#pendingCalls = []; // Clear queue immediately to prevent race conditions - - for (const call of callsToProcess) { - const {methodName, args, resolve, reject} = call; - // Execute the pending call with the newly set reader - this.#reader[methodName](...args) - .then(resolve) - .catch(reject); - } - } -} diff --git a/packages/fs/lib/resourceFactory.js b/packages/fs/lib/resourceFactory.js index 4943838d1d2..4309d8f096d 100644 --- a/packages/fs/lib/resourceFactory.js +++ b/packages/fs/lib/resourceFactory.js @@ -10,7 +10,6 @@ import WriterCollection from "./WriterCollection.js"; import Filter from "./readers/Filter.js"; import Link from "./readers/Link.js"; import Proxy from "./readers/Proxy.js"; -import Switch from "./readers/Switch.js"; import MonitoredReader from "./MonitoredReader.js"; import MonitoredReaderWriter from "./MonitoredReaderWriter.js"; import {getLogger} from "@ui5/logger"; @@ -278,19 +277,6 @@ export function createFlatReader({name, reader, namespace}) { }); } -export function createSwitch({name, reader}) { - return new Switch({ - name, - reader: reader, - }); -} - -/** - * Creates a monitored reader or reader-writer depending on the provided instance - * of the given readerWriter. - * - * @param {@ui5/fs/AbstractReader|@ui5/fs/AbstractReaderWriter} readerWriter Reader or ReaderWriter to monitor - */ export function createMonitor(readerWriter) { if (readerWriter instanceof DuplexCollection) { return new MonitoredReaderWriter(readerWriter); From f858659c414f931b1c7ad1362178df69059825c3 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 20 Jan 2026 15:31:32 +0100 Subject: [PATCH 103/110] refactor(project): Add perf logging, cleanups --- packages/project/lib/build/BuildReader.js | 58 ++++- packages/project/lib/build/BuildServer.js | 127 ++++++++++ .../project/lib/build/cache/BuildTaskCache.js | 167 ++++++++++--- .../project/lib/build/cache/CacheManager.js | 168 +++++++------ .../lib/build/cache/ProjectBuildCache.js | 39 ++- .../lib/build/cache/ResourceRequestGraph.js | 236 +++++++++++++----- .../project/lib/build/cache/StageCache.js | 25 +- packages/project/lib/build/cache/utils.js | 35 +-- .../project/lib/build/helpers/BuildContext.js | 1 - .../lib/build/helpers/ProjectBuildContext.js | 164 ++++++++++-- .../project/test/lib/graph/ProjectGraph.js | 4 + 11 files changed, 789 insertions(+), 235 deletions(-) diff --git a/packages/project/lib/build/BuildReader.js b/packages/project/lib/build/BuildReader.js index f420ad2a171..5118fb7bbb0 100644 --- a/packages/project/lib/build/BuildReader.js +++ b/packages/project/lib/build/BuildReader.js @@ -1,5 +1,15 @@ import AbstractReader from "@ui5/fs/AbstractReader"; +/** + * Reader for accessing build results of multiple projects + * + * Provides efficient resource access by delegating to appropriate project readers + * based on resource paths and namespaces. Supports namespace-based routing to + * minimize unnecessary project searches. + * + * @class + * @extends @ui5/fs/AbstractReader + */ class BuildReader extends AbstractReader { #projects; #projectNames; @@ -7,6 +17,16 @@ class BuildReader extends AbstractReader { #getReaderForProject; #getReaderForProjects; + /** + * Creates a new BuildReader instance + * + * @public + * @param {string} name Name of the reader + * @param {Array<@ui5/project/specifications/Project>} projects Array of projects to read from + * @param {Function} getReaderForProject Function that returns a reader for a single project by name + * @param {Function} getReaderForProjects Function that returns a combined reader for multiple project names + * @throws {Error} If multiple projects share the same namespace + */ constructor(name, projects, getReaderForProject, getReaderForProjects) { super(name); this.#projects = projects; @@ -27,11 +47,31 @@ class BuildReader extends AbstractReader { } } + /** + * Locates resources by glob pattern + * + * Retrieves a combined reader for all projects and delegates the glob search to it. + * + * @public + * @param {...*} args Arguments to pass to the underlying reader's byGlob method + * @returns {Promise>} Promise resolving to list of resources + */ async byGlob(...args) { const reader = await this.#getReaderForProjects(this.#projectNames); return reader.byGlob(...args); } + /** + * Locates a resource by path + * + * Attempts to determine the appropriate project reader based on the resource path + * and namespace. Falls back to searching all projects if the resource cannot be found. + * + * @public + * @param {string} virPath Virtual path of the resource + * @param {...*} args Additional arguments to pass to the underlying reader's byPath method + * @returns {Promise<@ui5/fs/Resource|null>} Promise resolving to resource or null if not found + */ async byPath(virPath, ...args) { const reader = await this._getReaderForResource(virPath); let res = await reader.byPath(virPath, ...args); @@ -43,7 +83,16 @@ class BuildReader extends AbstractReader { return res; } - + /** + * Gets the appropriate reader for a resource at the given path + * + * Determines which project(s) might contain the resource based on namespace matching + * and returns a reader for those projects. For single-project readers, returns that + * project's reader directly. + * + * @param {string} virPath Virtual path of the resource + * @returns {Promise<@ui5/fs/AbstractReader>} Promise resolving to appropriate reader + */ async _getReaderForResource(virPath) { let reader; if (this.#projects.length === 1) { @@ -65,9 +114,14 @@ class BuildReader extends AbstractReader { } /** - * Determine which projects might contain the resource for the given path. + * Determines which projects might contain the resource for the given path + * + * Analyzes the resource path to identify matching project namespaces. Only processes + * paths starting with /resources/ or /test-resources/. Returns project names in order + * from most specific to least specific namespace match. * * @param {string} virPath Virtual resource path + * @returns {string[]} Array of project names that might contain the resource */ _getProjectsForResourcePath(virPath) { if (!virPath.startsWith("/resources/") && !virPath.startsWith("/test-resources/")) { diff --git a/packages/project/lib/build/BuildServer.js b/packages/project/lib/build/BuildServer.js index d1e720342f9..0d3bc17e6e0 100644 --- a/packages/project/lib/build/BuildServer.js +++ b/packages/project/lib/build/BuildServer.js @@ -3,6 +3,27 @@ import {createReaderCollectionPrioritized} from "@ui5/fs/resourceFactory"; import BuildReader from "./BuildReader.js"; import WatchHandler from "./helpers/WatchHandler.js"; +/** + * Development server that provides access to built project resources with automatic rebuilding + * + * BuildServer watches project sources for changes and automatically rebuilds affected projects + * on-demand. It provides readers for accessing built resources and emits events for build + * completion and source changes. + * + * The server maintains separate readers for: + * - All projects (root + dependencies) + * - Root project only + * - Dependencies only + * + * Projects are built lazily when their resources are first requested, and rebuilt automatically + * when source files change. + * + * @class + * @extends EventEmitter + * @fires BuildServer#buildFinished + * @fires BuildServer#sourcesChanged + * @fires BuildServer#error + */ class BuildServer extends EventEmitter { #graph; #projectBuilder; @@ -12,6 +33,18 @@ class BuildServer extends EventEmitter { #dependenciesReader; #projectReaders = new Map(); + /** + * Creates a new BuildServer instance + * + * Initializes readers for different project combinations, sets up file watching, + * and optionally performs an initial build of specified dependencies. + * + * @public + * @param {@ui5/project/graph/ProjectGraph} graph Project graph containing all projects + * @param {@ui5/project/build/ProjectBuilder} projectBuilder Builder instance for executing builds + * @param {string[]} initialBuildIncludedDependencies Project names to include in initial build + * @param {string[]} initialBuildExcludedDependencies Project names to exclude from initial build + */ constructor(graph, projectBuilder, initialBuildIncludedDependencies, initialBuildExcludedDependencies) { super(); this.#graph = graph; @@ -64,18 +97,57 @@ class BuildServer extends EventEmitter { }); } + /** + * Gets a reader for all projects (root and dependencies) + * + * Returns a reader that provides access to built resources from all projects in the graph. + * Projects are built on-demand when their resources are requested. + * + * @public + * @returns {BuildReader} Reader for all projects + */ getReader() { return this.#allReader; } + /** + * Gets a reader for the root project only + * + * Returns a reader that provides access to built resources from only the root project, + * excluding all dependencies. The root project is built on-demand when its resources + * are requested. + * + * @public + * @returns {BuildReader} Reader for root project + */ getRootReader() { return this.#rootReader; } + /** + * Gets a reader for dependencies only (excluding root project) + * + * Returns a reader that provides access to built resources from all transitive + * dependencies of the root project. Dependencies are built on-demand when their + * resources are requested. + * + * @public + * @returns {BuildReader} Reader for all dependencies + */ getDependenciesReader() { return this.#dependenciesReader; } + /** + * Gets a reader for a single project, building it if necessary + * + * Checks if the project has already been built and returns its reader from cache. + * If not built, waits for any in-progress build, then triggers a build for the + * requested project. + * + * @param {string} projectName Name of the project to get reader for + * @returns {Promise<@ui5/fs/AbstractReader>} Reader for the built project + */ async #getReaderForProject(projectName) { if (this.#projectReaders.has(projectName)) { return this.#projectReaders.get(projectName); @@ -101,6 +173,16 @@ class BuildServer extends EventEmitter { return this.#projectReaders.get(projectName); } + /** + * Gets a combined reader for multiple projects, building them if necessary + * + * Determines which projects need to be built, waits for any in-progress build, + * then triggers a build for any missing projects. Returns a prioritized collection + * reader combining all requested projects. + * + * @param {string[]} projectNames Array of project names to get readers for + * @returns {Promise<@ui5/fs/ReaderCollection>} Combined reader for all requested projects + */ async #getReaderForProjects(projectNames) { let projectsRequiringBuild = []; for (const projectName of projectNames) { @@ -140,6 +222,15 @@ class BuildServer extends EventEmitter { return this.#getReaderForCachedProjects(projectNames); } + /** + * Creates a combined reader for already-built projects + * + * Retrieves readers from the cache for the specified projects and combines them + * into a prioritized reader collection. + * + * @param {string[]} projectNames Array of project names to combine + * @returns {@ui5/fs/ReaderCollection} Combined reader for cached projects + */ #getReaderForCachedProjects(projectNames) { const readers = []; for (const projectName of projectNames) { @@ -181,6 +272,15 @@ class BuildServer extends EventEmitter { // return this.#allProjectsReader; // } + /** + * Handles completion of a project build + * + * Caches readers for all built projects and emits the buildFinished event + * with the list of project names that were built. + * + * @param {string[]} projectNames Array of project names that were built + * @fires BuildServer#buildFinished + */ #projectBuildFinished(projectNames) { for (const projectName of projectNames) { this.#projectReaders.set(projectName, @@ -190,5 +290,32 @@ class BuildServer extends EventEmitter { } } +/** + * Build finished event + * + * Emitted when one or more projects have finished building. + * + * @event BuildServer#buildFinished + * @param {string[]} projectNames Array of project names that were built + */ + +/** + * Sources changed event + * + * Emitted when source files have changed and affected projects have been invalidated. + * + * @event BuildServer#sourcesChanged + * @param {string[]} changedResourcePaths Array of changed resource paths + */ + +/** + * Error event + * + * Emitted when an error occurs during watching or building. + * + * @event BuildServer#error + * @param {Error} error The error that occurred + */ + export default BuildServer; diff --git a/packages/project/lib/build/cache/BuildTaskCache.js b/packages/project/lib/build/cache/BuildTaskCache.js index f9b8820800a..461e4aee16a 100644 --- a/packages/project/lib/build/cache/BuildTaskCache.js +++ b/packages/project/lib/build/cache/BuildTaskCache.js @@ -4,8 +4,8 @@ const log = getLogger("build:cache:BuildTaskCache"); /** * @typedef {object} @ui5/project/build/cache/BuildTaskCache~ResourceRequests - * @property {Set} paths - Specific resource paths that were accessed - * @property {Set} patterns - Glob patterns used to access resources + * @property {Set} paths Specific resource paths that were accessed + * @property {Set} patterns Glob patterns used to access resources */ /** @@ -24,6 +24,8 @@ const log = getLogger("build:cache:BuildTaskCache"); * * The request graph allows derived request sets (when a task reads additional resources) * to reuse existing resource indices, optimizing both memory and computation. + * + * @class */ export default class BuildTaskCache { #projectName; @@ -36,11 +38,13 @@ export default class BuildTaskCache { /** * Creates a new BuildTaskCache instance * - * @param {string} projectName - Name of the project this task belongs to - * @param {string} taskName - Name of the task this cache manages - * @param {boolean} supportsDifferentialUpdates - * @param {ResourceRequestManager} [projectRequestManager] + * @public + * @param {string} projectName Name of the project this task belongs to + * @param {string} taskName Name of the task this cache manages + * @param {boolean} supportsDifferentialUpdates Whether the task supports differential updates + * @param {ResourceRequestManager} [projectRequestManager] Optional pre-existing project request manager from cache * @param {ResourceRequestManager} [dependencyRequestManager] + * Optional pre-existing dependency request manager from cache */ constructor(projectName, taskName, supportsDifferentialUpdates, projectRequestManager, dependencyRequestManager) { this.#projectName = projectName; @@ -55,6 +59,20 @@ export default class BuildTaskCache { new ResourceRequestManager(projectName, taskName, supportsDifferentialUpdates); } + /** + * Factory method to restore a BuildTaskCache from cached data + * + * Deserializes previously cached request managers for both project and dependency resources, + * allowing the task cache to resume from a prior build state. + * + * @public + * @param {string} projectName Name of the project + * @param {string} taskName Name of the task + * @param {boolean} supportsDifferentialUpdates Whether the task supports differential updates + * @param {object} projectRequests Cached project request manager data + * @param {object} dependencyRequests Cached dependency request manager data + * @returns {BuildTaskCache} Restored task cache instance + */ static fromCache(projectName, taskName, supportsDifferentialUpdates, projectRequests, dependencyRequests) { const projectRequestManager = ResourceRequestManager.fromCache(projectName, taskName, supportsDifferentialUpdates, projectRequests); @@ -69,46 +87,83 @@ export default class BuildTaskCache { /** * Gets the name of the task * + * @public * @returns {string} Task name */ getTaskName() { return this.#taskName; } + /** + * Checks whether the task supports differential updates + * + * Tasks that support differential updates can use incremental cache invalidation, + * processing only changed resources rather than rebuilding from scratch. + * + * @public + * @returns {boolean} True if differential updates are supported + */ getSupportsDifferentialUpdates() { return this.#supportsDifferentialUpdates; } + /** + * Checks whether new or modified cache entries exist + * + * Returns true if either the project or dependency request managers have new or + * modified cache entries that need to be persisted. + * + * @public + * @returns {boolean} True if cache entries need to be written + */ hasNewOrModifiedCacheEntries() { return this.#projectRequestManager.hasNewOrModifiedCacheEntries() || this.#dependencyRequestManager.hasNewOrModifiedCacheEntries(); } /** - * @param {module:@ui5/fs.AbstractReader} projectReader - Reader for accessing project resources - * @param {string[]} changedProjectResourcePaths - Array of changed project resource path - * @returns {Promise} Whether any index has changed + * Updates project resource indices based on changed resource paths + * + * Processes changed resource paths and updates the project request manager's indices + * accordingly. Only relevant resources (those matching recorded requests) are processed. + * + * @public + * @param {module:@ui5/fs.AbstractReader} projectReader Reader for accessing project resources + * @param {string[]} changedProjectResourcePaths Array of changed project resource paths + * @returns {Promise} True if any index has changed */ - async updateProjectIndices(projectReader, changedProjectResourcePaths) { - return await this.#projectRequestManager.updateIndices(projectReader, changedProjectResourcePaths); + updateProjectIndices(projectReader, changedProjectResourcePaths) { + return this.#projectRequestManager.updateIndices(projectReader, changedProjectResourcePaths); } /** + * Updates dependency resource indices based on changed resource paths * - * Special case for dependency indices: Since dependency resources may change independently from this - * projects cache, we need to update the full index once at the beginning of every build from cache. - * This is triggered by calling this method without changedDepResourcePaths. + * Processes changed dependency resource paths and updates the dependency request manager's + * indices accordingly. Only relevant resources (those matching recorded requests) are processed. * - * @param {module:@ui5/fs.AbstractReader} dependencyReader - Reader for accessing dependency resources - * @param {string[]} [changedDepResourcePaths] - Array of changed dependency resource paths - * @returns {Promise} Whether any index has changed + * @public + * @param {module:@ui5/fs.AbstractReader} dependencyReader Reader for accessing dependency resources + * @param {string[]} changedDepResourcePaths Array of changed dependency resource paths + * @returns {Promise} True if any index has changed */ - async updateDependencyIndices(dependencyReader, changedDepResourcePaths) { - if (changedDepResourcePaths) { - return await this.#dependencyRequestManager.updateIndices(dependencyReader, changedDepResourcePaths); - } else { - return await this.#dependencyRequestManager.refreshIndices(dependencyReader); - } + updateDependencyIndices(dependencyReader, changedDepResourcePaths) { + return this.#dependencyRequestManager.updateIndices(dependencyReader, changedDepResourcePaths); + } + + /** + * Performs a full refresh of the dependency resource index + * + * Since dependency resources may change independently from this project's cache, a full + * refresh of the dependency index is required at the beginning of every build from cache. + * This ensures all dependency resources are current before task execution. + * + * @public + * @param {module:@ui5/fs.AbstractReader} dependencyReader Reader for accessing dependency resources + * @returns {Promise} True if any index has changed + */ + refreshDependencyIndices(dependencyReader) { + return this.#dependencyRequestManager.refreshIndices(dependencyReader); } /** @@ -116,8 +171,9 @@ export default class BuildTaskCache { * * Returns signatures from all recorded project-request sets. Each signature represents * a unique combination of resources, belonging to the current project, that were accessed - * during task execution. This can be used to form a cache keys for restoring cached task results. + * during task execution. These can be used as cache keys for restoring cached task results. * + * @public * @returns {string[]} Array of signature strings * @throws {Error} If resource index is missing for any request set */ @@ -129,9 +185,11 @@ export default class BuildTaskCache { * Gets all dependency index signatures for this task * * Returns signatures from all recorded dependency-request sets. Each signature represents - * a unique combination of resources, belonging to all dependencies of the current project, that were accessed - * during task execution. This can be used to form a cache keys for restoring cached task results. + * a unique combination of resources, belonging to all dependencies of the current project, + * that were accessed during task execution. These can be used as cache keys for restoring + * cached task results. * + * @public * @returns {string[]} Array of signature strings * @throws {Error} If resource index is missing for any request set */ @@ -139,32 +197,57 @@ export default class BuildTaskCache { return this.#dependencyRequestManager.getIndexSignatures(); } + /** + * Gets all project index delta transitions for differential updates + * + * Returns a map of signature transitions and their associated changed resource paths + * for project resources. Used when tasks support differential updates to identify + * which resources changed between cache states. + * + * @public + * @returns {Map} Map from original signature to delta information + * containing newSignature and changedPaths array + */ getProjectIndexDeltas() { return this.#projectRequestManager.getDeltas(); } + /** + * Gets all dependency index delta transitions for differential updates + * + * Returns a map of signature transitions and their associated changed resource paths + * for dependency resources. Used when tasks support differential updates to identify + * which dependency resources changed between cache states. + * + * @public + * @returns {Map} Map from original signature to delta information + * containing newSignature and changedPaths array + */ getDependencyIndexDeltas() { return this.#dependencyRequestManager.getDeltas(); } /** - * Calculates a signature for the task based on accessed resources + * Records resource requests and calculates signatures for the task * * This method: - * 1. Converts resource requests to Request objects - * 2. Searches for an exact match in the request graph - * 3. If found, returns the existing index signature - * 4. If not found, creates a new request set and resource index + * 1. Processes project and dependency resource requests + * 2. Searches for exact matches in the request graphs + * 3. If found, returns the existing index signatures + * 4. If not found, creates new request sets and resource indices * 5. Uses tree derivation when possible to reuse parent indices * - * The signature uniquely identifies the set of resources accessed and their + * The returned signatures uniquely identify the set of resources accessed and their * content, enabling cache lookup for previously executed task results. * - * @param {ResourceRequests} projectRequestRecording - Project resource requests (paths and patterns) - * @param {ResourceRequests|undefined} dependencyRequestRecording - Dependency resource requests - * @param {module:@ui5/fs.AbstractReader} projectReader - Reader for accessing project resources - * @param {module:@ui5/fs.AbstractReader} dependencyReader - Reader for accessing dependency resources - * @returns {Promise} Signature hash string of the resource index + * @public + * @param {@ui5/project/build/cache/BuildTaskCache~ResourceRequests} projectRequestRecording + * Project resource requests (paths and patterns) + * @param {@ui5/project/build/cache/BuildTaskCache~ResourceRequests|undefined} dependencyRequestRecording + * Dependency resource requests (paths and patterns) + * @param {module:@ui5/fs.AbstractReader} projectReader Reader for accessing project resources + * @param {module:@ui5/fs.AbstractReader} dependencyReader Reader for accessing dependency resources + * @returns {Promise} Array containing [projectSignature, dependencySignature] */ async recordRequests(projectRequestRecording, dependencyRequestRecording, projectReader, dependencyReader) { const { @@ -186,12 +269,14 @@ export default class BuildTaskCache { } /** - * Serializes the task cache to a plain object for persistence + * Serializes the task cache to plain objects for persistence * - * Exports the resource request graph in a format suitable for JSON serialization. - * The serialized data can be passed to the constructor to restore the cache state. + * Exports both project and dependency resource request graphs in a format suitable + * for JSON serialization. The serialized data can be passed to fromCache() to restore + * the cache state. Returns undefined for request managers with no new or modified entries. * - * @returns {object[]} Serialized cache metadata containing the request set graphs + * @public + * @returns {Array} Array containing [projectCacheObject, dependencyCacheObject] */ toCacheObjects() { return [this.#projectRequestManager.toCacheObject(), this.#dependencyRequestManager.toCacheObject()]; diff --git a/packages/project/lib/build/cache/CacheManager.js b/packages/project/lib/build/cache/CacheManager.js index a2c6e476aab..69c387a31d1 100644 --- a/packages/project/lib/build/cache/CacheManager.js +++ b/packages/project/lib/build/cache/CacheManager.js @@ -42,6 +42,8 @@ const CACHE_VERSION = "v0_1"; * - Singleton pattern per cache directory * - Configurable cache location via UI5_DATA_DIR or configuration * - Efficient resource deduplication through cacache + * + * @class */ export default class CacheManager { #casDir; @@ -58,7 +60,7 @@ export default class CacheManager { * use CacheManager.create() instead to get a singleton instance. * * @private - * @param {string} cacheDir - Base directory for the cache + * @param {string} cacheDir Base directory for the cache */ constructor(cacheDir) { cacheDir = path.join(cacheDir, CACHE_VERSION); @@ -79,7 +81,8 @@ export default class CacheManager { * 2. ui5DataDir from UI5 configuration file * 3. Default: ~/.ui5/ * - * @param {string} cwd - Current working directory for resolving relative paths + * @public + * @param {string} cwd Current working directory for resolving relative paths * @returns {Promise} Singleton CacheManager instance for the cache directory */ static async create(cwd) { @@ -106,9 +109,8 @@ export default class CacheManager { /** * Generates the file path for a build manifest * - * @private - * @param {string} packageName - Package/project identifier - * @param {string} buildSignature - Build signature hash + * @param {string} packageName Package/project identifier + * @param {string} buildSignature Build signature hash * @returns {string} Absolute path to the build manifest file */ #getBuildManifestPath(packageName, buildSignature) { @@ -119,8 +121,9 @@ export default class CacheManager { /** * Reads a build manifest from cache * - * @param {string} projectId - Project identifier (typically package name) - * @param {string} buildSignature - Build signature hash + * @public + * @param {string} projectId Project identifier (typically package name) + * @param {string} buildSignature Build signature hash * @returns {Promise} Parsed manifest object or null if not found * @throws {Error} If file read fails for reasons other than file not existing */ @@ -146,9 +149,10 @@ export default class CacheManager { * Creates parent directories if they don't exist. Manifests are stored as * formatted JSON (2-space indentation) for readability. * - * @param {string} projectId - Project identifier (typically package name) - * @param {string} buildSignature - Build signature hash - * @param {object} manifest - Build manifest object to serialize + * @public + * @param {string} projectId Project identifier (typically package name) + * @param {string} buildSignature Build signature hash + * @param {object} manifest Build manifest object to serialize * @returns {Promise} */ async writeBuildManifest(projectId, buildSignature, manifest) { @@ -160,9 +164,8 @@ export default class CacheManager { /** * Generates the file path for resource index metadata * - * @private - * @param {string} packageName - Package/project identifier - * @param {string} buildSignature - Build signature hash + * @param {string} packageName Package/project identifier + * @param {string} buildSignature Build signature hash * @param {string} kind "source" or "result" * @returns {string} Absolute path to the index metadata file */ @@ -177,8 +180,9 @@ export default class CacheManager { * The index cache contains the resource tree structure and task metadata, * enabling efficient change detection and cache validation. * - * @param {string} projectId - Project identifier (typically package name) - * @param {string} buildSignature - Build signature hash + * @public + * @param {string} projectId Project identifier (typically package name) + * @param {string} buildSignature Build signature hash * @param {string} kind "source" or "result" * @returns {Promise} Parsed index cache object or null if not found * @throws {Error} If file read fails for reasons other than file not existing @@ -205,10 +209,11 @@ export default class CacheManager { * Persists the resource index and associated task metadata for later retrieval. * Creates parent directories if needed. * - * @param {string} projectId - Project identifier (typically package name) - * @param {string} buildSignature - Build signature hash + * @public + * @param {string} projectId Project identifier (typically package name) + * @param {string} buildSignature Build signature hash * @param {string} kind "source" or "result" - * @param {object} index - Index object containing resource tree and task metadata + * @param {object} index Index object containing resource tree and task metadata * @returns {Promise} */ async writeIndexCache(projectId, buildSignature, kind, index) { @@ -220,11 +225,10 @@ export default class CacheManager { /** * Generates the file path for stage metadata * - * @private - * @param {string} packageName - Package/project identifier - * @param {string} buildSignature - Build signature hash - * @param {string} stageId - Stage identifier (e.g., "result" or "task/taskName") - * @param {string} stageSignature - Stage signature hash (based on input resources) + * @param {string} packageName Package/project identifier + * @param {string} buildSignature Build signature hash + * @param {string} stageId Stage identifier (e.g., "result" or "task/taskName") + * @param {string} stageSignature Stage signature hash (based on input resources) * @returns {string} Absolute path to the stage metadata file */ #getStageMetadataPath(packageName, buildSignature, stageId, stageSignature) { @@ -239,10 +243,11 @@ export default class CacheManager { * Stage metadata contains information about resources produced by a build stage, * including resource paths and their metadata. * - * @param {string} projectId - Project identifier (typically package name) - * @param {string} buildSignature - Build signature hash - * @param {string} stageId - Stage identifier (e.g., "result" or "task/taskName") - * @param {string} stageSignature - Stage signature hash (based on input resources) + * @public + * @param {string} projectId Project identifier (typically package name) + * @param {string} buildSignature Build signature hash + * @param {string} stageId Stage identifier (e.g., "result" or "task/taskName") + * @param {string} stageSignature Stage signature hash (based on input resources) * @returns {Promise} Parsed stage metadata or null if not found * @throws {Error} If file read fails for reasons other than file not existing */ @@ -270,11 +275,12 @@ export default class CacheManager { * Persists metadata about resources produced by a build stage. * Creates parent directories if needed. * - * @param {string} projectId - Project identifier (typically package name) - * @param {string} buildSignature - Build signature hash - * @param {string} stageId - Stage identifier (e.g., "result" or "task/taskName") - * @param {string} stageSignature - Stage signature hash (based on input resources) - * @param {object} metadata - Stage metadata object to serialize + * @public + * @param {string} projectId Project identifier (typically package name) + * @param {string} buildSignature Build signature hash + * @param {string} stageId Stage identifier (e.g., "result" or "task/taskName") + * @param {string} stageSignature Stage signature hash (based on input resources) + * @param {object} metadata Stage metadata object to serialize * @returns {Promise} */ async writeStageCache(projectId, buildSignature, stageId, stageSignature, metadata) { @@ -285,14 +291,13 @@ export default class CacheManager { } /** - * Generates the file path for stage metadata + * Generates the file path for task metadata * - * @private - * @param {string} packageName - Package/project identifier - * @param {string} buildSignature - Build signature hash - * @param {string} taskName - * @param {string} type - "project" or "dependency" - * @returns {string} Absolute path to the stage metadata file + * @param {string} packageName Package/project identifier + * @param {string} buildSignature Build signature hash + * @param {string} taskName Task name + * @param {string} type "project" or "dependency" + * @returns {string} Absolute path to the task metadata file */ #getTaskMetadataPath(packageName, buildSignature, taskName, type) { const pkgDir = getPathFromPackageName(packageName); @@ -300,16 +305,17 @@ export default class CacheManager { } /** - * Reads stage metadata from cache + * Reads task metadata from cache * - * Stage metadata contains information about resources produced by a build stage, - * including resource paths and their metadata. + * Task metadata contains resource request graphs and indices for tracking + * which resources a task accessed during execution. * - * @param {string} projectId - Project identifier (typically package name) - * @param {string} buildSignature - Build signature hash - * @param {string} taskName - * @param {string} type - "project" or "dependency" - * @returns {Promise} Parsed stage metadata or null if not found + * @public + * @param {string} projectId Project identifier (typically package name) + * @param {string} buildSignature Build signature hash + * @param {string} taskName Task name + * @param {string} type "project" or "dependency" + * @returns {Promise} Parsed task metadata or null if not found * @throws {Error} If file read fails for reasons other than file not existing */ async readTaskMetadata(projectId, buildSignature, taskName, type) { @@ -330,16 +336,17 @@ export default class CacheManager { } /** - * Writes stage metadata to cache + * Writes task metadata to cache * - * Persists metadata about resources produced by a build stage. + * Persists task-specific metadata including resource request graphs and indices. * Creates parent directories if needed. * - * @param {string} projectId - Project identifier (typically package name) - * @param {string} buildSignature - Build signature hash - * @param {string} taskName - * @param {string} type - "project" or "dependency" - * @param {object} metadata - Stage metadata object to serialize + * @public + * @param {string} projectId Project identifier (typically package name) + * @param {string} buildSignature Build signature hash + * @param {string} taskName Task name + * @param {string} type "project" or "dependency" + * @param {object} metadata Task metadata object to serialize * @returns {Promise} */ async writeTaskMetadata(projectId, buildSignature, taskName, type, metadata) { @@ -351,11 +358,10 @@ export default class CacheManager { /** * Generates the file path for result metadata * - * @private - * @param {string} packageName - Package/project identifier - * @param {string} buildSignature - Build signature hash - * @param {string} stageSignature - Stage signature hash (based on input resources) - * @returns {string} Absolute path to the stage metadata file + * @param {string} packageName Package/project identifier + * @param {string} buildSignature Build signature hash + * @param {string} stageSignature Stage signature hash (based on input resources) + * @returns {string} Absolute path to the result metadata file */ #getResultMetadataPath(packageName, buildSignature, stageSignature) { const pkgDir = getPathFromPackageName(packageName); @@ -365,13 +371,14 @@ export default class CacheManager { /** * Reads result metadata from cache * - * Stage metadata contains information about resources produced by a build stage, - * including resource paths and their metadata. + * Result metadata contains information about the final build output, including + * references to all stage signatures that comprise the result. * - * @param {string} projectId - Project identifier (typically package name) - * @param {string} buildSignature - Build signature hash - * @param {string} stageSignature - Stage signature hash (based on input resources) - * @returns {Promise} Parsed stage metadata or null if not found + * @public + * @param {string} projectId Project identifier (typically package name) + * @param {string} buildSignature Build signature hash + * @param {string} stageSignature Stage signature hash (based on input resources) + * @returns {Promise} Parsed result metadata or null if not found * @throws {Error} If file read fails for reasons other than file not existing */ async readResultMetadata(projectId, buildSignature, stageSignature) { @@ -395,13 +402,14 @@ export default class CacheManager { /** * Writes result metadata to cache * - * Persists metadata about resources produced by a build stage. + * Persists metadata about the final build result, including stage signature mappings. * Creates parent directories if needed. * - * @param {string} projectId - Project identifier (typically package name) - * @param {string} buildSignature - Build signature hash - * @param {string} stageSignature - Stage signature hash (based on input resources) - * @param {object} metadata - Stage metadata object to serialize + * @public + * @param {string} projectId Project identifier (typically package name) + * @param {string} buildSignature Build signature hash + * @param {string} stageSignature Stage signature hash (based on input resources) + * @param {object} metadata Result metadata object to serialize * @returns {Promise} */ async writeResultMetadata(projectId, buildSignature, stageSignature, metadata) { @@ -418,11 +426,12 @@ export default class CacheManager { * and verifies its integrity. If integrity mismatches, attempts to recover by * looking up the content by digest and updating the index. * - * @param {string} buildSignature - Build signature hash - * @param {string} stageId - Stage identifier (e.g., "result" or "task/taskName") - * @param {string} stageSignature - Stage signature hash - * @param {string} resourcePath - Virtual path of the resource - * @param {string} integrity - Expected integrity hash (e.g., "sha256-...") + * @public + * @param {string} buildSignature Build signature hash + * @param {string} stageId Stage identifier (e.g., "result" or "task/taskName") + * @param {string} stageSignature Stage signature hash + * @param {string} resourcePath Virtual path of the resource + * @param {string} integrity Expected integrity hash (e.g., "sha256-...") * @returns {Promise} Absolute path to the cached resource file, or null if not found * @throws {Error} If integrity is not provided */ @@ -448,10 +457,11 @@ export default class CacheManager { * This enables efficient deduplication when the same resource content appears * in multiple stages or builds. * - * @param {string} buildSignature - Build signature hash - * @param {string} stageId - Stage identifier (e.g., "result" or "task/taskName") - * @param {string} stageSignature - Stage signature hash - * @param {module:@ui5/fs.Resource} resource - Resource to cache + * @public + * @param {string} buildSignature Build signature hash + * @param {string} stageId Stage identifier (e.g., "result" or "task/taskName") + * @param {string} stageSignature Stage signature hash + * @param {@ui5/fs/Resource} resource Resource to cache * @returns {Promise} */ async writeStageResource(buildSignature, stageId, stageSignature, resource) { diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 16a9bb5725b..f71122b94da 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -85,7 +85,13 @@ export default class ProjectBuildCache { */ static async create(project, buildSignature, cacheManager) { const cache = new ProjectBuildCache(project, buildSignature, cacheManager); + const initStart = performance.now(); await cache.#initSourceIndex(); + if (log.isLevelEnabled("perf")) { + log.perf( + `Initialized source index for project ${project.getName()} ` + + `in ${(performance.now() - initStart).toFixed(2)} ms`); + } return cache; } @@ -111,10 +117,28 @@ export default class ProjectBuildCache { return false; } if (forceDependencyUpdate) { - await this.#updateDependencyIndices(dependencyReader); + const updateStart = performance.now(); + await this.#refreshDependencyIndices(dependencyReader); + if (log.isLevelEnabled("perf")) { + log.perf( + `Refreshed dependency indices for project ${this.#project.getName()} ` + + `in ${(performance.now() - updateStart).toFixed(2)} ms`); + } } + const flushStart = performance.now(); await this.#flushPendingChanges(); + if (log.isLevelEnabled("perf")) { + log.perf( + `Flushed pending changes for project ${this.#project.getName()} ` + + `in ${(performance.now() - flushStart).toFixed(2)} ms`); + } + const findStart = performance.now(); const changedResources = await this.#findResultCache(); + if (log.isLevelEnabled("perf")) { + log.perf( + `Validated result cache for project ${this.#project.getName()} ` + + `in ${(performance.now() - findStart).toFixed(2)} ms`); + } return changedResources; } @@ -158,15 +182,15 @@ export default class ProjectBuildCache { } /** - * Updates dependency indices for all tasks + * Refresh dependency indices for all tasks * * @param {@ui5/fs/AbstractReader} dependencyReader Reader for dependency resources * @returns {Promise} */ - async #updateDependencyIndices(dependencyReader) { + async #refreshDependencyIndices(dependencyReader) { let depIndicesChanged = false; await Promise.all(Array.from(this.#taskCache.values()).map(async (taskCache) => { - const changed = await taskCache.updateDependencyIndices(this.#currentDependencyReader); + const changed = await taskCache.refreshDependencyIndices(this.#currentDependencyReader); if (changed) { depIndicesChanged = true; } @@ -342,10 +366,15 @@ export default class ProjectBuildCache { log.verbose(`No task cache found`); return false; } - if (this.#writtenResultResourcePaths.length) { // Update task indices based on source changes and changes from by previous tasks + const updateProjectIndicesStart = performance.now(); await taskCache.updateProjectIndices(this.#currentProjectReader, this.#writtenResultResourcePaths); + if (log.isLevelEnabled("perf")) { + log.perf( + `Updated project indices for task ${taskName} in project ${this.#project.getName()} ` + + `in ${(performance.now() - updateProjectIndicesStart).toFixed(2)} ms`); + } } // TODO: Implement: diff --git a/packages/project/lib/build/cache/ResourceRequestGraph.js b/packages/project/lib/build/cache/ResourceRequestGraph.js index 099939a3cea..73655cace6b 100644 --- a/packages/project/lib/build/cache/ResourceRequestGraph.js +++ b/packages/project/lib/build/cache/ResourceRequestGraph.js @@ -1,12 +1,21 @@ const ALLOWED_REQUEST_TYPES = new Set(["path", "patterns"]); /** - * Represents a single request with type and value + * Represents a single resource request with type and value + * + * A request can be either a path-based request (single resource) or a pattern-based + * request (multiple resources via glob patterns). + * + * @class */ export class Request { /** - * @param {string} type - Either 'path' or 'pattern' - * @param {string|string[]} value - The request value (string for path types, array for pattern types) + * Creates a new Request instance + * + * @public + * @param {string} type Either 'path' or 'patterns' + * @param {string|string[]} value The request value (string for path, array for patterns) + * @throws {Error} If type is invalid or value type doesn't match request type */ constructor(type, value) { if (!ALLOWED_REQUEST_TYPES.has(type)) { @@ -23,8 +32,12 @@ export class Request { } /** - * Create a canonical string representation for comparison + * Creates a canonical string representation for comparison + * + * Converts the request to a unique key string that can be used for equality + * checks and set operations. * + * @public * @returns {string} Canonical key in format "type:value" or "type:[pattern1,pattern2,...]" */ toKey() { @@ -35,10 +48,13 @@ export class Request { } /** - * Create Request from key string + * Creates a Request instance from a key string * - * @param {string} key - Key in format "type:value" or "type:[...]" - * @returns {Request} Request instance + * Inverse operation of toKey(), reconstructing a Request from its string representation. + * + * @public + * @param {string} key Key in format "type:value" or "type:[...]" + * @returns {Request} Reconstructed Request instance */ static fromKey(key) { const colonIndex = key.indexOf(":"); @@ -55,9 +71,12 @@ export class Request { } /** - * Check equality with another Request + * Checks equality with another Request + * + * Compares both type and value, handling array values correctly. * - * @param {Request} other - Request to compare with + * @public + * @param {Request} other Request to compare with * @returns {boolean} True if requests are equal */ equals(other) { @@ -77,14 +96,22 @@ export class Request { } /** - * Node in the request set graph + * Represents a node in the request set graph + * + * Each node stores a delta of requests added at this level, with an optional parent + * reference. The full request set is computed by traversing up the parent chain. + * This enables efficient storage through delta encoding. + * + * @class */ class RequestSetNode { /** - * @param {number} id - Unique node identifier - * @param {number|null} parent - Parent node ID or null - * @param {Request[]} addedRequests - Requests added in this node (delta) - * @param {*} metadata - Associated metadata + * Creates a new RequestSetNode instance + * + * @param {number} id Unique node identifier + * @param {number|null} [parent=null] Parent node ID or null for root nodes + * @param {Request[]} [addedRequests=[]] Requests added in this node (delta from parent) + * @param {*} [metadata={}] Associated metadata */ constructor(id, parent = null, addedRequests = [], metadata = {}) { this.id = id; @@ -98,9 +125,12 @@ class RequestSetNode { } /** - * Get the full materialized set of requests for this node + * Gets the full materialized set of requests for this node + * + * Computes the complete set of requests by traversing up the parent chain + * and collecting all added requests. Results are cached for performance. * - * @param {ResourceRequestGraph} graph - The graph containing this node + * @param {ResourceRequestGraph} graph The graph containing this node * @returns {Set} Set of request keys */ getMaterializedSet(graph) { @@ -127,7 +157,10 @@ class RequestSetNode { } /** - * Invalidate cache (called when graph structure changes) + * Invalidates the materialized set cache + * + * Should be called when the graph structure changes to ensure the cached + * materialized set is recomputed on next access. */ invalidateCache() { this._cacheValid = false; @@ -135,9 +168,11 @@ class RequestSetNode { } /** - * Get full set as Request objects + * Gets the full set of requests as Request objects + * + * Similar to getMaterializedSet but returns Request instances instead of keys. * - * @param {ResourceRequestGraph} graph - The graph containing this node + * @param {ResourceRequestGraph} graph The graph containing this node * @returns {Request[]} Array of Request objects */ getMaterializedRequests(graph) { @@ -146,7 +181,10 @@ class RequestSetNode { } /** - * Get only the requests added in this node (delta, not including parent requests) + * Gets only the requests added in this node (delta) + * + * Returns the requests added at this level, not including parent requests. + * This is the delta that was stored in the node. * * @returns {Request[]} Array of Request objects added in this node */ @@ -154,6 +192,11 @@ class RequestSetNode { return Array.from(this.addedRequests).map((key) => Request.fromKey(key)); } + /** + * Gets the parent node ID + * + * @returns {number|null} Parent node ID or null if this is a root node + */ getParentId() { return this.parent; } @@ -161,17 +204,32 @@ class RequestSetNode { /** * Graph managing request set nodes with delta encoding + * + * This graph structure optimizes storage of multiple related request sets by using + * delta encoding - each node stores only the requests added relative to its parent. + * This is particularly efficient when request sets have significant overlap. + * + * The graph automatically finds the best parent for new request sets to minimize + * the delta size and maintain efficient storage. + * + * @class */ export default class ResourceRequestGraph { + /** + * Creates a new ResourceRequestGraph instance + * + * @public + */ constructor() { this.nodes = new Map(); // nodeId -> RequestSetNode this.nextId = 1; } /** - * Get a node by ID + * Gets a node by ID * - * @param {number} nodeId - Node identifier + * @public + * @param {number} nodeId Node identifier * @returns {RequestSetNode|undefined} The node or undefined if not found */ getNode(nodeId) { @@ -179,8 +237,9 @@ export default class ResourceRequestGraph { } /** - * Get all node IDs + * Gets all node IDs in the graph * + * @public * @returns {number[]} Array of all node IDs */ getAllNodeIds() { @@ -188,10 +247,13 @@ export default class ResourceRequestGraph { } /** - * Calculate which requests need to be added (delta) + * Calculates which requests need to be added (delta) * - * @param {Request[]} newRequestSet - New request set - * @param {Set} parentSet - Parent's materialized set (keys) + * Determines the difference between a new request set and a parent's materialized set, + * returning only the requests that need to be stored in the delta. + * + * @param {Request[]} newRequestSet New request set + * @param {Set} parentSet Parent's materialized set (as keys) * @returns {Request[]} Array of requests to add */ _calculateAddedRequests(newRequestSet, parentSet) { @@ -202,10 +264,14 @@ export default class ResourceRequestGraph { } /** - * Add a new request set to the graph + * Adds a new request set to the graph + * + * Automatically finds the best parent node (largest subset) and stores only + * the delta of requests. If no suitable parent is found, creates a root node. * - * @param {Request[]} requests - Array of Request objects - * @param {*} metadata - Optional metadata to store with this node + * @public + * @param {Request[]} requests Array of Request objects + * @param {*} [metadata=null] Optional metadata to store with this node * @returns {number} The new node ID */ addRequestSet(requests, metadata = null) { @@ -233,10 +299,14 @@ export default class ResourceRequestGraph { } /** - * Find the best parent for a new request set. That is, the largest subset of the new request set. + * Finds the best parent for a new request set * - * @param {Request[]} requestSet - Array of Request objects - * @returns {{parentId: number, deltaSize: number}|null} Parent info or null if no suitable parent + * Searches for the existing node with the largest subset of the new request set. + * This minimizes the delta size and optimizes storage efficiency. + * + * @public + * @param {Request[]} requestSet Array of Request objects + * @returns {number|null} Parent node ID or null if no suitable parent exists */ findBestParent(requestSet) { if (this.nodes.size === 0) { @@ -265,9 +335,13 @@ export default class ResourceRequestGraph { } /** - * Find a node with an identical request set + * Finds a node with an identical request set + * + * Searches for an existing node whose materialized request set exactly matches + * the given request set. Used to avoid creating duplicate nodes. * - * @param {Request[]} requests - Array of Request objects + * @public + * @param {Request[]} requests Array of Request objects * @returns {number|null} Node ID of exact match, or null if no match found */ findExactMatch(requests) { @@ -295,9 +369,10 @@ export default class ResourceRequestGraph { } /** - * Get metadata associated with a node + * Gets metadata associated with a node * - * @param {number} nodeId - Node identifier + * @public + * @param {number} nodeId Node identifier * @returns {*} Metadata or null if node not found */ getMetadata(nodeId) { @@ -306,10 +381,11 @@ export default class ResourceRequestGraph { } /** - * Update metadata for a node + * Updates metadata for a node * - * @param {number} nodeId - Node identifier - * @param {*} metadata - New metadata value + * @public + * @param {number} nodeId Node identifier + * @param {*} metadata New metadata value */ setMetadata(nodeId, metadata) { const node = this.getNode(nodeId); @@ -319,8 +395,11 @@ export default class ResourceRequestGraph { } /** - * Get a set containing all unique requests across all nodes in the graph + * Gets all unique requests across all nodes in the graph * + * Collects the union of all materialized request sets from every node. + * + * @public * @returns {Request[]} Array of all unique Request objects in the graph */ getAllRequests() { @@ -337,7 +416,19 @@ export default class ResourceRequestGraph { } /** - * Get statistics about the graph + * Gets statistics about the graph structure + * + * Provides metrics about the graph's efficiency, including node count, + * average requests per node, storage overhead, and tree depth statistics. + * + * @public + * @returns {object} Statistics object + * @returns {number} return.nodeCount Total number of nodes + * @returns {number} return.averageRequestsPerNode Average materialized requests per node + * @returns {number} return.averageStoredDeltaSize Average stored delta size per node + * @returns {number} return.averageDepth Average depth in the tree + * @returns {number} return.maxDepth Maximum depth in the tree + * @returns {number} return.compressionRatio Ratio of stored deltas to total requests (lower is better) */ getStats() { let totalRequests = 0; @@ -368,17 +459,29 @@ export default class ResourceRequestGraph { }; } + /** + * Gets the number of nodes in the graph + * + * @public + * @returns {number} Node count + */ getSize() { return this.nodes.size; } /** - * Iterate through nodes in breadth-first order (by depth level). + * Iterates through nodes in breadth-first order (by depth level) + * * Parents are always yielded before their children, allowing efficient traversal * where you can check parent nodes first and only examine deltas of subtrees as needed. * - * @yields {{nodeId: number, node: RequestSetNode, depth: number, parentId: number|null}} - * Node information including ID, node instance, depth level, and parent ID + * @public + * @generator + * @yields {object} Node information + * @yields {number} return.nodeId Node identifier + * @yields {RequestSetNode} return.node Node instance + * @yields {number} return.depth Depth level in the tree + * @yields {number|null} return.parentId Parent node ID or null for root nodes * * @example * // Traverse all nodes, checking parents before children @@ -443,16 +546,22 @@ export default class ResourceRequestGraph { } /** - * Iterate through nodes starting from a specific node, traversing its subtree. - * Useful for examining only a portion of the graph. + * Iterates through nodes starting from a specific node, traversing its subtree * - * @param {number} startNodeId - Node ID to start traversal from - * @yields {{nodeId: number, node: RequestSetNode, depth: number, parentId: number|null}} - * Node information including ID, node instance, relative depth from start, and parent ID + * Useful for examining only a portion of the graph rooted at a particular node. + * + * @public + * @generator + * @param {number} startNodeId Node ID to start traversal from + * @yields {object} Node information + * @yields {number} return.nodeId Node identifier + * @yields {RequestSetNode} return.node Node instance + * @yields {number} return.depth Relative depth from the start node + * @yields {number|null} return.parentId Parent node ID or null * * @example * // Traverse only the subtree under a specific node - * const matchNodeId = graph.findBestMatch(query); + * const matchNodeId = graph.findBestParent(query); * for (const {nodeId, node, depth} of graph.traverseSubtree(matchNodeId)) { * console.log(`Processing node ${nodeId} at relative depth ${depth}`); * } @@ -499,9 +608,10 @@ export default class ResourceRequestGraph { } /** - * Get all children node IDs for a given parent node + * Gets all children node IDs for a given parent node * - * @param {number} parentId - Parent node identifier + * @public + * @param {number} parentId Parent node identifier * @returns {number[]} Array of child node IDs */ getChildren(parentId) { @@ -515,10 +625,15 @@ export default class ResourceRequestGraph { } /** - * Export graph structure for serialization + * Exports graph structure for serialization + * + * Converts the graph to a plain object suitable for JSON serialization. + * Metadata is not included in the export and must be handled separately. * - * @returns {{nodes: Array<{id: number, parent: number|null, addedRequests: string[]}>, nextId: number}} - * Graph structure with metadata + * @public + * @returns {object} Graph structure + * @returns {Array} return.nodes Array of node objects with id, parent, and addedRequests + * @returns {number} return.nextId Next available node ID */ toCacheObject() { const nodes = []; @@ -535,10 +650,15 @@ export default class ResourceRequestGraph { } /** - * Create a graph from JSON structure (as produced by toCacheObject) + * Creates a graph from a serialized cache object + * + * Reconstructs the graph structure from a plain object produced by toCacheObject(). + * Metadata must be restored separately if needed. * - * @param {{nodes: Array<{id: number, parent: number|null, addedRequests: string[]}>, nextId: number}} metadata - * JSON representation of the graph + * @public + * @param {object} metadata Serialized graph structure + * @param {Array} metadata.nodes Array of node objects with id, parent, and addedRequests + * @param {number} metadata.nextId Next available node ID * @returns {ResourceRequestGraph} Reconstructed graph instance */ static fromCacheObject(metadata) { diff --git a/packages/project/lib/build/cache/StageCache.js b/packages/project/lib/build/cache/StageCache.js index cd9031c197a..b40b19dbff0 100644 --- a/packages/project/lib/build/cache/StageCache.js +++ b/packages/project/lib/build/cache/StageCache.js @@ -1,7 +1,7 @@ /** * @typedef {object} StageCacheEntry - * @property {object} stage - The cached stage instance (typically a reader or writer) - * @property {string[]} writtenResourcePaths - Set of resource paths written during stage execution + * @property {object} stage The cached stage instance (typically a reader or writer) + * @property {string[]} writtenResourcePaths Array of resource paths written during stage execution */ /** @@ -19,6 +19,8 @@ * - Tracks written resources for cache invalidation * - Supports batch persistence via flush queue * - Multiple signatures per stage ID (for different input combinations) + * + * @class */ export default class StageCache { #stageIdToSignatures = new Map(); @@ -33,11 +35,11 @@ export default class StageCache { * Multiple signatures can exist for the same stage ID, representing different * input resource combinations that produce different outputs. * - * @param {string} stageId - Identifier for the stage (e.g., "task/generateBundle") - * @param {string} signature - Content hash signature of the stage's input resources - * @param {object} stageInstance - The stage instance to cache (typically a reader or writer) - * @param {string[]} writtenResourcePaths - Set of resource paths written during this stage - * @returns {void} + * @public + * @param {string} stageId Identifier for the stage (e.g., "task/generateBundle") + * @param {string} signature Content hash signature of the stage's input resources + * @param {object} stageInstance The stage instance to cache (typically a reader or writer) + * @param {string[]} writtenResourcePaths Array of resource paths written during this stage */ addSignature(stageId, signature, stageInstance, writtenResourcePaths) { if (!this.#stageIdToSignatures.has(stageId)) { @@ -58,8 +60,9 @@ export default class StageCache { * Looks up a previously cached stage by its ID and signature. Returns null * if either the stage ID or signature is not found in the cache. * - * @param {string} stageId - Identifier for the stage to look up - * @param {string} signature - Signature hash to match + * @public + * @param {string} stageId Identifier for the stage to look up + * @param {string} signature Signature hash to match * @returns {StageCacheEntry|null} Cached stage entry with stage instance and written paths, * or null if not found */ @@ -80,7 +83,8 @@ export default class StageCache { * Each queue entry is a tuple of [stageId, signature] that can be used to * retrieve the full stage data via getCacheForSignature(). * - * @returns {Array<[string, string]>} Array of [stageId, signature] tuples that need persistence + * @public + * @returns {Array<[string, string]>} Array of [stageId, signature] tuples to persist */ flushCacheQueue() { const queue = this.#cacheQueue; @@ -91,6 +95,7 @@ export default class StageCache { /** * Checks if there are pending entries in the cache queue * + * @public * @returns {boolean} True if there are entries to flush, false otherwise */ hasPendingCacheQueue() { diff --git a/packages/project/lib/build/cache/utils.js b/packages/project/lib/build/cache/utils.js index 2b16d6105ca..e6b93545d1c 100644 --- a/packages/project/lib/build/cache/utils.js +++ b/packages/project/lib/build/cache/utils.js @@ -7,11 +7,13 @@ */ /** - * Compares a resource instance with cached resource metadata. + * Compares a resource instance with cached resource metadata * - * Optimized for quickly rejecting changed files + * Optimized for quickly rejecting changed files. Performs a series of checks + * starting with the cheapest (timestamp) to more expensive (integrity hash). * - * @param {object} resource Resource instance to compare + * @public + * @param {@ui5/fs/Resource} resource Resource instance to compare * @param {ResourceMetadata} resourceMetadata Resource metadata to compare against * @param {number} [indexTimestamp] Timestamp of the metadata creation * @returns {Promise} True if resource is found to match the metadata @@ -54,12 +56,14 @@ export async function matchResourceMetadata(resource, resourceMetadata, indexTim /** * Determines if a resource has changed compared to cached metadata * - * Optimized for quickly accepting unchanged files. - * I.e. Resources are assumed to be usually unchanged (same lastModified timestamp) + * Optimized for quickly accepting unchanged files. Resources are assumed to be + * usually unchanged (same lastModified timestamp). Performs checks from cheapest + * to most expensive, falling back to integrity comparison when necessary. * - * @param {object} resource - Resource instance with methods: getInode(), getSize(), getLastModified(), getIntegrity() - * @param {ResourceMetadata} cachedMetadata - Cached metadata from the tree - * @param {number} [indexTimestamp] - Timestamp when the tree state was created + * @public + * @param {@ui5/fs/Resource} resource Resource instance to compare + * @param {ResourceMetadata} cachedMetadata Cached metadata from the tree + * @param {number} [indexTimestamp] Timestamp when the tree state was created * @returns {Promise} True if resource content is unchanged * @throws {Error} If resource or metadata is undefined */ @@ -100,12 +104,16 @@ export async function matchResourceMetadataStrict(resource, cachedMetadata, inde /** - * Creates an index of resource metadata from an array of resources. + * Creates an index of resource metadata from an array of resources * - * @param {Array<@ui5/fs/Resource>} resources - Array of resources to index - * @param {boolean} [includeInode=false] - Whether to include inode information in the metadata + * Processes all resources in parallel, extracting their metadata including + * path, integrity, lastModified timestamp, and size. Optionally includes inode information. + * + * @public + * @param {Array<@ui5/fs/Resource>} resources Array of resources to index + * @param {boolean} [includeInode=false] Whether to include inode information in the metadata * @returns {Promise>} - * Array of resource metadata objects + * Array of resource metadata objects */ export async function createResourceIndex(resources, includeInode = false) { return await Promise.all(resources.map(async (resource) => { @@ -129,8 +137,7 @@ export async function createResourceIndex(resources, includeInode = false) { * when the first truthy value is found. If all promises resolve to falsy * values, null is returned. * - * @private - * @param {Promise[]} promises - Array of promises to evaluate + * @param {Promise[]} promises Array of promises to evaluate * @returns {Promise<*>} The first truthy resolved value or null if all are falsy */ export async function firstTruthy(promises) { diff --git a/packages/project/lib/build/helpers/BuildContext.js b/packages/project/lib/build/helpers/BuildContext.js index 438916cf359..9410da4a524 100644 --- a/packages/project/lib/build/helpers/BuildContext.js +++ b/packages/project/lib/build/helpers/BuildContext.js @@ -10,7 +10,6 @@ import {getBaseSignature} from "./getBuildSignature.js"; * @memberof @ui5/project/build/helpers */ class BuildContext { - #watchHandler; #cacheManager; constructor(graph, taskRepository, { // buildConfig diff --git a/packages/project/lib/build/helpers/ProjectBuildContext.js b/packages/project/lib/build/helpers/ProjectBuildContext.js index d611d4fa6b0..4d4e91c762f 100644 --- a/packages/project/lib/build/helpers/ProjectBuildContext.js +++ b/packages/project/lib/build/helpers/ProjectBuildContext.js @@ -8,18 +8,18 @@ import ProjectBuildCache from "../cache/ProjectBuildCache.js"; /** * Build context of a single project. Always part of an overall * [Build Context]{@link @ui5/project/build/helpers/BuildContext} - * - * @private + * @memberof @ui5/project/build/helpers */ class ProjectBuildContext { /** + * Creates a new ProjectBuildContext instance * - * @param {object} buildContext The build context. - * @param {object} project The project instance. - * @param {string} buildSignature The signature of the build. - * @param {ProjectBuildCache} buildCache - * @throws {Error} Throws an error if 'buildContext' or 'project' is missing. + * @param {@ui5/project/build/helpers/BuildContext} buildContext Overall build context + * @param {@ui5/project/specifications/Project} project Project instance to build + * @param {string} buildSignature Signature of the build configuration + * @param {@ui5/project/build/cache/ProjectBuildCache} buildCache Build cache instance + * @throws {Error} If 'buildContext' or 'project' is missing */ constructor(buildContext, project, buildSignature, buildCache) { if (!buildContext) { @@ -47,6 +47,18 @@ class ProjectBuildContext { }); } + /** + * Factory method to create and initialize a ProjectBuildContext instance + * + * This is the recommended way to create a ProjectBuildContext as it ensures + * proper initialization of the build signature and cache. + * + * @param {@ui5/project/build/helpers/BuildContext} buildContext Overall build context + * @param {@ui5/project/specifications/Project} project Project instance to build + * @param {object} cacheManager Cache manager instance + * @param {string} baseSignature Base signature for the build + * @returns {Promise<@ui5/project/build/helpers/ProjectBuildContext>} Initialized context instance + */ static async create(buildContext, project, cacheManager, baseSignature) { const buildSignature = getProjectSignature( baseSignature, project, buildContext.getGraph(), buildContext.getTaskRepository()); @@ -60,19 +72,45 @@ class ProjectBuildContext { ); } - + /** + * Checks whether this context is for the root project + * + * @returns {boolean} True if this is the root project context + */ isRootProject() { return this._project === this._buildContext.getRootProject(); } + /** + * Retrieves a build configuration option + * + * @param {string} key Option key to retrieve + * @returns {*} Option value + */ getOption(key) { return this._buildContext.getOption(key); } + /** + * Registers a cleanup task to be executed after the build + * + * Cleanup tasks are called after all regular tasks have completed, + * allowing resources to be freed or temporary data to be cleaned up. + * + * @param {Function} callback Cleanup callback function that accepts a force parameter + */ registerCleanupTask(callback) { this._queues.cleanup.push(callback); } + /** + * Executes all registered cleanup tasks + * + * Calls all cleanup callbacks in parallel and clears the cleanup queue. + * + * @param {boolean} force Whether to force cleanup even if conditions aren't met + * @returns {Promise} + */ async executeCleanupTasks(force) { await Promise.all(this._queues.cleanup.map((callback) => { return callback(force); @@ -81,11 +119,12 @@ class ProjectBuildContext { } /** - * Retrieve a single project from the dependency graph + * Retrieves a single project from the dependency graph * - * @param {string} [projectName] Name of the project to retrieve. Defaults to the project currently being built + * @param {string} [projectName] Name of the project to retrieve. + * Defaults to the project currently being built * @returns {@ui5/project/specifications/Project|undefined} - * project instance or undefined if the project is unknown to the graph + * Project instance or undefined if the project is unknown to the graph */ getProject(projectName) { if (projectName) { @@ -95,9 +134,10 @@ class ProjectBuildContext { } /** - * Retrieve a list of direct dependencies of a given project from the dependency graph + * Retrieves a list of direct dependencies of a given project from the dependency graph * - * @param {string} [projectName] Name of the project to retrieve. Defaults to the project currently being built + * @param {string} [projectName] Name of the project to retrieve. + * Defaults to the project currently being built * @returns {string[]} Names of all direct dependencies * @throws {Error} If the requested project is unknown to the graph */ @@ -105,6 +145,14 @@ class ProjectBuildContext { return this._buildContext.getGraph().getDependencies(projectName || this._project.getName()); } + /** + * Gets the list of required dependencies for the current project + * + * Determines which dependencies are actually needed based on the tasks that will be executed. + * Results are cached after the first call. + * + * @returns {Promise} Array of required dependency names + */ async getRequiredDependencies() { if (this._requiredDependencies) { return this._requiredDependencies; @@ -114,6 +162,18 @@ class ProjectBuildContext { return this._requiredDependencies; } + /** + * Gets the appropriate resource tag collection for a resource and tag + * + * Determines which tag collection (project-specific or build-level) should be used + * for the given resource and tag combination. Associates the resource with the current + * project if not already associated. + * + * @param {@ui5/fs/Resource} resource Resource to get tag collection for + * @param {string} tag Tag to check acceptance for + * @returns {@ui5/fs/internal/ResourceTagCollection} Appropriate tag collection + * @throws {Error} If no collection accepts the given tag + */ getResourceTagCollection(resource, tag) { if (!resource.hasProject()) { this._log.silly(`Associating resource ${resource.getPath()} with project ${this._project.getName()}`); @@ -132,6 +192,14 @@ class ProjectBuildContext { throw new Error(`Could not find collection for resource ${resource.getPath()} and tag ${tag}`); } + /** + * Gets the task utility instance for this build context + * + * Creates a TaskUtil instance on first access and caches it for subsequent calls. + * The TaskUtil provides helper functions for tasks during execution. + * + * @returns {@ui5/project/build/helpers/TaskUtil} Task utility instance + */ getTaskUtil() { if (!this._taskUtil) { this._taskUtil = new TaskUtil({ @@ -142,6 +210,14 @@ class ProjectBuildContext { return this._taskUtil; } + /** + * Gets the task runner instance for this build context + * + * Creates a TaskRunner instance on first access and caches it for subsequent calls. + * The TaskRunner is responsible for executing all build tasks for the project. + * + * @returns {@ui5/project/build/TaskRunner} Task runner instance + */ getTaskRunner() { if (!this._taskRunner) { this._taskRunner = new TaskRunner({ @@ -177,17 +253,17 @@ class ProjectBuildContext { } /** - * Prepares the project build by updating, and then validating the build cache as needed + * Prepares the project build by updating and validating the build cache + * + * Creates a dependency reader and validates the cache state against current resources. + * Must be called before buildProject(). * - * @param {boolean} initialBuild - * @returns {Promise} Undefined if no cache has been found. Otherwise a list of changed - * resources + * @param {boolean} initialBuild Whether this is the initial build (forces dependency index update) + * @returns {Promise} + * Undefined if no cache was found, false if cache is empty, + * or an array of changed resource paths since the last build */ async prepareProjectBuildAndValidateCache(initialBuild) { - // if (this.getBuildCache().hasCache() && this.getBuildCache().requiresDependencyIndexInitialization()) { - // const depReader = this.getTaskRunner().getDependenciesReader(this.getTaskRunner.getRequiredDependencies()); - // await this.getBuildCache().updateDependencyCache(depReader); - // } const depReader = await this.getTaskRunner().getDependenciesReader( await this.getTaskRunner().getRequiredDependencies(), true, // Force creation of new reader since project readers might have changed during their (re-)build @@ -198,9 +274,11 @@ class ProjectBuildContext { /** * Builds the project by running all required tasks - * Requires prepareProjectBuildAndValidateCache to be called beforehand * - * @returns {Promise} Resolves with list of changed resources since the last build + * Executes all configured build tasks for the project using the task runner. + * Must be called after prepareProjectBuildAndValidateCache(). + * + * @returns {Promise} List of changed resource paths since the last build */ async buildProject() { return await this.getTaskRunner().runTasks(); @@ -208,7 +286,10 @@ class ProjectBuildContext { /** * Informs the build cache about changed project source resources * - * @param {string[]} changedPaths - Changed project source file paths + * Notifies the cache that source files have changed so it can invalidate + * affected cache entries and mark the cache as stale. + * + * @param {string[]} changedPaths Changed project source file paths */ projectSourcesChanged(changedPaths) { return this._buildCache.projectSourcesChanged(changedPaths); @@ -217,12 +298,23 @@ class ProjectBuildContext { /** * Informs the build cache about changed dependency resources * - * @param {string[]} changedPaths - Changed dependency resource paths + * Notifies the cache that dependency resources have changed so it can invalidate + * affected cache entries and mark the cache as stale. + * + * @param {string[]} changedPaths Changed dependency resource paths */ dependencyResourcesChanged(changedPaths) { return this._buildCache.dependencyResourcesChanged(changedPaths); } + /** + * Gets the build manifest if available and compatible + * + * Retrieves the project's build manifest and validates its version. + * Only manifest versions 0.1 and 0.2 are currently supported. + * + * @returns {object|undefined} Build manifest object or undefined if unavailable or incompatible + */ #getBuildManifest() { const manifest = this._project.getBuildManifest(); if (!manifest) { @@ -237,6 +329,15 @@ class ProjectBuildContext { return; } + /** + * Gets metadata about the previous build from the build manifest + * + * Extracts timestamp and age information from the build manifest if available. + * + * @returns {object|null} Build metadata with timestamp and age, or null if no manifest exists + * @returns {string} return.timestamp ISO timestamp of the previous build + * @returns {string} return.age Human-readable age of the previous build + */ getBuildMetadata() { const buildManifest = this.#getBuildManifest(); if (!buildManifest) { @@ -251,10 +352,23 @@ class ProjectBuildContext { }; } + /** + * Gets the project build cache instance + * + * @returns {@ui5/project/build/cache/ProjectBuildCache} Build cache instance + */ getBuildCache() { return this._buildCache; } + /** + * Gets the build signature for this project + * + * The build signature uniquely identifies the build configuration and dependencies, + * used for cache validation and invalidation. + * + * @returns {string} Build signature string + */ getBuildSignature() { return this._buildSignature; } diff --git a/packages/project/test/lib/graph/ProjectGraph.js b/packages/project/test/lib/graph/ProjectGraph.js index 449a7d0bcec..9f546a47685 100644 --- a/packages/project/test/lib/graph/ProjectGraph.js +++ b/packages/project/test/lib/graph/ProjectGraph.js @@ -1328,6 +1328,7 @@ test("traverseDependenciesDepthFirst: Can't find start node", async (t) => { graph.addProject(await createProject("library.a")); const error = t.throws(() => { + // eslint-disable-next-line no-unused-vars for (const result of graph.traverseDependenciesDepthFirst("library.nonexistent")) { // Should not reach here } @@ -1385,6 +1386,7 @@ test("traverseDependenciesDepthFirst: Detect cycle", async (t) => { graph.declareDependency("library.b", "library.a"); const error = t.throws(() => { + // eslint-disable-next-line no-unused-vars for (const result of graph.traverseDependenciesDepthFirst("library.a")) { // Should not complete iteration } @@ -1624,6 +1626,7 @@ test("traverseDependents: Can't find start node", async (t) => { const error = t.throws(() => { // Consume the generator to trigger the error + // eslint-disable-next-line no-unused-vars for (const result of graph.traverseDependents("library.nonexistent")) { // Should not reach here } @@ -1683,6 +1686,7 @@ test("traverseDependents: Detect cycle", async (t) => { graph.declareDependency("library.b", "library.a"); const error = t.throws(() => { + // eslint-disable-next-line no-unused-vars for (const result of graph.traverseDependents("library.a")) { // Should not complete iteration } From 2bf0409b4b050dcf2ed231ce74ed6c40185f8606 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Tue, 20 Jan 2026 21:32:17 +0100 Subject: [PATCH 104/110] refactor(project): Add cache write perf logging --- packages/project/lib/build/ProjectBuilder.js | 6 ++---- packages/project/lib/build/cache/ProjectBuildCache.js | 11 +++++++---- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 79f43399048..b5afa95c350 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -324,13 +324,11 @@ class ProjectBuilder { if (includedDependencies.length === this._graph.getSize() - 1) { this.#log.info(` Including all dependencies`); } else { - this.#log.info(` Requested dependencies:`); - this.#log.info(` + ${includedDependencies.join("\n + ")}`); + this.#log.info(` Requested dependencies:\n + ${includedDependencies.join("\n + ")}`); } } if (excludedDependencies.length) { - this.#log.info(` Excluded dependencies:`); - this.#log.info(` - ${excludedDependencies.join("\n + ")}`); + this.#log.info(` Excluded dependencies:\n - ${excludedDependencies.join("\n + ")}`); } const rootProjectName = this._graph.getRoot().getName(); diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index f71122b94da..459e585159c 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -840,12 +840,10 @@ export default class ProjectBuildCache { * 3. Stores all stage caches from the queue * * @public - * @param {object} buildManifest Build manifest containing metadata about the build - * @param {string} buildManifest.manifestVersion Version of the manifest format - * @param {string} buildManifest.signature Build signature * @returns {Promise} */ - async writeCache(buildManifest) { + async writeCache() { + const cacheWriteStart = performance.now(); await Promise.all([ this.#writeResultCache(), @@ -854,6 +852,11 @@ export default class ProjectBuildCache { this.#writeSourceIndex(), ]); + if (log.isLevelEnabled("perf")) { + log.perf( + `Wrote build cache for project ${this.#project.getName()} in ` + + `${(performance.now() - cacheWriteStart).toFixed(2)} ms`); + } } /** From dc968e1baf3d571e6296d537cba7feea2d674d46 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 21 Jan 2026 10:35:12 +0100 Subject: [PATCH 105/110] refactor(project): Improve stage change handling --- .../lib/build/cache/ProjectBuildCache.js | 56 ++++++++++++------- .../project/lib/specifications/Project.js | 4 +- 2 files changed, 39 insertions(+), 21 deletions(-) diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index 459e585159c..bb3f6f52c7a 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -294,9 +294,19 @@ export default class ProjectBuildCache { this.#project.useResultStage(); const writtenResourcePaths = new Set(); for (const [stageName, stageCache] of importedStages) { - this.#project.setStage(stageName, stageCache.stage); - for (const resourcePath of stageCache.writtenResourcePaths) { - writtenResourcePaths.add(resourcePath); + // Check whether the stage differs form the one currently in use + if (this.#currentStageSignatures.get(stageName)?.join("-") !== stageCache.signature) { + // Set stage + this.#project.setStage(stageName, stageCache.stage); + + // Store signature for later use in result stage signature calculation + this.#currentStageSignatures.set(stageName, stageCache.signature.split("-")); + + // Cached stage likely differs from the previous one (if any) + // Add all resources written by the cached stage to the set of written/potentially changed resources + for (const resourcePath of stageCache.writtenResourcePaths) { + writtenResourcePaths.add(resourcePath); + } } } return Array.from(writtenResourcePaths); @@ -391,15 +401,17 @@ export default class ProjectBuildCache { }); const stageCache = await this.#findStageCache(stageName, stageSignatures); + const oldStageSig = this.#currentStageSignatures.get(stageName)?.join("-"); if (stageCache) { - const stageChanged = this.#project.setStage(stageName, stageCache.stage); + // Check whether the stage actually changed + if (stageCache.signature !== oldStageSig) { + this.#project.setStage(stageName, stageCache.stage); - // Store dependency signature for later use in result stage signature calculation - this.#currentStageSignatures.set(stageName, stageCache.signature.split("-")); + // Store new stage signature for later use in result stage signature calculation + this.#currentStageSignatures.set(stageName, stageCache.signature.split("-")); - // Cached stage might differ from the previous one - // Add all resources written by the cached stage to the set of written/potentially changed resources - if (stageChanged) { + // Cached stage likely differs from the previous one (if any) + // Add all resources written by the cached stage to the set of written/potentially changed resources for (const resourcePath of stageCache.writtenResourcePaths) { if (!this.#writtenResultResourcePaths.includes(resourcePath)) { this.#writtenResultResourcePaths.push(resourcePath); @@ -439,7 +451,21 @@ export default class ProjectBuildCache { if (deltaStageCache) { // Store dependency signature for later use in result stage signature calculation const [foundProjectSig, foundDepSig] = deltaStageCache.signature.split("-"); - this.#currentStageSignatures.set(stageName, [foundProjectSig, foundDepSig]); + + // Check whether the stage actually changed + if (oldStageSig !== deltaStageCache.signature) { + this.#currentStageSignatures.set(stageName, [foundProjectSig, foundDepSig]); + + // Cached stage likely differs from the previous one (if any) + // Add all resources written by the cached stage to the set of written/potentially changed resources + for (const resourcePath of deltaStageCache.writtenResourcePaths) { + if (!this.#writtenResultResourcePaths.includes(resourcePath)) { + this.#writtenResultResourcePaths.push(resourcePath); + } + } + } + + // Create new signature and determine changed resource paths const projectDeltaInfo = projectDeltas.get(foundProjectSig); const dependencyDeltaInfo = depDeltas.get(foundDepSig); @@ -447,14 +473,6 @@ export default class ProjectBuildCache { projectDeltaInfo?.newSignature ?? foundProjectSig, dependencyDeltaInfo?.newSignature ?? foundDepSig); - // Using cached stage which might differ from the previous one - // Add all resources written by the cached stage to the set of written/potentially changed resources - for (const resourcePath of deltaStageCache.writtenResourcePaths) { - if (!this.#writtenResultResourcePaths.includes(resourcePath)) { - this.#writtenResultResourcePaths.push(resourcePath); - } - } - log.verbose( `Using delta cached stage for task ${taskName} in project ${this.#project.getName()} ` + `with original signature ${deltaStageCache.signature} (now ${newSignature}) ` + @@ -616,8 +634,8 @@ export default class ProjectBuildCache { log.verbose(`Caching stage for task ${taskName} in project ${this.#project.getName()} ` + `with signature ${stageSignature}`); + // Store resulting stage in stage cache - // TODO: Check whether signature already exists and avoid invalidating following tasks this.#stageCache.addSignature( this.#getStageNameForTask(taskName), stageSignature, this.#project.getStage(), writtenResourcePaths); diff --git a/packages/project/lib/specifications/Project.js b/packages/project/lib/specifications/Project.js index dae4c8974d0..e366aee917a 100644 --- a/packages/project/lib/specifications/Project.js +++ b/packages/project/lib/specifications/Project.js @@ -456,7 +456,7 @@ class Project extends Specification { if (stageOrCachedWriter instanceof Stage) { newStage = stageOrCachedWriter; if (oldStage === newStage) { - // Same stage as before + // Same stage as before, nothing to do return false; // Stored stage has not changed } } else { @@ -464,7 +464,7 @@ class Project extends Specification { } this.#stages[stageIdx] = newStage; - // Update current stage reference if necessary + // If we are updating the current stage, make sure to update and reset all relevant references if (oldStage === this.#currentStage) { this.#currentStage = newStage; // Unset "current" reader/writer. They might be outdated From fa275ed67cb199d94a7615131d3ef1cf5622da46 Mon Sep 17 00:00:00 2001 From: Matthias Osswald Date: Wed, 21 Jan 2026 12:49:39 +0100 Subject: [PATCH 106/110] refactor(project): Implement queue system in BuildServer --- packages/project/lib/build/BuildServer.js | 219 +++++++++++++--------- 1 file changed, 132 insertions(+), 87 deletions(-) diff --git a/packages/project/lib/build/BuildServer.js b/packages/project/lib/build/BuildServer.js index 0d3bc17e6e0..2018c4cc98c 100644 --- a/packages/project/lib/build/BuildServer.js +++ b/packages/project/lib/build/BuildServer.js @@ -2,6 +2,8 @@ import EventEmitter from "node:events"; import {createReaderCollectionPrioritized} from "@ui5/fs/resourceFactory"; import BuildReader from "./BuildReader.js"; import WatchHandler from "./helpers/WatchHandler.js"; +import {getLogger} from "@ui5/logger"; +const log = getLogger("build:BuildServer"); /** * Development server that provides access to built project resources with automatic rebuilding @@ -27,7 +29,9 @@ import WatchHandler from "./helpers/WatchHandler.js"; class BuildServer extends EventEmitter { #graph; #projectBuilder; - #pCurrentBuild; + #buildQueue = new Map(); + #pendingBuildRequest = new Set(); + #activeBuild = null; #allReader; #rootReader; #dependenciesReader; @@ -65,12 +69,13 @@ class BuildServer extends EventEmitter { this.#getReaderForProjects.bind(this)); if (initialBuildIncludedDependencies.length > 0) { - this.#pCurrentBuild = projectBuilder.build({ - includedDependencies: initialBuildIncludedDependencies, - excludedDependencies: initialBuildExcludedDependencies - }).then((builtProjects) => { - this.#projectBuildFinished(builtProjects); - }).catch((err) => { + // Enqueue initial build dependencies + for (const projectName of initialBuildIncludedDependencies) { + if (!initialBuildExcludedDependencies.includes(projectName)) { + this.#pendingBuildRequest.add(projectName); + } + } + this.#processBuildQueue().catch((err) => { this.emit("error", err); }); } @@ -86,10 +91,19 @@ class BuildServer extends EventEmitter { }); watchHandler.on("sourcesChanged", (changes) => { // Inform project builder + + log.verbose("Source changes detected: ", changes); + const affectedProjects = this.#projectBuilder.resourcesChanged(changes); for (const projectName of affectedProjects) { + log.verbose(`Invalidating built project '${projectName}' due to source changes`); this.#projectReaders.delete(projectName); + // If project is currently in build queue, re-enqueue it for rebuild + if (this.#buildQueue.has(projectName)) { + log.verbose(`Re-enqueuing project '${projectName}' for rebuild`); + this.#pendingBuildRequest.add(projectName); + } } const changedResourcePaths = [...changes.values()].flat(); @@ -142,8 +156,8 @@ class BuildServer extends EventEmitter { * Gets a reader for a single project, building it if necessary * * Checks if the project has already been built and returns its reader from cache. - * If not built, waits for any in-progress build, then triggers a build for the - * requested project. + * If not built, enqueues the project for building and returns a promise that + * resolves when the reader is available. * * @param {string} projectName Name of the project to get reader for * @returns {Promise<@ui5/fs/AbstractReader>} Reader for the built project @@ -152,73 +166,30 @@ class BuildServer extends EventEmitter { if (this.#projectReaders.has(projectName)) { return this.#projectReaders.get(projectName); } - if (this.#pCurrentBuild) { - // If set, await currently running build - await this.#pCurrentBuild; - } - if (this.#projectReaders.has(projectName)) { - return this.#projectReaders.get(projectName); - } - this.#pCurrentBuild = this.#projectBuilder.build({ - includedDependencies: [projectName] - }).catch((err) => { - this.emit("error", err); - }); - const builtProjects = await this.#pCurrentBuild; - this.#projectBuildFinished(builtProjects); - - // Clear current build promise - this.#pCurrentBuild = null; - - return this.#projectReaders.get(projectName); + return this.#enqueueBuild(projectName); } /** * Gets a combined reader for multiple projects, building them if necessary * - * Determines which projects need to be built, waits for any in-progress build, - * then triggers a build for any missing projects. Returns a prioritized collection - * reader combining all requested projects. + * Enqueues all projects that need to be built and waits for all of them to complete. + * Returns a prioritized collection reader combining all requested projects. * * @param {string[]} projectNames Array of project names to get readers for * @returns {Promise<@ui5/fs/ReaderCollection>} Combined reader for all requested projects */ async #getReaderForProjects(projectNames) { - let projectsRequiringBuild = []; - for (const projectName of projectNames) { - if (!this.#projectReaders.has(projectName)) { - projectsRequiringBuild.push(projectName); - } - } - if (projectsRequiringBuild.length === 0) { - // Projects already built - return this.#getReaderForCachedProjects(projectNames); - } - if (this.#pCurrentBuild) { - // If set, await currently running build - await this.#pCurrentBuild; - } - projectsRequiringBuild = []; + // Enqueue all projects that aren't cached yet + const buildPromises = []; for (const projectName of projectNames) { if (!this.#projectReaders.has(projectName)) { - projectsRequiringBuild.push(projectName); + buildPromises.push(this.#enqueueBuild(projectName)); } } - if (projectsRequiringBuild.length === 0) { - // Projects already built - return this.#getReaderForCachedProjects(projectNames); + // Wait for all builds to complete + if (buildPromises.length > 0) { + await Promise.all(buildPromises); } - this.#pCurrentBuild = this.#projectBuilder.build({ - includedDependencies: projectsRequiringBuild - }).catch((err) => { - this.emit("error", err); - }); - const builtProjects = await this.#pCurrentBuild; - this.#projectBuildFinished(builtProjects); - - // Clear current build promise - this.#pCurrentBuild = null; - return this.#getReaderForCachedProjects(projectNames); } @@ -245,32 +216,106 @@ class BuildServer extends EventEmitter { }); } - // async #getReaderForAllProjects() { - // if (this.#pCurrentBuild) { - // // If set, await initial build - // await this.#pCurrentBuild; - // } - // if (this.#allProjectsReader) { - // return this.#allProjectsReader; - // } - // this.#pCurrentBuild = this.#projectBuilder.build({ - // includedDependencies: ["*"] - // }).catch((err) => { - // this.emit("error", err); - // }); - // const builtProjects = await this.#pCurrentBuild; - // this.#projectBuildFinished(builtProjects); - - // // Clear current build promise - // this.#pCurrentBuild = null; - - // // Create a combined reader for all projects - // this.#allProjectsReader = createReaderCollectionPrioritized({ - // name: "All projects build reader", - // readers: [...this.#projectReaders.values()] - // }); - // return this.#allProjectsReader; - // } + /** + * Enqueues a project for building and returns a promise that resolves with its reader + * + * If the project is already queued, returns the existing promise. Otherwise, creates + * a new promise, adds the project to the pending build queue, and triggers queue processing. + * + * @param {string} projectName Name of the project to enqueue + * @returns {Promise<@ui5/fs/AbstractReader>} Promise that resolves with the project's reader + */ + #enqueueBuild(projectName) { + // If already queued, return existing promise + if (this.#buildQueue.has(projectName)) { + return this.#buildQueue.get(projectName).promise; + } + + log.verbose(`Enqueuing project '${projectName}' for build`); + + // Create new promise for this project + let resolve; + let reject; + const promise = new Promise((res, rej) => { + resolve = res; + reject = rej; + }); + + // Store promise and resolvers in the queue + this.#buildQueue.set(projectName, {promise, resolve, reject}); + + // Add to pending build requests + this.#pendingBuildRequest.add(projectName); + + // Trigger queue processing if no build is active + if (!this.#activeBuild) { + this.#processBuildQueue().catch((err) => { + this.emit("error", err); + }); + } + + return promise; + } + + /** + * Processes the build queue by batching pending projects and building them + * + * Runs while there are pending build requests. Collects all pending projects, + * builds them in a single batch, resolves/rejects promises for built projects, + * and handles errors with proper isolation. + * + * @returns {Promise} Promise that resolves when queue processing is complete + */ + async #processBuildQueue() { + // Process queue while there are pending requests + while (this.#pendingBuildRequest.size > 0) { + // Collect all pending projects for this batch + const projectsToBuild = Array.from(this.#pendingBuildRequest); + this.#pendingBuildRequest.clear(); + + log.verbose(`Building projects: ${projectsToBuild.join(", ")}`); + + // Set active build to prevent concurrent builds + const buildPromise = this.#activeBuild = this.#projectBuilder.build({ + includedDependencies: projectsToBuild + }); + + try { + const builtProjects = await buildPromise; + this.#projectBuildFinished(builtProjects); + + // Resolve promises for all successfully built projects + for (const projectName of builtProjects) { + const queueEntry = this.#buildQueue.get(projectName); + if (queueEntry) { + const reader = this.#projectReaders.get(projectName); + queueEntry.resolve(reader); + // Only remove from queue if not re-enqueued during build + if (!this.#pendingBuildRequest.has(projectName)) { + log.verbose(`Project '${projectName}' build finished. Removing from build queue.`); + this.#buildQueue.delete(projectName); + } + } + } + } catch (err) { + // Build failed - reject promises for projects that weren't built + for (const projectName of projectsToBuild) { + log.error(`Project '${projectName}' build failed: ${err.message}`); + const queueEntry = this.#buildQueue.get(projectName); + if (queueEntry && !this.#projectReaders.has(projectName)) { + queueEntry.reject(err); + this.#buildQueue.delete(projectName); + this.#pendingBuildRequest.delete(projectName); + } + } + // Re-throw to be handled by caller + throw err; + } finally { + // Clear active build + this.#activeBuild = null; + } + } + } /** * Handles completion of a project build From 6b8cb11850167630fc789ec8d31a1a17d18fdc09 Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 21 Jan 2026 13:13:51 +0100 Subject: [PATCH 107/110] refactor(server): Add error callback and handle in CLI This allows the server to propagate errors to the CLI to be handled there. --- packages/cli/lib/cli/commands/serve.js | 6 +++++- packages/server/lib/server.js | 7 +++---- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/packages/cli/lib/cli/commands/serve.js b/packages/cli/lib/cli/commands/serve.js index 4719e82bf34..218c72ab1d0 100644 --- a/packages/cli/lib/cli/commands/serve.js +++ b/packages/cli/lib/cli/commands/serve.js @@ -146,7 +146,10 @@ serve.handler = async function(argv) { serverConfig.cert = cert; } - const {h2, port: actualPort} = await serverServe(graph, serverConfig); + const {promise: pOnError, reject} = Promise.withResolvers(); + const {h2, port: actualPort} = await serverServe(graph, serverConfig, function(err) { + reject(err); + }); const protocol = h2 ? "https" : "http"; let browserUrl = protocol + "://localhost:" + actualPort; @@ -183,6 +186,7 @@ serve.handler = async function(argv) { const {default: open} = await import("open"); open(browserUrl); } + await pOnError; // Await errors that should bubble into the yargs handler }; export default serve; diff --git a/packages/server/lib/server.js b/packages/server/lib/server.js index 5025d335af8..4a3ec568dcd 100644 --- a/packages/server/lib/server.js +++ b/packages/server/lib/server.js @@ -127,6 +127,7 @@ async function _addSsl({app, key, cert}) { * are send for any requested *.html file * @param {boolean} [options.serveCSPReports=false] Enable CSP reports serving for request url * '/.ui5/csp/csp-reports.json' + * @param {Function} error Error callback. Will be called when an error occurs outside of request handling. * @returns {Promise} Promise resolving once the server is listening. * It resolves with an object containing the port, * h2-flag and a close function, @@ -135,7 +136,7 @@ async function _addSsl({app, key, cert}) { export async function serve(graph, { port: requestedPort, changePortIfInUse = false, h2 = false, key, cert, acceptRemoteConnections = false, sendSAPTargetCSP = false, simpleIndex = false, serveCSPReports = false -}) { +}, error) { const rootProject = graph.getRoot(); const readers = []; @@ -182,9 +183,7 @@ export async function serve(graph, { }; buildServer.on("error", async (err) => { - log.error(`Error during project build: ${err.message}`); - log.verbose(err.stack); - process.exit(1); + error(err); }); const middlewareManager = new MiddlewareManager({ From 51a745fb3e709b424663815b543152bab38cbf4b Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 21 Jan 2026 14:41:48 +0100 Subject: [PATCH 108/110] refactor(project): ProjectBuilder to provide callback on project built --- packages/project/lib/build/ProjectBuilder.js | 59 ++++++++++++------- .../lib/build/cache/ProjectBuildCache.js | 39 ++++++++---- .../lib/build/helpers/ProjectBuildContext.js | 15 +++-- 3 files changed, 75 insertions(+), 38 deletions(-) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index b5afa95c350..2fb7dd0e1ba 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -126,10 +126,10 @@ class ProjectBuilder { async build({ includedDependencies = [], excludedDependencies = [], - }) { + }, projectBuiltCallback) { const requestedProjects = this._determineRequestedProjects( includedDependencies, excludedDependencies); - return await this.#build(requestedProjects); + return await this.#build(requestedProjects, projectBuiltCallback); } /** @@ -175,12 +175,25 @@ class ProjectBuilder { await rmrf(destPath); } - const fsTarget = resourceFactory.createAdapter({ - fsBasePath: destPath, - virBasePath: "/" + let fsTarget; + if (!process.env.UI5_BUILD_NO_WRITE_DEST) { + fsTarget = resourceFactory.createAdapter({ + fsBasePath: destPath, + virBasePath: "/" + }); + } + const pWrites = []; + await this.#build(requestedProjects, (projectName, project, projectBuildContext) => { + if (!fsTarget) { + // Nothing to write to + return; + } + // Only write requested projects to target + // (excluding dependencies that were required to be built, but not requested) + this.#log.verbose(`Writing out files for project ${projectName}...`); + pWrites.push(this._writeResults(projectBuildContext, fsTarget)); }); - - await this.#build(requestedProjects, fsTarget); + await Promise.all(pWrites); } _determineRequestedProjects(includedDependencies, excludedDependencies, dependencyIncludes) { @@ -209,7 +222,7 @@ class ProjectBuilder { return requestedProjects; } - async #build(requestedProjects, fsTarget) { + async #build(requestedProjects, projectBuiltCallback) { if (this.#buildIsRunning) { throw new Error("A build is already running"); } @@ -250,7 +263,7 @@ class ProjectBuilder { const cleanupSigHooks = this._registerCleanupSigHooks(); try { const startTime = process.hrtime(); - const pWrites = []; + const pCacheWrites = []; while (queue.length) { const projectBuildContext = queue.shift(); const project = projectBuildContext.getProject(); @@ -262,27 +275,31 @@ class ProjectBuilder { if (alreadyBuilt.includes(projectName)) { this.#log.skipProjectBuild(projectName, projectType); } else { - if (await projectBuildContext.prepareProjectBuildAndValidateCache(true)) { + let changedPaths = await projectBuildContext.prepareProjectBuildAndValidateCache(); + if (changedPaths) { this.#log.skipProjectBuild(projectName, projectType); alreadyBuilt.push(projectName); } else { - await this._buildProject(projectBuildContext); + changedPaths = await this._buildProject(projectBuildContext); + } + if (changedPaths.length) { + // Propagate resource changes to following projects + for (const pbc of queue) { + pbc.dependencyResourcesChanged(changedPaths); + } } } - if (!alreadyBuilt.includes(projectName) && !process.env.UI5_BUILD_NO_WRITE_CACHE) { - this.#log.verbose(`Triggering cache update for project ${projectName}...`); - pWrites.push(projectBuildContext.getBuildCache().writeCache()); + if (projectBuiltCallback && requestedProjects.includes(projectName)) { + projectBuiltCallback(projectName, project, projectBuildContext); } - if (fsTarget && requestedProjects.includes(projectName) && !process.env.UI5_BUILD_NO_WRITE_DEST) { - // Only write requested projects to target - // (excluding dependencies that were required to be built, but not requested) - this.#log.verbose(`Writing out files for project ${projectName}...`); - pWrites.push(this._writeResults(projectBuildContext, fsTarget)); + if (!alreadyBuilt.includes(projectName) && !process.env.UI5_BUILD_NO_WRITE_CACHE) { + this.#log.verbose(`Triggering cache update for project ${projectName}...`); + pCacheWrites.push(projectBuildContext.getBuildCache().writeCache()); } } - await Promise.all(pWrites); + await Promise.all(pCacheWrites); this.#log.info(`Build succeeded in ${this._getElapsedTime(startTime)}`); } catch (err) { this.#log.error(`Build failed`); @@ -304,7 +321,7 @@ class ProjectBuilder { const changedResources = await projectBuildContext.buildProject(); this.#log.endProjectBuild(projectName, projectType); - return {changedResources}; + return changedResources; } _createProjectFilter({ diff --git a/packages/project/lib/build/cache/ProjectBuildCache.js b/packages/project/lib/build/cache/ProjectBuildCache.js index bb3f6f52c7a..98561518f88 100644 --- a/packages/project/lib/build/cache/ProjectBuildCache.js +++ b/packages/project/lib/build/cache/ProjectBuildCache.js @@ -95,6 +95,20 @@ export default class ProjectBuildCache { return cache; } + async refreshDependencyIndices(dependencyReader) { + if (this.#cacheState === CACHE_STATES.EMPTY) { + // No need to update indices for empty cache + return false; + } + const updateStart = performance.now(); + await this.#refreshDependencyIndices(dependencyReader); + if (log.isLevelEnabled("perf")) { + log.perf( + `Refreshed dependency indices for project ${this.#project.getName()} ` + + `in ${(performance.now() - updateStart).toFixed(2)} ms`); + } + } + /** * Sets the dependency reader for accessing dependency resources * @@ -103,28 +117,21 @@ export default class ProjectBuildCache { * * @public * @param {@ui5/fs/AbstractReader} dependencyReader Reader for dependency resources - * @param {boolean} [forceDependencyUpdate=false] Force update of dependency indices * @returns {Promise} * Undefined if no cache has been found, false if cache is empty, * or an array of changed resource paths */ - async prepareProjectBuildAndValidateCache(dependencyReader, forceDependencyUpdate = false) { + async prepareProjectBuildAndValidateCache(dependencyReader) { this.#currentProjectReader = this.#project.getReader(); this.#currentDependencyReader = dependencyReader; + if (this.#cacheState === CACHE_STATES.INITIALIZING) { + throw new Error(`Project ${this.#project.getName()} build cache unexpectedly not yet initialized.`); + } if (this.#cacheState === CACHE_STATES.EMPTY) { log.verbose(`Project ${this.#project.getName()} has empty cache, skipping change processing.`); return false; } - if (forceDependencyUpdate) { - const updateStart = performance.now(); - await this.#refreshDependencyIndices(dependencyReader); - if (log.isLevelEnabled("perf")) { - log.perf( - `Refreshed dependency indices for project ${this.#project.getName()} ` + - `in ${(performance.now() - updateStart).toFixed(2)} ms`); - } - } const flushStart = performance.now(); await this.#flushPendingChanges(); if (log.isLevelEnabled("perf")) { @@ -190,7 +197,7 @@ export default class ProjectBuildCache { async #refreshDependencyIndices(dependencyReader) { let depIndicesChanged = false; await Promise.all(Array.from(this.#taskCache.values()).map(async (taskCache) => { - const changed = await taskCache.refreshDependencyIndices(this.#currentDependencyReader); + const changed = await taskCache.refreshDependencyIndices(dependencyReader); if (changed) { depIndicesChanged = true; } @@ -198,6 +205,9 @@ export default class ProjectBuildCache { if (depIndicesChanged) { // Relevant resources have changed, mark the cache as dirty this.#cacheState = CACHE_STATES.DIRTY; + } else if (this.#cacheState === CACHE_STATES.INITIALIZING) { + // Dependency index is up-to-date. Set cache state to initialized if it was still initializing (not dirty) + this.#cacheState = CACHE_STATES.INITIALIZED; } // Reset pending dependency changes since indices are fresh now anyways this.#changedDependencyResourcePaths = []; @@ -796,9 +806,12 @@ export default class ProjectBuildCache { } if (changedPaths.length) { + // Relevant resources have changed, mark the cache as dirty this.#cacheState = CACHE_STATES.DIRTY; } else { - this.#cacheState = CACHE_STATES.INITIALIZED; + // Source index is up-to-date, awaiting dependency indices validation + // Status remains at initializing + this.#cacheState = CACHE_STATES.INITIALIZING; } this.#sourceIndex = resourceIndex; this.#cachedSourceSignature = resourceIndex.getSignature(); diff --git a/packages/project/lib/build/helpers/ProjectBuildContext.js b/packages/project/lib/build/helpers/ProjectBuildContext.js index 4d4e91c762f..83afa453183 100644 --- a/packages/project/lib/build/helpers/ProjectBuildContext.js +++ b/packages/project/lib/build/helpers/ProjectBuildContext.js @@ -12,6 +12,8 @@ import ProjectBuildCache from "../cache/ProjectBuildCache.js"; * @memberof @ui5/project/build/helpers */ class ProjectBuildContext { + #initialPrepareRun = true; + /** * Creates a new ProjectBuildContext instance * @@ -258,18 +260,23 @@ class ProjectBuildContext { * Creates a dependency reader and validates the cache state against current resources. * Must be called before buildProject(). * - * @param {boolean} initialBuild Whether this is the initial build (forces dependency index update) * @returns {Promise} * Undefined if no cache was found, false if cache is empty, * or an array of changed resource paths since the last build */ - async prepareProjectBuildAndValidateCache(initialBuild) { + async prepareProjectBuildAndValidateCache() { const depReader = await this.getTaskRunner().getDependenciesReader( await this.getTaskRunner().getRequiredDependencies(), true, // Force creation of new reader since project readers might have changed during their (re-)build ); - this._currentDependencyReader = depReader; - return await this.getBuildCache().prepareProjectBuildAndValidateCache(depReader, initialBuild); + if (this.#initialPrepareRun) { + this.#initialPrepareRun = false; + // If this is the first build of the project, the dependency indices must be refreshed + // Later builds of the same project during the same overall build can reuse the existing indices + // (they will be updated based on input via #dependencyResourcesChanged) + await this.getBuildCache().refreshDependencyIndices(depReader); + } + return await this.getBuildCache().prepareProjectBuildAndValidateCache(depReader); } /** From 323e81fae03b141b6331fc09002ebf78f9d91efb Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 21 Jan 2026 14:53:23 +0100 Subject: [PATCH 109/110] refactor(project): Do not always include root project in build --- packages/project/lib/build/ProjectBuilder.js | 24 ++++++++++---------- packages/project/lib/graph/ProjectGraph.js | 4 +++- 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/packages/project/lib/build/ProjectBuilder.js b/packages/project/lib/build/ProjectBuilder.js index 2fb7dd0e1ba..b4eb7abcb54 100644 --- a/packages/project/lib/build/ProjectBuilder.js +++ b/packages/project/lib/build/ProjectBuilder.js @@ -125,10 +125,11 @@ class ProjectBuilder { } async build({ + includeRootProject = true, includedDependencies = [], excludedDependencies = [], }, projectBuiltCallback) { const requestedProjects = this._determineRequestedProjects( - includedDependencies, excludedDependencies); + includeRootProject, includedDependencies, excludedDependencies); return await this.#build(requestedProjects, projectBuiltCallback); } @@ -168,7 +169,7 @@ class ProjectBuilder { } this.#log.info(`Target directory: ${destPath}`); const requestedProjects = this._determineRequestedProjects( - includedDependencies, excludedDependencies, dependencyIncludes); + true, includedDependencies, excludedDependencies, dependencyIncludes); if (cleanDest) { this.#log.info(`Cleaning target directory...`); @@ -196,10 +197,11 @@ class ProjectBuilder { await Promise.all(pWrites); } - _determineRequestedProjects(includedDependencies, excludedDependencies, dependencyIncludes) { + _determineRequestedProjects(includeRootProject, includedDependencies, excludedDependencies, dependencyIncludes) { // Get project filter function based on include/exclude params // (also logs some info to console) const filterProject = this._createProjectFilter({ + includeRootProject, explicitIncludes: includedDependencies, explicitExcludes: excludedDependencies, dependencyIncludes @@ -227,15 +229,12 @@ class ProjectBuilder { throw new Error("A build is already running"); } this.#buildIsRunning = true; - const rootProjectName = this._graph.getRoot().getName(); - this.#log.info(`Preparing build for project ${rootProjectName}`); - // this._flushResourceChanges(); const projectBuildContexts = await this._buildContext.getRequiredProjectContexts(requestedProjects); // Create build queue based on graph depth-first search to ensure correct build order const queue = []; - const builtProjects = []; + const processedProjectNames = []; for (const {project} of this._graph.traverseDependenciesDepthFirst(true)) { const projectName = project.getName(); const projectBuildContext = projectBuildContexts.get(projectName); @@ -244,7 +243,7 @@ class ProjectBuilder { // => This project needs to be built or, in case it has already // been built, it's build result needs to be written out (if requested) queue.push(projectBuildContext); - builtProjects.push(projectName); + processedProjectNames.push(projectName); } } @@ -309,7 +308,7 @@ class ProjectBuilder { await this._executeCleanupTasks(); } this.#buildIsRunning = false; - return builtProjects; + return processedProjectNames; } async _buildProject(projectBuildContext) { @@ -325,6 +324,7 @@ class ProjectBuilder { } _createProjectFilter({ + includeRootProject = true, dependencyIncludes, explicitIncludes, explicitExcludes @@ -339,7 +339,7 @@ class ProjectBuilder { if (includedDependencies.length) { if (includedDependencies.length === this._graph.getSize() - 1) { - this.#log.info(` Including all dependencies`); + this.#log.info(` Requested all dependencies`); } else { this.#log.info(` Requested dependencies:\n + ${includedDependencies.join("\n + ")}`); } @@ -355,8 +355,8 @@ class ProjectBuilder { dep.test(projectName) : dep === projectName); } - if (projectName === rootProjectName) { - // Always include the root project + if (includeRootProject && projectName === rootProjectName) { + // Include root project return true; } diff --git a/packages/project/lib/graph/ProjectGraph.js b/packages/project/lib/graph/ProjectGraph.js index a738eede4a2..f3d2ccc0384 100644 --- a/packages/project/lib/graph/ProjectGraph.js +++ b/packages/project/lib/graph/ProjectGraph.js @@ -750,6 +750,7 @@ class ProjectGraph { } async serve({ + initialBuildRootProject = false, initialBuildIncludedDependencies = [], initialBuildExcludedDependencies = [], selfContained = false, cssVariables = false, jsdoc = false, createBuildManifest = false, includedTasks = [], excludedTasks = [], @@ -777,7 +778,8 @@ class ProjectGraph { const { default: BuildServer } = await import("../build/BuildServer.js"); - return new BuildServer(this, builder, initialBuildIncludedDependencies, initialBuildExcludedDependencies); + return new BuildServer(this, builder, + initialBuildRootProject, initialBuildIncludedDependencies, initialBuildExcludedDependencies); } /** From 48ff98fef9d4848fa49e94ab0ca62ffe4b5c620a Mon Sep 17 00:00:00 2001 From: Merlin Beutlberger Date: Wed, 21 Jan 2026 15:58:14 +0100 Subject: [PATCH 110/110] refactor(project): Refactor BuildServer init, add tests --- packages/project/lib/build/BuildServer.js | 40 +++- .../project/lib/build/helpers/WatchHandler.js | 11 +- .../lib/build/ProjectBuilder.integration.js | 2 +- .../lib/build/ProjectServer.integration.js | 226 ++++++++++++++++++ 4 files changed, 271 insertions(+), 8 deletions(-) create mode 100644 packages/project/test/lib/build/ProjectServer.integration.js diff --git a/packages/project/lib/build/BuildServer.js b/packages/project/lib/build/BuildServer.js index 2018c4cc98c..5949a9a1d3d 100644 --- a/packages/project/lib/build/BuildServer.js +++ b/packages/project/lib/build/BuildServer.js @@ -29,6 +29,8 @@ const log = getLogger("build:BuildServer"); class BuildServer extends EventEmitter { #graph; #projectBuilder; + #watchHandler; + #rootProjectName; #buildQueue = new Map(); #pendingBuildRequest = new Set(); #activeBuild = null; @@ -46,12 +48,17 @@ class BuildServer extends EventEmitter { * @public * @param {@ui5/project/graph/ProjectGraph} graph Project graph containing all projects * @param {@ui5/project/build/ProjectBuilder} projectBuilder Builder instance for executing builds + * @param {boolean} initialBuildRootProject Whether to build the root project in the initial build * @param {string[]} initialBuildIncludedDependencies Project names to include in initial build * @param {string[]} initialBuildExcludedDependencies Project names to exclude from initial build */ - constructor(graph, projectBuilder, initialBuildIncludedDependencies, initialBuildExcludedDependencies) { + constructor( + graph, projectBuilder, + initialBuildRootProject, initialBuildIncludedDependencies, initialBuildExcludedDependencies + ) { super(); this.#graph = graph; + this.#rootProjectName = graph.getRoot().getName(); this.#projectBuilder = projectBuilder; this.#allReader = new BuildReader("Build Server: All Projects Reader", Array.from(this.#graph.getProjects()), @@ -68,6 +75,9 @@ class BuildServer extends EventEmitter { this.#getReaderForProject.bind(this), this.#getReaderForProjects.bind(this)); + if (initialBuildRootProject) { + this.#pendingBuildRequest.add(this.#rootProjectName); + } if (initialBuildIncludedDependencies.length > 0) { // Enqueue initial build dependencies for (const projectName of initialBuildIncludedDependencies) { @@ -81,6 +91,7 @@ class BuildServer extends EventEmitter { } const watchHandler = new WatchHandler(); + this.#watchHandler = watchHandler; const allProjects = graph.getProjects(); watchHandler.watch(allProjects).catch((err) => { // Error during watch setup @@ -89,11 +100,14 @@ class BuildServer extends EventEmitter { watchHandler.on("error", (err) => { this.emit("error", err); }); - watchHandler.on("sourcesChanged", (changes) => { - // Inform project builder - - log.verbose("Source changes detected: ", changes); + watchHandler.on("change", (eventType, filePath, project) => { + log.verbose(`Source change detected: ${eventType} ${filePath} in project '${project.getName()}'`); + // TODO: Abort any active build + }); + watchHandler.on("batchedChanges", (changes) => { + log.verbose(`Received batched source changes for projects: ${[...changes.keys()].join(", ")}`); + // Inform project builder const affectedProjects = this.#projectBuilder.resourcesChanged(changes); for (const projectName of affectedProjects) { @@ -111,6 +125,14 @@ class BuildServer extends EventEmitter { }); } + async destroy() { + await this.#watchHandler.destroy(); + if (this.#activeBuild) { + // Await active build to finish + await this.#activeBuild; + } + } + /** * Gets a reader for all projects (root and dependencies) * @@ -271,13 +293,21 @@ class BuildServer extends EventEmitter { while (this.#pendingBuildRequest.size > 0) { // Collect all pending projects for this batch const projectsToBuild = Array.from(this.#pendingBuildRequest); + let buildRootProject = false; + if (projectsToBuild.includes(this.#rootProjectName)) { + buildRootProject = true; + } this.#pendingBuildRequest.clear(); log.verbose(`Building projects: ${projectsToBuild.join(", ")}`); // Set active build to prevent concurrent builds const buildPromise = this.#activeBuild = this.#projectBuilder.build({ + includeRootProject: buildRootProject, includedDependencies: projectsToBuild + }, (projectName, project) => { + // Project has been built and result can be served + // TODO: Immediately resolve pending promises here instead of waiting for full build to finish }); try { diff --git a/packages/project/lib/build/helpers/WatchHandler.js b/packages/project/lib/build/helpers/WatchHandler.js index 72ea95b65bc..23cd8d56133 100644 --- a/packages/project/lib/build/helpers/WatchHandler.js +++ b/packages/project/lib/build/helpers/WatchHandler.js @@ -32,7 +32,13 @@ class WatchHandler extends EventEmitter { await watcher.close(); }); watcher.on("all", (event, filePath) => { - this.#handleWatchEvents(event, filePath, project); + if (event === "addDir") { + // Ignore directory creation events + return; + } + this.#handleWatchEvents(event, filePath, project).catch((err) => { + this.emit("error", err); + }); }); const {promise, resolve: ready} = Promise.withResolvers(); readyPromises.push(promise); @@ -56,6 +62,7 @@ class WatchHandler extends EventEmitter { async #handleWatchEvents(eventType, filePath, project) { log.verbose(`File changed: ${eventType} ${filePath}`); await this.#fileChanged(project, filePath); + this.emit("change", eventType, filePath, project); } #fileChanged(project, filePath) { @@ -88,7 +95,7 @@ class WatchHandler extends EventEmitter { this.#sourceChanges = new Map(); try { - this.emit("sourcesChanged", sourceChanges); + this.emit("batchedChanges", sourceChanges); } catch (err) { this.emit("error", err); } diff --git a/packages/project/test/lib/build/ProjectBuilder.integration.js b/packages/project/test/lib/build/ProjectBuilder.integration.js index 0aab8ebbaf0..338393ddbd3 100644 --- a/packages/project/test/lib/build/ProjectBuilder.integration.js +++ b/packages/project/test/lib/build/ProjectBuilder.integration.js @@ -323,7 +323,7 @@ function getFixturePath(fixtureName) { } function getTmpPath(folderName) { - return fileURLToPath(new URL(`../../tmp/${folderName}`, import.meta.url)); + return fileURLToPath(new URL(`../../tmp/ProjectBuilder/${folderName}`, import.meta.url)); } async function rmrf(dirPath) { diff --git a/packages/project/test/lib/build/ProjectServer.integration.js b/packages/project/test/lib/build/ProjectServer.integration.js new file mode 100644 index 00000000000..0eed9db1d26 --- /dev/null +++ b/packages/project/test/lib/build/ProjectServer.integration.js @@ -0,0 +1,226 @@ +import test from "ava"; +import sinonGlobal from "sinon"; +import {fileURLToPath} from "node:url"; +import {setTimeout} from "node:timers/promises"; +import fs from "node:fs/promises"; +import {graphFromPackageDependencies} from "../../../lib/graph/graph.js"; +import {setLogLevel} from "@ui5/logger"; + +// Ensures that all logging code paths are tested +setLogLevel("silly"); + +test.beforeEach((t) => { + const sinon = t.context.sinon = sinonGlobal.createSandbox(); + + t.context.logEventStub = sinon.stub(); + t.context.buildMetadataEventStub = sinon.stub(); + t.context.projectBuildMetadataEventStub = sinon.stub(); + t.context.buildStatusEventStub = sinon.stub(); + t.context.projectBuildStatusEventStub = sinon.stub(); + + process.on("ui5.log", t.context.logEventStub); + process.on("ui5.build-metadata", t.context.buildMetadataEventStub); + process.on("ui5.project-build-metadata", t.context.projectBuildMetadataEventStub); + process.on("ui5.build-status", t.context.buildStatusEventStub); + process.on("ui5.project-build-status", t.context.projectBuildStatusEventStub); +}); + +test.afterEach.always(async (t) => { + await t.context.fixtureTester.teardown(); + t.context.sinon.restore(); + delete process.env.UI5_DATA_DIR; + + process.off("ui5.log", t.context.logEventStub); + process.off("ui5.build-metadata", t.context.buildMetadataEventStub); + process.off("ui5.project-build-metadata", t.context.projectBuildMetadataEventStub); + process.off("ui5.build-status", t.context.buildStatusEventStub); + process.off("ui5.project-build-status", t.context.projectBuildStatusEventStub); +}); + +test.serial("Serve application.a, request application resource", async (t) => { + const fixtureTester = new FixtureTester(t, "application.a"); + t.context.fixtureTester = fixtureTester; + + // #1 request with empty cache + await fixtureTester.serveProject(); + await fixtureTester.requestResource("/test.js", { + projects: { + "application.a": {} + } + }); + + // #2 request with cache + await fixtureTester.requestResource("/test.js", { + projects: {} + }); + + // Change a source file in application.a + const changedFilePath = `${fixtureTester.fixturePath}/webapp/test.js`; + await fs.appendFile(changedFilePath, `\ntest("line added");\n`); + + // #3 request with cache and changes + const res = await fixtureTester.requestResource("/test.js", { + projects: { + "application.a": { + skippedTasks: [ + "escapeNonAsciiCharacters", + // Note: replaceCopyright is skipped because no copyright is configured in the project + "replaceCopyright", + "enhanceManifest", + "generateFlexChangesBundle", + ] + } + } + }); + + // Check whether the changed file is in the destPath + const servedFileContent = await res.toString(); + t.true(servedFileContent.includes(`test("line added");`), "Resource contains changed file content"); +}); + +test.serial("Serve application.a, request library resource", async (t) => { + const fixtureTester = new FixtureTester(t, "application.a"); + t.context.fixtureTester = fixtureTester; + + // #1 request with empty cache + await fixtureTester.serveProject(); + await fixtureTester.requestResource("/resources/library/a/.library", { + projects: { + "library.a": {} + } + }); + + // #2 request with cache + await fixtureTester.requestResource("/resources/library/a/.library", { + projects: {} + }); + + // Change a source file in library.a + const changedFilePath = `${fixtureTester.fixturePath}/node_modules/collection/library.a/src/library/a/.library`; + await fs.appendFile(changedFilePath, `\n\n`); + + await setTimeout(500); // Wait for the file watcher to detect and propagate the change + + // #3 request with cache and changes + const res = await fixtureTester.requestResource("/resources/library/a/.library", { + projects: { + "library.a": { + skippedTasks: [ + "enhanceManifest", + "escapeNonAsciiCharacters", + "minify", + // Note: replaceCopyright is skipped because no copyright is configured in the project + "replaceBuildtime", + "replaceCopyright", + "replaceVersion", + ] + } + } + }); + + // Check whether the changed file is in the destPath + const servedFileContent = await res.getString(); + t.true(servedFileContent.includes(``), "Resource contains changed file content"); +}); + +function getFixturePath(fixtureName) { + return fileURLToPath(new URL(`../../fixtures/${fixtureName}`, import.meta.url)); +} + +function getTmpPath(folderName) { + return fileURLToPath(new URL(`../../tmp/ProjectServer/${folderName}`, import.meta.url)); +} + +async function rmrf(dirPath) { + return fs.rm(dirPath, {recursive: true, force: true}); +} + +class FixtureTester { + constructor(t, fixtureName) { + this._t = t; + this._sinon = t.context.sinon; + this._fixtureName = fixtureName; + this._initialized = false; + + // Public + this.fixturePath = getTmpPath(fixtureName); + } + + async _initialize() { + if (this._initialized) { + return; + } + process.env.UI5_DATA_DIR = getTmpPath(`${this._fixtureName}/.ui5`); + await rmrf(this.fixturePath); // Clean up any previous test runs + await fs.cp(getFixturePath(this._fixtureName), this.fixturePath, {recursive: true}); + this._initialized = true; + } + + async teardown() { + if (this._buildServer) { + await this._buildServer.destroy(); + } + } + + async serveProject({graphConfig = {}, config = {}} = {}) { + await this._initialize(); + + const graph = await graphFromPackageDependencies({ + ...graphConfig, + cwd: this.fixturePath, + }); + + // Execute the build + this._buildServer = await graph.serve(config); + this._buildServer.on("error", (err) => { + this._t.fail(`Build server error: ${err.message}`); + }); + this._reader = this._buildServer.getReader(); + } + + async requestResource(resource, assertions = {}) { + this._sinon.resetHistory(); + const res = await this._reader.byPath(resource); + // Apply assertions if provided + if (assertions) { + this._assertBuild(assertions); + } + return res; + } + + _assertBuild(assertions) { + const {projects = {}} = assertions; + const eventArgs = this._t.context.projectBuildStatusEventStub.args.map((args) => args[0]); + + const projectsInOrder = []; + const seenProjects = new Set(); + const tasksByProject = {}; + + for (const event of eventArgs) { + if (!seenProjects.has(event.projectName)) { + projectsInOrder.push(event.projectName); + seenProjects.add(event.projectName); + } + if (!tasksByProject[event.projectName]) { + tasksByProject[event.projectName] = {executed: [], skipped: []}; + } + if (event.status === "task-skip") { + tasksByProject[event.projectName].skipped.push(event.taskName); + } else if (event.status === "task-start") { + tasksByProject[event.projectName].executed.push(event.taskName); + } + } + + // Assert projects built in order + const expectedProjects = Object.keys(projects); + this._t.deepEqual(projectsInOrder, expectedProjects); + + // Assert skipped tasks per project + for (const [projectName, expectedSkipped] of Object.entries(projects)) { + const skippedTasks = expectedSkipped.skippedTasks || []; + const actualSkipped = (tasksByProject[projectName]?.skipped || []).sort(); + const expectedArray = skippedTasks.sort(); + this._t.deepEqual(actualSkipped, expectedArray); + } + } +}