mirror of
https://github.com/morluto/rea.git
synced 2026-11-19 13:12:26 +00:00
refactor(javascript): bind JavaScript source analysis in composition (#11467)
This commit is contained in:
1 parent
24406aa018
commit
64e6caeca2
22 files changed
+102
-34
No files matched your search
@@ -29,6 +29,7 @@ import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection.
|
||||
import { err, ok, type Result } from "../../domain/result.js";
|
||||
import { ProviderAdapterError } from "../../domain/providerAdapterError.js";
|
||||
import type { ExecutionOptions } from "../../ports/AnalysisProvider.js";
|
||||
import type { JavaScriptSourceAnalysisFactory } from "../../ports/javascript/JavaScriptSourceAnalysisFactory.js";
|
||||
import { createOwnedJavaScriptApplicationEvidenceCooperatively } from "./JavaScriptApplicationEvidence.js";
|
||||
import {
|
||||
assertJavaScriptAnalysisActive,
|
||||
@@ -45,6 +46,8 @@ const OPERATION = "analyze_javascript_application" as const;
|
||||
|
||||
/** Execution options plus the composition root's environment for admission settings. */
|
||||
export interface JavaScriptApplicationOptions extends ExecutionOptions {
|
||||
/** Composition-bound source analyzer; application never constructs one. */
|
||||
readonly sourceAnalysis: JavaScriptSourceAnalysisFactory;
|
||||
readonly settings?: AnalysisSettingsReader;
|
||||
readonly environment?: Readonly<Record<string, string | undefined>>;
|
||||
}
|
||||
@@ -53,7 +56,7 @@ export interface JavaScriptApplicationOptions extends ExecutionOptions {
|
||||
export const analyzeJavaScriptApplication = async (
|
||||
rawInput: unknown,
|
||||
scope: ArtifactResourceScope,
|
||||
options: JavaScriptApplicationOptions = {},
|
||||
options: JavaScriptApplicationOptions,
|
||||
): Promise<Result<Evidence, AnalysisError>> => {
|
||||
const parsed = analyzeJavaScriptApplicationInputSchema.safeParse(rawInput);
|
||||
if (!parsed.success)
|
||||
@@ -67,7 +70,7 @@ export const analyzeJavaScriptApplication = async (
|
||||
export const analyzeJavaScriptApplicationValidated = async (
|
||||
input: z.output<typeof analyzeJavaScriptApplicationInputSchema>,
|
||||
scope: ArtifactResourceScope,
|
||||
options: JavaScriptApplicationOptions = {},
|
||||
options: JavaScriptApplicationOptions,
|
||||
): Promise<Result<Evidence, AnalysisError>> => {
|
||||
// An invalid setting is refused before analysis, never replaced by the default.
|
||||
const asarHeaderAdmission = parseAsarHeaderAdmission(
|
||||
@@ -110,6 +113,7 @@ export const analyzeJavaScriptApplicationValidated = async (
|
||||
reconstructed = await reconstructJavaScriptArtifact(
|
||||
input,
|
||||
scope,
|
||||
options.sourceAnalysis,
|
||||
options.signal,
|
||||
options.progress,
|
||||
acceptedAdmission,
|
||||
|
||||
@@ -44,7 +44,7 @@ import {
|
||||
isSkippedJavaScriptAnalysis,
|
||||
javascriptArtifactAnalysisScopes,
|
||||
} from "./JavaScriptArtifactAnalysisTypes.js";
|
||||
import { createJavaScriptSourceAnalysis } from "../../artifacts/javascript/JavaScriptSourceAnalysis.js";
|
||||
import type { JavaScriptSourceAnalysisFactory } from "../../ports/javascript/JavaScriptSourceAnalysisFactory.js";
|
||||
import { JAVASCRIPT_ANALYSIS_RESOURCE_DEFAULTS } from "../../domain/javascript/javascriptAnalysisResourceControls.js";
|
||||
import { createOwnedJavaScriptApplicationEvidenceCooperatively } from "./JavaScriptApplicationEvidence.js";
|
||||
import { readJavaScriptArtifactFiles } from "../../artifacts/javascript/JavaScriptArtifactFiles.js";
|
||||
@@ -90,6 +90,7 @@ export interface JavaScriptArtifactReconstructionResult {
|
||||
export const reconstructJavaScriptArtifact = async (
|
||||
input: AnalyzeJavaScriptApplicationInput,
|
||||
scope: ArtifactResourceScope,
|
||||
sourceAnalysis: JavaScriptSourceAnalysisFactory,
|
||||
signal?: AbortSignal,
|
||||
progress?: ProgressReporter,
|
||||
asarHeaderAdmission: AsarHeaderAdmission = DEFAULT_ASAR_HEADER_ADMISSION,
|
||||
@@ -212,9 +213,10 @@ export const reconstructJavaScriptArtifact = async (
|
||||
files,
|
||||
sourceLimits,
|
||||
scope,
|
||||
sourceAnalysis,
|
||||
signal,
|
||||
);
|
||||
const worker = await createJavaScriptSourceAnalysis(
|
||||
const worker = await sourceAnalysis(
|
||||
sourceLimits,
|
||||
files.files.filter(
|
||||
(file) => file.kind === "javascript" && file.text.included,
|
||||
|
||||
@@ -10,7 +10,7 @@ import { translateArtifactFailure } from "../../artifacts/ArtifactOperationFailu
|
||||
import type { JavaScriptArtifactFileSet } from "../../domain/javascript/javascriptArtifactFiles.js";
|
||||
import type { JavaScriptSourceAnalysisLimits } from "../../domain/javascript/javascriptSourceAnalysis.js";
|
||||
import type { ArtifactResourceScope } from "../../resources/index.js";
|
||||
import { createJavaScriptSourceAnalysis } from "../../artifacts/javascript/JavaScriptSourceAnalysis.js";
|
||||
import type { JavaScriptSourceAnalysisFactory } from "../../ports/javascript/JavaScriptSourceAnalysisFactory.js";
|
||||
import { createJavaScriptPackageTypeLookup } from "./JavaScriptArtifactAnalysis.js";
|
||||
import { JavaScriptJsonDocuments } from "./JavaScriptJsonDocuments.js";
|
||||
import { resolveArtifactPathByContext } from "./JavaScriptArtifactPathResolution.js";
|
||||
@@ -29,6 +29,7 @@ export const discoverJavaScriptPreloadPaths = async (
|
||||
fileSet: JavaScriptArtifactFileSet,
|
||||
limits: JavaScriptSourceAnalysisLimits,
|
||||
scope: ArtifactResourceScope,
|
||||
sourceAnalysis: JavaScriptSourceAnalysisFactory,
|
||||
signal?: AbortSignal,
|
||||
): Promise<JavaScriptPreloadDiscovery> => {
|
||||
const paths = new Set<string>();
|
||||
@@ -52,7 +53,7 @@ export const discoverJavaScriptPreloadPaths = async (
|
||||
(file) => file.kind === "javascript" && file.text.included,
|
||||
);
|
||||
const files = new Map(fileSet.files.map((file) => [file.path, file]));
|
||||
const worker = await createJavaScriptSourceAnalysis(limits, sources.length, {
|
||||
const worker = await sourceAnalysis(limits, sources.length, {
|
||||
scope,
|
||||
});
|
||||
let outcome: { kind: "completed" } | { kind: "failed"; cause: unknown } = {
|
||||
|
||||
Reference in new issue
Block a user