@atlaspack/core 2.12.1-canary.3425 → 2.12.1-canary.3426

package/lib/RequestTracker.js

@@ -3,7 +3,9 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = exports.RequestGraph = void 0;
+exports.RequestGraph = void 0;
+exports.cleanUpOrphans = cleanUpOrphans;
+exports.default = void 0;
 exports.getWatcherOptions = getWatcherOptions;
 exports.readAndDeserializeRequestGraph = readAndDeserializeRequestGraph;
 exports.requestTypes = exports.requestGraphEdgeTypes = void 0;
@@ -21,6 +23,13 @@ function _path2() {
   };
   return data;
 }
+function _featureFlags() {
+  const data = require("@atlaspack/feature-flags");
+  _featureFlags = function () {
+    return data;
+  };
+  return data;
+}
 function _graph() {
   const data = require("@atlaspack/graph");
   _graph = function () {
@@ -204,7 +213,7 @@ class RequestGraph extends _graph().ContentGraph {
     this.removeCachedRequestChunkForNode(nodeId);
     return nodeId;
   }
-  removeNode(nodeId) {
+  removeNode(nodeId, removeOrphans = true) {
     this.invalidNodeIds.delete(nodeId);
     this.incompleteNodeIds.delete(nodeId);
     this.incompleteNodePromises.delete(nodeId);
@@ -222,7 +231,7 @@ class RequestGraph extends _graph().ContentGraph {
         configKeyNodes.delete(nodeId);
       }
     }
-    return super.removeNode(nodeId);
+    return super.removeNode(nodeId, removeOrphans);
   }
   getRequestNode(nodeId) {
     let node = (0, _nullthrows().default)(this.getNode(nodeId));
@@ -489,6 +498,7 @@ class RequestGraph extends _graph().ContentGraph {
     let count = 0;
     let predictedTime = 0;
     let startTime = Date.now();
+    const removeOrphans = !(0, _featureFlags().getFeatureFlag)('fixQuadraticCacheInvalidation');
     for (let {
       path: _path,
       type
@@ -590,7 +600,7 @@ class RequestGraph extends _graph().ContentGraph {
         // Delete the file node since it doesn't exist anymore.
         // This ensures that files that don't exist aren't sent
         // to requests as invalidations for future requests.
-        this.removeNode(nodeId);
+        this.removeNode(nodeId, removeOrphans);
       }
       let configKeyNodes = this.configKeyNodes.get(_filePath);
       if (configKeyNodes && (type === 'delete' || type === 'update')) {
@@ -607,11 +617,14 @@ class RequestGraph extends _graph().ContentGraph {
               this.invalidateNode(connectedNode, type === 'delete' ? _constants.FILE_DELETE : _constants.FILE_UPDATE);
             }
             didInvalidate = true;
-            this.removeNode(nodeId);
+            this.removeNode(nodeId, removeOrphans);
           }
         }
       }
     }
+    if ((0, _featureFlags().getFeatureFlag)('fixQuadraticCacheInvalidation')) {
+      cleanUpOrphans(this);
+    }
     let duration = Date.now() - startTime;
     _logger().default.verbose({
       origin: '@atlaspack/core',
@@ -1086,4 +1099,18 @@ function logErrorOnBailout(options, snapshotPath, e) {
       }
     });
   }
+}
+function cleanUpOrphans(graph) {
+  const reachableNodes = new Set();
+  graph.traverse(nodeId => {
+    reachableNodes.add(nodeId);
+  });
+  const removedNodeIds = [];
+  graph.nodes.forEach((_node, nodeId) => {
+    if (!reachableNodes.has(nodeId)) {
+      removedNodeIds.push(nodeId);
+      graph.removeNode(nodeId);
+    }
+  });
+  return removedNodeIds;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.12.1-canary.3425+9f7376c6c",
+  "version": "2.12.1-canary.3426+9ec24d923",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -20,20 +20,20 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/cache": "2.12.1-canary.3425+9f7376c6c",
-    "@atlaspack/diagnostic": "2.12.1-canary.3425+9f7376c6c",
-    "@atlaspack/events": "2.12.1-canary.3425+9f7376c6c",
-    "@atlaspack/feature-flags": "2.12.1-canary.3425+9f7376c6c",
-    "@atlaspack/fs": "2.12.1-canary.3425+9f7376c6c",
-    "@atlaspack/graph": "3.2.1-canary.3425+9f7376c6c",
-    "@atlaspack/logger": "2.12.1-canary.3425+9f7376c6c",
-    "@atlaspack/package-manager": "2.12.1-canary.3425+9f7376c6c",
-    "@atlaspack/plugin": "2.12.1-canary.3425+9f7376c6c",
-    "@atlaspack/profiler": "2.12.1-canary.3425+9f7376c6c",
-    "@atlaspack/rust": "2.12.1-canary.3425+9f7376c6c",
-    "@atlaspack/types": "2.12.1-canary.3425+9f7376c6c",
-    "@atlaspack/utils": "2.12.1-canary.3425+9f7376c6c",
-    "@atlaspack/workers": "2.12.1-canary.3425+9f7376c6c",
+    "@atlaspack/cache": "2.12.1-canary.3426+9ec24d923",
+    "@atlaspack/diagnostic": "2.12.1-canary.3426+9ec24d923",
+    "@atlaspack/events": "2.12.1-canary.3426+9ec24d923",
+    "@atlaspack/feature-flags": "2.12.1-canary.3426+9ec24d923",
+    "@atlaspack/fs": "2.12.1-canary.3426+9ec24d923",
+    "@atlaspack/graph": "3.2.1-canary.3426+9ec24d923",
+    "@atlaspack/logger": "2.12.1-canary.3426+9ec24d923",
+    "@atlaspack/package-manager": "2.12.1-canary.3426+9ec24d923",
+    "@atlaspack/plugin": "2.12.1-canary.3426+9ec24d923",
+    "@atlaspack/profiler": "2.12.1-canary.3426+9ec24d923",
+    "@atlaspack/rust": "2.12.1-canary.3426+9ec24d923",
+    "@atlaspack/types": "2.12.1-canary.3426+9ec24d923",
+    "@atlaspack/utils": "2.12.1-canary.3426+9ec24d923",
+    "@atlaspack/workers": "2.12.1-canary.3426+9ec24d923",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -55,5 +55,5 @@
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "gitHead": "9f7376c6cf799896a0789ab66f1cc253f2464991"
+  "gitHead": "9ec24d923e4361f97bcc64c967c066fbebb7f4b4"
 }

package/src/RequestTracker.js

@@ -4,12 +4,14 @@ import invariant, {AssertionError} from 'assert';
 import path from 'path';
 
 import type {Cache} from '@atlaspack/cache';
+import {getFeatureFlag} from '@atlaspack/feature-flags';
 import {ContentGraph} from '@atlaspack/graph';
 import type {
   ContentGraphOpts,
   ContentKey,
   NodeId,
   SerializedContentGraph,
+  Graph,
 } from '@atlaspack/graph';
 import logger from '@atlaspack/logger';
 import {hashString} from '@atlaspack/rust';
@@ -370,7 +372,7 @@ export class RequestGraph extends ContentGraph<
     return nodeId;
   }
 
