cha0s/flecks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: expanded cache

Browse Source
This commit is contained in:
cha0s 2024-01-09 20:59:38 -06:00
parent ee91ac4006
commit d6192d181b
2 changed files with 10 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/src/digraph.js
View File

@ -2,10 +2,6 @@ class Digraph {
arcs = new Map();
addArc(tail, head) {
this.arcs.get(tail).add(head);
}
addDependency(head, tail) {
this.ensureTail(head);
this.ensureTail(tail).add(head);

32
packages/core/src/flecks.js
View File

@ -201,7 +201,7 @@ export default class Flecks {
*/
expandedFlecks(hook) {
if (this.$$expandedFlecksCache[hook]) {
return this.$$expandedFlecksCache[hook];
return [...this.$$expandedFlecksCache[hook]];
}
const flecks = this.lookupFlecks(hook);
let expanded = [];
@ -265,12 +265,12 @@ export default class Flecks {
...after,
];
}
// Build another graph, but add arcs connecting the final ordering. If cycles exist, the
// ordering violated the expectation of one or more implementations.
// Build another graph, but add dependencies connecting the final ordering. If cycles exist,
// the ordering violated the expectation of one or more implementations.
const graph = this.flecksHookGraph(expanded, hook);
expanded.forEach((fleck, i) => {
if (i < expanded.length - 1) {
graph.addArc(fleck, expanded[i + 1]);
graph.addDependency(expanded[i + 1], fleck);
}
});
const cycles = graph.detectCycles();
@ -303,7 +303,7 @@ export default class Flecks {
this.$$expandedFlecksCache[hook] = expanded // eslint-disable-line no-return-assign
.filter((fleck) => this.fleckImplementation(fleck, hook));
debugSilly("cached hook expansion for '%s': %O", hook, expanded);
return this.$$expandedFlecksCache[hook];
return [...this.$$expandedFlecksCache[hook]];
}
/**
@ -360,13 +360,12 @@ export default class Flecks {
if (implementation?.[HookPriority]) {
if (implementation[HookPriority].before) {
implementation[HookPriority].before.forEach((before) => {
graph.addArc(fleck, before);
graph.addDependency(before, fleck);
});
}
if (implementation[HookPriority].after) {
implementation[HookPriority].after.forEach((after) => {
graph.ensureTail(after);
graph.addArc(after, fleck);
graph.addDependency(fleck, after);
});
}
}
@ -473,9 +472,6 @@ export default class Flecks {
return initial;
}
const flecks = this.expandedFlecks(hook);
if (0 === flecks.length) {
return initial;
}
return flecks
.reduce((r, fleck) => this.invokeFleck(hook, fleck, r, ...args), initial);
}
@ -490,9 +486,6 @@ export default class Flecks {
return arg;
}
const flecks = this.expandedFlecks(hook);
if (0 === flecks.length) {
return arg;
}
return flecks
.reduce(async (r, fleck) => this.invokeFleck(hook, fleck, await r, ...args), arg);
}
@ -646,11 +639,8 @@ export default class Flecks {
if (!this.hooks[hook]) {
return [];
}
const flecks = this.expandedFlecks(hook);
if (0 === flecks.length) {
return [];
}
const results = [];
const flecks = this.expandedFlecks(hook);
while (flecks.length > 0) {
const fleck = flecks.shift();
results.push(this.invokeFleck(hook, fleck, ...args));
@ -667,11 +657,8 @@ export default class Flecks {
if (!this.hooks[hook]) {
return [];
}
const flecks = this.expandedFlecks(hook);
if (0 === flecks.length) {
return [];
}
const results = [];
const flecks = this.expandedFlecks(hook);
while (flecks.length > 0) {
const fleck = flecks.shift();
// eslint-disable-next-line no-await-in-loop
@ -712,6 +699,7 @@ export default class Flecks {
}
const flecks = this.expandedFlecks(hook);
if (0 === flecks.length) {
// No flecks, immediate dispatch.
return (...args) => args.pop()();
}
debugSilly('middleware: %O', flecks);