fix(javascript): isolate source analysis and retain bounded partial evidence (#1651)
* refactor(javascript): validate transferable file projections * test(javascript): consume decoded module and static facts * fix(javascript): isolate source analysis and retain bounded partial evidence * test(javascript): verify cleanup retention and repeated source paths
This commit is contained in:
@@ -1,5 +1,7 @@
|
||||
import { expect, it } from "vitest";
|
||||
|
||||
import { err } from "../domain/result.js";
|
||||
import { AnalysisOutputError } from "../domain/analysisErrorCore.js";
|
||||
import type { ArtifactReader } from "./ArtifactReader.js";
|
||||
import { ArtifactResourceScope } from "./ArtifactResourceScope.js";
|
||||
|
||||
@@ -66,3 +68,47 @@ it("retains the same failed reader owner and retries before admitting work", asy
|
||||
await scope.close();
|
||||
expect(closeAttempts).toBe(4);
|
||||
});
|
||||
|
||||
it("retains a failed source analyzer until shutdown can verify its release", async () => {
|
||||
const scope = new ArtifactResourceScope();
|
||||
let releaseAllowed = false;
|
||||
const failure = new AnalysisOutputError(
|
||||
"analyze_javascript_application",
|
||||
"Owned worker is still running",
|
||||
);
|
||||
const owner = {
|
||||
kind: "javascript-source-analysis" as const,
|
||||
resource: "fixture source analyzer",
|
||||
analysis: {
|
||||
async analyze() {
|
||||
return err({
|
||||
error: failure,
|
||||
javascript: null,
|
||||
module: null,
|
||||
projection: null,
|
||||
});
|
||||
},
|
||||
async close() {
|
||||
if (!releaseAllowed) throw failure;
|
||||
},
|
||||
},
|
||||
};
|
||||
expect(await scope.release(owner)).toEqual({
|
||||
kind: "failed",
|
||||
cause: failure,
|
||||
});
|
||||
let admitted = false;
|
||||
await expect(
|
||||
scope.run(async () => {
|
||||
admitted = true;
|
||||
}),
|
||||
).rejects.toMatchObject({
|
||||
cleanup: { resources: ["fixture source analyzer"] },
|
||||
});
|
||||
expect(admitted).toBe(false);
|
||||
await expect(scope.close()).rejects.toMatchObject({
|
||||
cleanup: { resources: ["fixture source analyzer"] },
|
||||
});
|
||||
releaseAllowed = true;
|
||||
await scope.close();
|
||||
});
|
||||
|
||||
@@ -1,3 +1,4 @@
|
||||
import type { JavaScriptSourceAnalysisPort } from "../domain/javascript/javascriptSourceAnalysis.js";
|
||||
import type { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js";
|
||||
import type { OwnedDirectoryHandle } from "../filesystem/OwnedDirectoryHandle.js";
|
||||
|
||||
@@ -7,6 +8,11 @@ import type { SafeOutputTree } from "./SafeOutputTree.js";
|
||||
|
||||
/** One artifact resource and its format-specific cleanup owner. */
|
||||
export type ArtifactResourceOwner =
|
||||
| {
|
||||
readonly kind: "javascript-source-analysis";
|
||||
readonly resource: string;
|
||||
readonly analysis: JavaScriptSourceAnalysisPort;
|
||||
}
|
||||
| {
|
||||
readonly kind: "directory-handle";
|
||||
readonly resource: string;
|
||||
@@ -134,6 +140,9 @@ export class ArtifactResourceScope {
|
||||
|
||||
const cleanup = async (owner: ArtifactResourceOwner): Promise<void> => {
|
||||
switch (owner.kind) {
|
||||
case "javascript-source-analysis":
|
||||
await owner.analysis.close();
|
||||
return;
|
||||
case "reader":
|
||||
await owner.reader.close();
|
||||
return;
|
||||
|
||||
@@ -0,0 +1,12 @@
|
||||
import type {
|
||||
JavaScriptSourceAnalysisLimits,
|
||||
JavaScriptSourceAnalysisPort,
|
||||
} from "../../domain/javascript/javascriptSourceAnalysis.js";
|
||||
import { JavaScriptAnalysisWorker } from "../../javascript/analysis/JavaScriptAnalysisWorker.js";
|
||||
|
||||
/** Construct the inert artifact analyzer; resources are acquired on the first source. */
|
||||
export const createJavaScriptSourceAnalysis = (
|
||||
limits: JavaScriptSourceAnalysisLimits,
|
||||
sourceCount: number,
|
||||
): JavaScriptSourceAnalysisPort =>
|
||||
new JavaScriptAnalysisWorker(limits, undefined, sourceCount);
|
||||
Reference in New Issue
Block a user