-  removeNode(nodeId: NodeId): void {
+  removeNode(nodeId: NodeId, removeOrphans: boolean = true): void {
     this.invalidNodeIds.delete(nodeId);
     this.incompleteNodeIds.delete(nodeId);
     this.incompleteNodePromises.delete(nodeId);
@@ -388,7 +390,7 @@ export class RequestGraph extends ContentGraph<
         configKeyNodes.delete(nodeId);
       }
     }
-    return super.removeNode(nodeId);
+    return super.removeNode(nodeId, removeOrphans);
   }
 
   getRequestNode(nodeId: NodeId): RequestNode {
@@ -878,6 +880,7 @@ export class RequestGraph extends ContentGraph<
     let count = 0;
     let predictedTime = 0;
     let startTime = Date.now();
+    const removeOrphans = !getFeatureFlag('fixQuadraticCacheInvalidation');
 
     for (let {path: _path, type} of events) {
       if (++count === 256) {
@@ -1004,7 +1007,7 @@ export class RequestGraph extends ContentGraph<
         // Delete the file node since it doesn't exist anymore.
         // This ensures that files that don't exist aren't sent
         // to requests as invalidations for future requests.
-        this.removeNode(nodeId);
+        this.removeNode(nodeId, removeOrphans);
       }
 
       let configKeyNodes = this.configKeyNodes.get(_filePath);
@@ -1036,12 +1039,16 @@ export class RequestGraph extends ContentGraph<
               );
             }
             didInvalidate = true;
