Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change edge types to numbers #6126

Merged
merged 16 commits into from Sep 16, 2021
Merged

Change edge types to numbers #6126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
04a89fe
change edgetypes to numbers
thebriando Apr 12, 2021
1139fc6
Merge remote-tracking branch 'origin/v2' into bdo/number-edgetypes
thebriando Apr 12, 2021
c09a85e
clean up comments
thebriando Apr 13, 2021
4fd4898
fix edge colors in graphviz
thebriando Apr 14, 2021
bb58ee8
camelCase edge type objects
thebriando Apr 15, 2021
1a07b1e
add NullEdgeType to generic in Array edge types
thebriando Apr 15, 2021
99c1761
Merge branch 'v2' into bdo/number-edgetypes
thebriando Apr 15, 2021
b453252
Merge remote-tracking branch 'origin/v2' into bdo/number-edgetypes
thebriando Apr 20, 2021
65bd2df
Merge branch 'v2' of github.com:parcel-bundler/parcel into bdo/number…
devongovett May 30, 2021
8657593
Merge remote-tracking branch 'origin/v2' into bdo/number-edgetypes
thebriando Aug 5, 2021
e85fc92
Change NullEdgeType to 1
thebriando Aug 5, 2021
0b0a475
Merge branch 'v2' into bdo/number-edgetypes
lettertwo Sep 13, 2021
8471d60
Merge remote-tracking branch 'origin/v2' into bdo/number-edgetypes
thebriando Sep 15, 2021
414a3f2
Fix colors in graphviz
thebriando Sep 15, 2021
2951a01
Fix types
thebriando Sep 15, 2021
4b6c509
Merge remote-tracking branch 'origin/v2' into bdo/number-edgetypes
thebriando Sep 15, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
196 changes: 144 additions & 52 deletions packages/core/core/src/BundleGraph.js
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 10 additions & 3 deletions packages/core/core/src/Parcel.js
View file
Open in desktop
Expand Up @@ -31,7 +31,10 @@ import {AbortController} from 'abortcontroller-polyfill/dist/cjs-ponyfill';
import {PromiseQueue} from '@parcel/utils';
import ParcelConfig from './ParcelConfig';
import logger from '@parcel/logger';
import RequestTracker, {getWatcherOptions} from './RequestTracker';
import RequestTracker, {
getWatcherOptions,
requestGraphEdgeTypes,
} from './RequestTracker';
import createValidationRequest from './requests/ValidationRequest';
import createParcelBuildRequest from './requests/ParcelBuildRequest';
import {Disposable} from '@parcel/events';
Expand Down Expand Up @@ -274,8 +277,12 @@ export default class Parcel {

this.#requestedAssetIds.clear();

// $FlowFixMe
dumpGraphToGraphViz(this.#requestTracker.graph, 'RequestGraph');
dumpGraphToGraphViz(
// $FlowFixMe
this.#requestTracker.graph,
'RequestGraph',
requestGraphEdgeTypes,
);

let event = {
type: 'buildSuccess',
Expand Down
194 changes: 153 additions & 41 deletions packages/core/core/src/RequestTracker.js
View file
Open in desktop
Expand Up @@ -45,6 +45,16 @@ import {
ERROR,
} from './constants';

export const requestGraphEdgeTypes = {
subrequest: 2,
invalidated_by_update: 3,
invalidated_by_delete: 4,
invalidated_by_create: 5,
invalidated_by_create_above: 6,
dirname: 7,
};

export type RequestGraphEdgeType = $Values<typeof requestGraphEdgeTypes>;
type SerializedRequestGraph = {|
...SerializedContentGraph<RequestGraphNode, RequestGraphEdgeType>,
invalidNodeIds: Set<NodeId>,
Expand Down Expand Up @@ -103,14 +113,6 @@ type RequestGraphNode =
| EnvNode
| OptionNode;

type RequestGraphEdgeType =
| 'subrequest'
| 'invalidated_by_update'
| 'invalidated_by_delete'
| 'invalidated_by_create'
| 'invalidated_by_create_above'
| 'dirname';

export type RunAPI = {|
invalidateOnFileCreate: InternalFileCreateInvalidation => void,
invalidateOnFileDelete: ProjectPath => void,
Expand Down Expand Up @@ -280,7 +282,7 @@ export class RequestGraph extends ContentGraph<
requestNodeId,
subrequestNodeIds,
null,
'subrequest',
requestGraphEdgeTypes.subrequest,
);
}

Expand All @@ -290,7 +292,10 @@ export class RequestGraph extends ContentGraph<
node.invalidateReason |= reason;
this.invalidNodeIds.add(nodeId);

let parentNodes = this.getNodeIdsConnectedTo(nodeId, 'subrequest');
let parentNodes = this.getNodeIdsConnectedTo(
nodeId,
requestGraphEdgeTypes.subrequest,
);
for (let parentNode of parentNodes) {
this.invalidateNode(parentNode, reason);
}
Expand All @@ -311,7 +316,7 @@ export class RequestGraph extends ContentGraph<
if (env[node.value.key] !== node.value.value) {
let parentNodes = this.getNodeIdsConnectedTo(
nodeId,
'invalidated_by_update',
requestGraphEdgeTypes.invalidated_by_update,
);
for (let parentNode of parentNodes) {
this.invalidateNode(parentNode, ENV_CHANGE);
Expand All @@ -327,7 +332,7 @@ export class RequestGraph extends ContentGraph<
if (hashFromOption(options[node.value.key]) !== node.value.hash) {
let parentNodes = this.getNodeIdsConnectedTo(
nodeId,
'invalidated_by_update',
requestGraphEdgeTypes.invalidated_by_update,
);
for (let parentNode of parentNodes) {
this.invalidateNode(parentNode, OPTION_CHANGE);
Expand All @@ -339,16 +344,36 @@ export class RequestGraph extends ContentGraph<
invalidateOnFileUpdate(requestNodeId: NodeId, filePath: ProjectPath) {
let fileNodeId = this.addNode(nodeFromFilePath(filePath));

if (!this.hasEdge(requestNodeId, fileNodeId, 'invalidated_by_update')) {
this.addEdge(requestNodeId, fileNodeId, 'invalidated_by_update');
if (
!this.hasEdge(
requestNodeId,
fileNodeId,
requestGraphEdgeTypes.invalidated_by_update,
)
) {
this.addEdge(
requestNodeId,
fileNodeId,
requestGraphEdgeTypes.invalidated_by_update,
);
}
}

invalidateOnFileDelete(requestNodeId: NodeId, filePath: ProjectPath) {
let fileNodeId = this.addNode(nodeFromFilePath(filePath));

if (!this.hasEdge(requestNodeId, fileNodeId, 'invalidated_by_delete')) {
this.addEdge(requestNodeId, fileNodeId, 'invalidated_by_delete');
if (
!this.hasEdge(
requestNodeId,
fileNodeId,
requestGraphEdgeTypes.invalidated_by_delete,
)
) {
this.addEdge(
requestNodeId,
fileNodeId,
requestGraphEdgeTypes.invalidated_by_delete,
);
}
}

Expand All @@ -375,9 +400,17 @@ export class RequestGraph extends ContentGraph<
let fileNameNodeId = this.addNode(fileNameNode);
if (
lastNodeId != null &&
!this.hasEdge(lastNodeId, fileNameNodeId, 'dirname')
!this.hasEdge(
lastNodeId,
fileNameNodeId,
requestGraphEdgeTypes.dirname,
)
) {
this.addEdge(lastNodeId, fileNameNodeId, 'dirname');
this.addEdge(
lastNodeId,
fileNameNodeId,
requestGraphEdgeTypes.dirname,
);
}

lastNodeId = fileNameNodeId;
Expand All @@ -399,13 +432,33 @@ export class RequestGraph extends ContentGraph<
// node will be invalidated.
let firstId = 'file_name:' + parts[0];
let firstNodeId = this.getNodeIdByContentKey(firstId);
if (!this.hasEdge(nodeId, firstNodeId, 'invalidated_by_create_above')) {
this.addEdge(nodeId, firstNodeId, 'invalidated_by_create_above');
if (
!this.hasEdge(
nodeId,
firstNodeId,
requestGraphEdgeTypes.invalidated_by_create_above,
)
) {
this.addEdge(
nodeId,
firstNodeId,
requestGraphEdgeTypes.invalidated_by_create_above,
);
}

invariant(lastNodeId != null);
if (!this.hasEdge(lastNodeId, nodeId, 'invalidated_by_create_above')) {
this.addEdge(lastNodeId, nodeId, 'invalidated_by_create_above');
if (
!this.hasEdge(
lastNodeId,
nodeId,
requestGraphEdgeTypes.invalidated_by_create_above,
)
) {
this.addEdge(
lastNodeId,
nodeId,
requestGraphEdgeTypes.invalidated_by_create_above,
);
}
} else if (input.filePath != null) {
node = nodeFromFilePath(input.filePath);
Expand All @@ -414,8 +467,18 @@ export class RequestGraph extends ContentGraph<
}

let nodeId = this.addNode(node);
if (!this.hasEdge(requestNodeId, nodeId, 'invalidated_by_create')) {
this.addEdge(requestNodeId, nodeId, 'invalidated_by_create');
if (
!this.hasEdge(
requestNodeId,
nodeId,
requestGraphEdgeTypes.invalidated_by_create,
)
) {
this.addEdge(
requestNodeId,
nodeId,
requestGraphEdgeTypes.invalidated_by_create,
);
}
}

Expand All @@ -432,8 +495,18 @@ export class RequestGraph extends ContentGraph<
let envNode = nodeFromEnv(env, value);
let envNodeId = this.addNode(envNode);

if (!this.hasEdge(requestNodeId, envNodeId, 'invalidated_by_update')) {
this.addEdge(requestNodeId, envNodeId, 'invalidated_by_update');
if (
!this.hasEdge(
requestNodeId,
envNodeId,
requestGraphEdgeTypes.invalidated_by_update,
)
) {
this.addEdge(
requestNodeId,
envNodeId,
requestGraphEdgeTypes.invalidated_by_update,
);
}
}

Expand All @@ -445,16 +518,41 @@ export class RequestGraph extends ContentGraph<
let optionNode = nodeFromOption(option, value);
let optionNodeId = this.addNode(optionNode);

if (!this.hasEdge(requestNodeId, optionNodeId, 'invalidated_by_update')) {
this.addEdge(requestNodeId, optionNodeId, 'invalidated_by_update');
if (
!this.hasEdge(
requestNodeId,
optionNodeId,
requestGraphEdgeTypes.invalidated_by_update,
)
) {
this.addEdge(
requestNodeId,
optionNodeId,
requestGraphEdgeTypes.invalidated_by_update,
);
}
}

clearInvalidations(nodeId: NodeId) {
this.unpredicatableNodeIds.delete(nodeId);
this.replaceNodeIdsConnectedTo(nodeId, [], null, 'invalidated_by_update');
this.replaceNodeIdsConnectedTo(nodeId, [], null, 'invalidated_by_delete');
this.replaceNodeIdsConnectedTo(nodeId, [], null, 'invalidated_by_create');
this.replaceNodeIdsConnectedTo(
nodeId,
[],
null,
requestGraphEdgeTypes.invalidated_by_update,
);
this.replaceNodeIdsConnectedTo(
nodeId,
[],
null,
requestGraphEdgeTypes.invalidated_by_delete,
);
this.replaceNodeIdsConnectedTo(
nodeId,
[],
null,
requestGraphEdgeTypes.invalidated_by_create,
);
}

getInvalidations(requestNodeId: NodeId): Array<RequestInvalidation> {
Expand All @@ -465,7 +563,7 @@ export class RequestGraph extends ContentGraph<
// For now just handling updates. Could add creates/deletes later if needed.
let invalidations = this.getNodeIdsConnectedFrom(
requestNodeId,
'invalidated_by_update',
requestGraphEdgeTypes.invalidated_by_update,
);
return invalidations
.map(nodeId => {
Expand All @@ -487,7 +585,10 @@ export class RequestGraph extends ContentGraph<
return [];
}

let subRequests = this.getNodeIdsConnectedFrom(requestNodeId, 'subrequest');
let subRequests = this.getNodeIdsConnectedFrom(
requestNodeId,
requestGraphEdgeTypes.subrequest,
);

return subRequests.map(nodeId => {
let node = nullthrows(this.getNode(nodeId));
Expand All @@ -510,15 +611,19 @@ export class RequestGraph extends ContentGraph<
for (let matchNode of matchNodes) {
let matchNodeId = this.getNodeIdByContentKey(matchNode.id);
if (
this.hasEdge(nodeId, matchNodeId, 'invalidated_by_create_above') &&
this.hasEdge(
nodeId,
matchNodeId,
requestGraphEdgeTypes.invalidated_by_create_above,
) &&
isDirectoryInside(
path.dirname(fromProjectPathRelative(matchNode.value.filePath)),
dirname,
)
) {
let connectedNodes = this.getNodeIdsConnectedTo(
matchNodeId,
'invalidated_by_create',
requestGraphEdgeTypes.invalidated_by_create,
);
for (let connectedNode of connectedNodes) {
this.invalidateNode(connectedNode, FILE_CREATE);
Expand All @@ -532,7 +637,11 @@ export class RequestGraph extends ContentGraph<
let contentKey = 'file_name:' + basename;
if (this.hasContentKey(contentKey)) {
if (
this.hasEdge(nodeId, this.getNodeIdByContentKey(contentKey), 'dirname')
this.hasEdge(
nodeId,
this.getNodeIdByContentKey(contentKey),
requestGraphEdgeTypes.dirname,
)
) {
let parent = nullthrows(this.getNodeByContentKey(contentKey));
invariant(parent.type === 'file_name');
Expand Down Expand Up @@ -570,7 +679,10 @@ export class RequestGraph extends ContentGraph<
// then also invalidate nodes connected by invalidated_by_update edges.
if (hasFileRequest && (type === 'create' || type === 'update')) {
let nodeId = this.getNodeIdByContentKey(filePath);
let nodes = this.getNodeIdsConnectedTo(nodeId, 'invalidated_by_update');
let nodes = this.getNodeIdsConnectedTo(
nodeId,
requestGraphEdgeTypes.invalidated_by_update,
);

for (let connectedNode of nodes) {
didInvalidate = true;
Expand All @@ -580,7 +692,7 @@ export class RequestGraph extends ContentGraph<
if (type === 'create') {
let nodes = this.getNodeIdsConnectedTo(
nodeId,
'invalidated_by_create',
requestGraphEdgeTypes.invalidated_by_create,
);
for (let connectedNode of nodes) {
didInvalidate = true;
Expand All @@ -597,7 +709,7 @@ export class RequestGraph extends ContentGraph<
// Find potential file nodes to be invalidated if this file name pattern matches
let above = this.getNodeIdsConnectedTo(
fileNameNodeId,
'invalidated_by_create_above',
requestGraphEdgeTypes.invalidated_by_create_above,
).map(nodeId => {
let node = nullthrows(this.getNode(nodeId));
invariant(node.type === 'file');
Expand All @@ -617,7 +729,7 @@ export class RequestGraph extends ContentGraph<
if (isGlobMatch(filePath, fromProjectPathRelative(globNode.value))) {
let connectedNodes = this.getNodeIdsConnectedTo(
globeNodeId,
'invalidated_by_create',
requestGraphEdgeTypes.invalidated_by_create,
);
for (let connectedNode of connectedNodes) {
didInvalidate = true;
Expand All @@ -629,7 +741,7 @@ export class RequestGraph extends ContentGraph<
let nodeId = this.getNodeIdByContentKey(filePath);
for (let connectedNode of this.getNodeIdsConnectedTo(
nodeId,
'invalidated_by_delete',
requestGraphEdgeTypes.invalidated_by_delete,
)) {
didInvalidate = true;
this.invalidateNode(connectedNode, FILE_DELETE);
Expand Down