refactor(project): Fix pattern matching and resource comparison

Author: RandomByte

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

@@ -188,7 +188,7 @@ export default class BuildTaskCache {
 	 * @param {object} resource - Resource instance to check
 	 * @returns {Promise<boolean>} 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<boolean>} 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;
 			}
 		}

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);

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;
 }