-            this.removeNode(nodeId);
+            this.removeNode(nodeId, removeOrphans);
           }
         }
       }
     }
 
+    if (getFeatureFlag('fixQuadraticCacheInvalidation')) {
+      cleanUpOrphans(this);
+    }
+
     let duration = Date.now() - startTime;
     logger.verbose({
       origin: '@atlaspack/core',
@@ -1665,6 +1672,7 @@ async function loadRequestGraph(options): Async<RequestGraph> {
 
   return new RequestGraph();
 }
+
 function logErrorOnBailout(
   options: AtlaspackOptions,
   snapshotPath: string,
@@ -1695,3 +1703,20 @@ function logErrorOnBailout(
     });
   }
 }
+
+export function cleanUpOrphans<N, E: number>(graph: Graph<N, E>): NodeId[] {
+  const reachableNodes = new Set();
+  graph.traverse(nodeId => {
+    reachableNodes.add(nodeId);
+  });
+
+  const removedNodeIds = [];
+  graph.nodes.forEach((_node, nodeId) => {
+    if (!reachableNodes.has(nodeId)) {
+      removedNodeIds.push(nodeId);
+      graph.removeNode(nodeId);
+    }
+  });
+
+  return removedNodeIds;
+}

package/test/RequestTracker.test.js

@@ -2,7 +2,11 @@
 
 import assert from 'assert';
 import nullthrows from 'nullthrows';
-import RequestTracker, {type RunAPI} from '../src/RequestTracker';
+import RequestTracker, {
+  type RunAPI,
+  cleanUpOrphans,
+} from '../src/RequestTracker';
+import {Graph} from '@atlaspack/graph';
 import WorkerFarm from '@atlaspack/workers';
 import {DEFAULT_OPTIONS} from './test-utils';
 import {INITIAL_BUILD} from '../src/constants';
@@ -446,3 +450,43 @@ describe('RequestTracker', () => {
     assert.equal(tracker.graph.getNode(nodeId)?.invalidateReason, 1);
   });
 });
+
+describe('cleanUpOrphans', () => {
+  it('cleans-up unreachable nodes', () => {
+    const graph: Graph<string, number> = new Graph();
+    const root = graph.addNode('root');
+    graph.setRootNodeId(root);
+    const node1 = graph.addNode('node1');
+    const node2 = graph.addNode('node2');
+    const node3 = graph.addNode('node3');
+    const orphan1 = graph.addNode('orphan1');
+    const orphan2 = graph.addNode('orphan2');
+
+    /*
+
+root --- node1 --- node2 ----------- orphan1 --- orphan2
+     \---- node3          (^ remove)
+
+     */
+
+    const getNonNullNodes = graph => graph.nodes.filter(node => node != null);
+
+    graph.addEdge(root, node1);
+    graph.addEdge(node1, node2);
+    graph.addEdge(node2, orphan1);
+    graph.addEdge(orphan1, orphan2);
+    graph.addEdge(root, node3);
+
+    assert.deepEqual(cleanUpOrphans(graph), []);
+    assert.equal(getNonNullNodes(graph).length, 6);
+    assert.equal(Array.from(graph.getAllEdges()).length, 5);
+
+    graph.removeEdge(node2, orphan1, 1, false);
+    assert.equal(getNonNullNodes(graph).length, 6);
+    assert.equal(Array.from(graph.getAllEdges()).length, 4);
+
+    assert.deepEqual(cleanUpOrphans(graph), [orphan1, orphan2]);
+    assert.equal(getNonNullNodes(graph).length, 4);
+    assert.equal(Array.from(graph.getAllEdges()).length, 3);
+  });
+});