diff --git a/scripts/lib/module-layers.baseline.json b/scripts/lib/module-layers.baseline.json index 53a57c6744..e7a2482825 100644 --- a/scripts/lib/module-layers.baseline.json +++ b/scripts/lib/module-layers.baseline.json @@ -3,7 +3,6 @@ "dotnet -> application": 1 }, "cycles": [ - "artifacts <-> native", "cli <-> cli.ts", "cli <-> cliBrowserScenarioCommands.ts", "cli <-> cliEvidenceCommands.ts", @@ -14,7 +13,6 @@ "android -> artifacts": 2, "apktool -> artifacts": 2, "artifacts -> dotnet": 3, - "artifacts -> native": 1, "browser -> artifacts": 2, "captures -> pcap": 2, "desktop -> electron": 1, diff --git a/scripts/verify/baselines/captured-output-copy.json b/scripts/verify/baselines/captured-output-copy.json index 8069f6fff8..6ecdb34614 100644 --- a/scripts/verify/baselines/captured-output-copy.json +++ b/scripts/verify/baselines/captured-output-copy.json @@ -8,9 +8,9 @@ "src/gdb/GdbSessionManager.ts": 1, "src/javascript/recovery/WakaruCommand.ts": 1, "src/javascript/sourceMaps/SourceMapCommand.ts": 1, - "src/native/CommandRunner.ts": 1, "src/native/pwntools/PwntoolsDecoder.ts": 1, "src/pcap/PcapCommand.ts": 1, + "src/providers/NativeCommandRunner.ts": 1, "src/signals/SigrokRecordingProvider.ts": 1, "src/wasm/WabtArtifactProvider.ts": 1 } diff --git a/src/artifacts/MachOSliceArtifactReader.test.ts b/src/artifacts/MachOSliceArtifactReader.test.ts index 1b5be285f6..d6de6edc6e 100644 --- a/src/artifacts/MachOSliceArtifactReader.test.ts +++ b/src/artifacts/MachOSliceArtifactReader.test.ts @@ -12,8 +12,8 @@ import { MachOSliceArtifactReader } from "./MachOSliceArtifactReader.js"; import { err, ok } from "../domain/result.js"; import { openRegularFile } from "../filesystem/RegularFile.js"; import { ProviderProcessSupervisor } from "../process/ProviderProcess.js"; -import type { NativeCommandRunner } from "../native/CommandRunner.js"; -import { NativeCommandFailure } from "../native/CommandRunner.js"; +import type { NativeCommandRunner } from "../providers/NativeCommandRunner.js"; +import { NativeCommandFailure } from "../providers/NativeCommandRunner.js"; import { phaseGate } from "../../tests/support/lifecycleHarness.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import type { ArtifactEntry } from "../resources/ArtifactReader.js"; diff --git a/src/artifacts/MachOSliceArtifactReader.ts b/src/artifacts/MachOSliceArtifactReader.ts index d2812f7c2e..a19993f5e2 100644 --- a/src/artifacts/MachOSliceArtifactReader.ts +++ b/src/artifacts/MachOSliceArtifactReader.ts @@ -18,7 +18,7 @@ import type { ArtifactCommand } from "../domain/artifactGraph.js"; import { XcrunCommandRunner, type NativeCommandRunner, -} from "../native/CommandRunner.js"; +} from "../providers/NativeCommandRunner.js"; import type { MachoSlice } from "../domain/apple/dylibResolution.js"; import { machoArchitectureFamily, diff --git a/src/native/LldbCallTracer.ts b/src/native/LldbCallTracer.ts index 578cfc71e2..361cabba6d 100644 --- a/src/native/LldbCallTracer.ts +++ b/src/native/LldbCallTracer.ts @@ -66,7 +66,7 @@ import { NativeCommandFailure, resolveXcrunTool, type ResolvedTool, -} from "./CommandRunner.js"; +} from "../providers/NativeCommandRunner.js"; import { projectPartialNativeCalls } from "./NativeCallObservation.js"; import { LldbReadbackFiles } from "./LldbReadbackFiles.js"; import { analysisErrorWithCleanupDependencies } from "../domain/analysisErrorCleanup.js"; diff --git a/src/native/NativeCommandAnalysisError.test.ts b/src/native/NativeCommandAnalysisError.test.ts index 005e6ace80..179363d349 100644 --- a/src/native/NativeCommandAnalysisError.test.ts +++ b/src/native/NativeCommandAnalysisError.test.ts @@ -9,7 +9,7 @@ import { DarwinProcessOwnershipInspectionError, type DarwinCompilerOutcome, } from "../process/DarwinProcessRunTokenReader.js"; -import { NativeCommandFailure } from "./CommandRunner.js"; +import { NativeCommandFailure } from "../providers/NativeCommandRunner.js"; import { translateNativeCommandFailure } from "./NativeCommandAnalysisError.js"; const preparationFailure = ( diff --git a/src/native/NativeCommandAnalysisError.ts b/src/native/NativeCommandAnalysisError.ts index 2249856c8f..b8a9728143 100644 --- a/src/native/NativeCommandAnalysisError.ts +++ b/src/native/NativeCommandAnalysisError.ts @@ -27,7 +27,7 @@ import { import { NATIVE_FAILURE_DIAGNOSTIC_BYTES, type NativeCommandFailure, -} from "./CommandRunner.js"; +} from "../providers/NativeCommandRunner.js"; import { NATIVE_COMMAND_OUTPUT_BUDGET_BYTES } from "../domain/native/nativeCommandOutput.js"; /** Operation-owned text for a command deadline or unavailable requirement. */ diff --git a/src/native/NativeCommandDeadline.test.ts b/src/native/NativeCommandDeadline.test.ts index a26e3026e1..77a77252a5 100644 --- a/src/native/NativeCommandDeadline.test.ts +++ b/src/native/NativeCommandDeadline.test.ts @@ -17,8 +17,8 @@ import { import type { NativeCommandOptions, NativeCommandRunner, -} from "./CommandRunner.js"; -import { XcrunCommandRunner } from "./CommandRunner.js"; +} from "../providers/NativeCommandRunner.js"; +import { XcrunCommandRunner } from "../providers/NativeCommandRunner.js"; import { NativeMacOSProvider } from "./NativeMacOSProvider.js"; vi.mock("../process/OwnedCommand.js", async (original) => ({ diff --git a/src/native/NativeCommandPreparation.test.ts b/src/native/NativeCommandPreparation.test.ts index b59a5a01b0..9249b66ab2 100644 --- a/src/native/NativeCommandPreparation.test.ts +++ b/src/native/NativeCommandPreparation.test.ts @@ -19,7 +19,10 @@ import { ProcessOwnershipInspectionCancelled, } from "../process/ProcessInspectionCancellation.js"; import { NativeMacOSProvider } from "./NativeMacOSProvider.js"; -import { XcrunCommandRunner, NativeCommandFailure } from "./CommandRunner.js"; +import { + XcrunCommandRunner, + NativeCommandFailure, +} from "../providers/NativeCommandRunner.js"; import { LldbCallTracer } from "./LldbCallTracer.js"; import { err } from "../domain/result.js"; diff --git a/src/native/NativeMacOSProvider.ts b/src/native/NativeMacOSProvider.ts index 338a9a8458..ceb1cc67a6 100644 --- a/src/native/NativeMacOSProvider.ts +++ b/src/native/NativeMacOSProvider.ts @@ -127,7 +127,7 @@ import { type NativeCommandCleanupFailure, type NativeCommandCapture, type NativeCommandRunner, -} from "./CommandRunner.js"; +} from "../providers/NativeCommandRunner.js"; import { withSignatureTarget, verifySignatureTarget, diff --git a/src/native/NativeMachoCommandDiagnostics.test.ts b/src/native/NativeMachoCommandDiagnostics.test.ts index b5fec3e17b..4d115583f6 100644 --- a/src/native/NativeMachoCommandDiagnostics.test.ts +++ b/src/native/NativeMachoCommandDiagnostics.test.ts @@ -1,5 +1,5 @@ import { expect, it } from "vitest"; -import type { NativeCommandCapture } from "./CommandRunner.js"; +import type { NativeCommandCapture } from "../providers/NativeCommandRunner.js"; import { parseDyldFileTypeRefusal } from "./NativeMachoCommandDiagnostics.js"; const capture = (stdout: string, stderr = ""): NativeCommandCapture => ({ diff --git a/src/native/NativeMachoCommandDiagnostics.ts b/src/native/NativeMachoCommandDiagnostics.ts index 487f84118a..8f3058cbe2 100644 --- a/src/native/NativeMachoCommandDiagnostics.ts +++ b/src/native/NativeMachoCommandDiagnostics.ts @@ -1,6 +1,6 @@ import type { AnalysisCapturedOutput } from "../domain/analysisErrorBase.js"; import { AnalysisOutputError } from "../domain/analysisErrorCore.js"; -import type { NativeCommandCapture } from "./CommandRunner.js"; +import type { NativeCommandCapture } from "../providers/NativeCommandRunner.js"; import { withoutEchoedPathHeader } from "./parsers/echoedPath.js"; /** Path the command received. Diagnostics echo this operand, not the selected subject. */ diff --git a/src/native/NativeMachoInspection.test.ts b/src/native/NativeMachoInspection.test.ts index 5e8ae28747..f9b0027cc9 100644 --- a/src/native/NativeMachoInspection.test.ts +++ b/src/native/NativeMachoInspection.test.ts @@ -15,7 +15,7 @@ import { import { err, ok } from "../domain/result.js"; import { layoutFor } from "./AppleMachoSelection.fixture.js"; import { selectMachoSlice } from "../domain/apple/machoSliceSelection.js"; -import type { NativeCommandCapture } from "./CommandRunner.js"; +import type { NativeCommandCapture } from "../providers/NativeCommandRunner.js"; import type { MachoSliceEncryption } from "../domain/apple/machoEncryption.js"; import { inspectMachoSchema } from "../domain/native/nativeInspection.js"; import { diff --git a/src/native/NativeMachoInspection.ts b/src/native/NativeMachoInspection.ts index fcdfad88b7..26883dd1d0 100644 --- a/src/native/NativeMachoInspection.ts +++ b/src/native/NativeMachoInspection.ts @@ -16,7 +16,7 @@ import { machoRuntimeSymbolName } from "../domain/native/machoSymbolName.js"; import { keyedBy, uniqueKeyed } from "../domain/keyedCollection.js"; import { err, ok, type Result } from "../domain/result.js"; import type { MachoSliceSelectionRefusal } from "../domain/apple/machoSliceSelection.js"; -import type { NativeCommandCapture } from "./CommandRunner.js"; +import type { NativeCommandCapture } from "../providers/NativeCommandRunner.js"; import { chainedImportNames } from "../domain/apple/appleMachoFixups.js"; import { architectureBaseName, diff --git a/src/native/NativeMachoOperand.test.ts b/src/native/NativeMachoOperand.test.ts index 46bb9fbb34..4baa680ab2 100644 --- a/src/native/NativeMachoOperand.test.ts +++ b/src/native/NativeMachoOperand.test.ts @@ -8,7 +8,7 @@ import { } from "../../tests/fixtures/nativeCommands.js"; import { NativeMacOSProvider } from "./NativeMacOSProvider.js"; import type { NativeCallTracer } from "./LldbCallTracer.js"; -import { NativeCommandFailure } from "./CommandRunner.js"; +import { NativeCommandFailure } from "../providers/NativeCommandRunner.js"; import { inspectMachoSchema } from "../domain/native/nativeInspection.js"; import { err, ok } from "../domain/result.js"; diff --git a/src/native/NativeMachoSourceProvider.test.ts b/src/native/NativeMachoSourceProvider.test.ts index 53be001937..6b3e4e8183 100644 --- a/src/native/NativeMachoSourceProvider.test.ts +++ b/src/native/NativeMachoSourceProvider.test.ts @@ -5,7 +5,10 @@ import { expect, it, onTestFinished, vi } from "vitest"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { ProviderCleanupError } from "../domain/providerCleanupError.js"; import { NativeMacOSProvider } from "./NativeMacOSProvider.js"; -import { NativeCommandFailure, XcrunCommandRunner } from "./CommandRunner.js"; +import { + NativeCommandFailure, + XcrunCommandRunner, +} from "../providers/NativeCommandRunner.js"; import { ProviderProcessSupervisor } from "../process/ProviderProcess.js"; import { err } from "../domain/result.js"; import { primaryAnalysisError } from "../domain/analysisErrorBase.js"; diff --git a/src/native/SignatureTargetBinding.test.ts b/src/native/SignatureTargetBinding.test.ts index 22407c6c17..1d6eb149a7 100644 --- a/src/native/SignatureTargetBinding.test.ts +++ b/src/native/SignatureTargetBinding.test.ts @@ -24,7 +24,7 @@ import { NativeCommandFailure, XcrunCommandRunner, type NativeCommandRunner, -} from "./CommandRunner.js"; +} from "../providers/NativeCommandRunner.js"; import { ProviderProcessSupervisor } from "../process/ProviderProcess.js"; import type { NativeCallTracer } from "./LldbCallTracer.js"; import { NativeMacOSProvider } from "./NativeMacOSProvider.js"; diff --git a/src/native/parsers/lipo.ts b/src/native/parsers/lipo.ts index d8d7a95116..e4666f0e18 100644 --- a/src/native/parsers/lipo.ts +++ b/src/native/parsers/lipo.ts @@ -10,7 +10,7 @@ import { type LipoOutput, } from "../../domain/apple/lipo.js"; import { NATIVE_COMMAND_OUTPUT_BUDGET_BYTES } from "../../domain/native/nativeCommandOutput.js"; -import type { NativeCommandCapture } from "../CommandRunner.js"; +import type { NativeCommandCapture } from "../../providers/NativeCommandRunner.js"; /** Translate classified parse failure into native command output failure. */ export const parseLipoCapture = ( diff --git a/src/native/CommandRunner.ts b/src/providers/NativeCommandRunner.ts similarity index 99% rename from src/native/CommandRunner.ts rename to src/providers/NativeCommandRunner.ts index b52a1b7c34..6e2f043a57 100644 --- a/src/native/CommandRunner.ts +++ b/src/providers/NativeCommandRunner.ts @@ -1,6 +1,6 @@ import type { ProcessInspectionFailure } from "../process/ProcessInspectionCleanup.js"; import { HOST_PLATFORM } from "../platform/HostPlatform.js"; -import { processInspectionFailure } from "../providers/OwnedCommandCleanup.js"; +import { processInspectionFailure } from "./OwnedCommandCleanup.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { createHash, randomUUID } from "node:crypto"; import { createReadStream } from "node:fs"; diff --git a/tests/boundary/filesystem/ownedArtifactReaderCleanup.test.ts b/tests/boundary/filesystem/ownedArtifactReaderCleanup.test.ts index d44e4c7140..abdb32232a 100644 --- a/tests/boundary/filesystem/ownedArtifactReaderCleanup.test.ts +++ b/tests/boundary/filesystem/ownedArtifactReaderCleanup.test.ts @@ -12,7 +12,7 @@ import { DotnetBundleArtifactReader } from "../../../src/artifacts/DotnetBundleA import { MachOSliceArtifactReader } from "../../../src/artifacts/MachOSliceArtifactReader.js"; import { ZipArtifactReader } from "../../../src/artifacts/ZipArtifactReader.js"; import { ok } from "../../../src/domain/result.js"; -import type { NativeCommandRunner } from "../../../src/native/CommandRunner.js"; +import type { NativeCommandRunner } from "../../../src/providers/NativeCommandRunner.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; const injected = vi.hoisted(() => ({ diff --git a/tests/boundary/providers/native/artifactProvider.machOSlices.test.ts b/tests/boundary/providers/native/artifactProvider.machOSlices.test.ts index f760c76429..2ac9403e74 100644 --- a/tests/boundary/providers/native/artifactProvider.machOSlices.test.ts +++ b/tests/boundary/providers/native/artifactProvider.machOSlices.test.ts @@ -12,7 +12,7 @@ import { machoImage, } from "../../../../src/artifacts/apple/MachoImage.fixture.js"; import { ok } from "../../../../src/domain/result.js"; -import type { NativeCommandRunner } from "../../../../src/native/CommandRunner.js"; +import type { NativeCommandRunner } from "../../../../src/providers/NativeCommandRunner.js"; describe("artifact Mach-O slices", () => { it("rejects lipo slice sizes that exceed the observed artifact bytes", async () => { diff --git a/tests/boundary/providers/native/lldbCallTracerFailures.test.ts b/tests/boundary/providers/native/lldbCallTracerFailures.test.ts index 56a86e6ea6..b220c2fa5e 100644 --- a/tests/boundary/providers/native/lldbCallTracerFailures.test.ts +++ b/tests/boundary/providers/native/lldbCallTracerFailures.test.ts @@ -32,7 +32,7 @@ import type { NativeCallTracer } from "../../../../src/native/LldbCallTracer.js" import { LldbCallTracer } from "../../../../src/native/LldbCallTracer.js"; import { LldbReadbackFiles } from "../../../../src/native/LldbReadbackFiles.js"; import { err, ok, type Result } from "../../../../src/domain/result.js"; -import { NativeCommandFailure } from "../../../../src/native/CommandRunner.js"; +import { NativeCommandFailure } from "../../../../src/providers/NativeCommandRunner.js"; import { NativeMacOSProvider } from "../../../../src/native/NativeMacOSProvider.js"; import { createDeferred } from "../../../fixtures/binarySession.js"; import { PrivateRuntimeRoot } from "../../../../src/process/PrivateRuntimeRoot.js"; diff --git a/tests/boundary/providers/native/lldbDiscovery.test.ts b/tests/boundary/providers/native/lldbDiscovery.test.ts index 457a732968..dba326d4bc 100644 --- a/tests/boundary/providers/native/lldbDiscovery.test.ts +++ b/tests/boundary/providers/native/lldbDiscovery.test.ts @@ -7,7 +7,7 @@ import { thinMach } from "../../../../src/domain/binaryTarget.fixture.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; import { err } from "../../../../src/domain/result.js"; import { LldbCallTracer } from "../../../../src/native/LldbCallTracer.js"; -import { NativeCommandFailure } from "../../../../src/native/CommandRunner.js"; +import { NativeCommandFailure } from "../../../../src/providers/NativeCommandRunner.js"; import { NativeMacOSProvider } from "../../../../src/native/NativeMacOSProvider.js"; import { NativeFixtureRunner, diff --git a/tests/boundary/providers/native/lldbLauncherBoundary.test.ts b/tests/boundary/providers/native/lldbLauncherBoundary.test.ts index ca0c1bb5e9..25743026ae 100644 --- a/tests/boundary/providers/native/lldbLauncherBoundary.test.ts +++ b/tests/boundary/providers/native/lldbLauncherBoundary.test.ts @@ -17,7 +17,7 @@ import { nativeCallObservationInputSchema } from "../../../../src/domain/native/ import { resolveXcrunTool, XcrunCommandRunner, -} from "../../../../src/native/CommandRunner.js"; +} from "../../../../src/providers/NativeCommandRunner.js"; import { LldbCallTracer } from "../../../../src/native/LldbCallTracer.js"; import { observeProcessStartIdentity } from "../../../../src/process/ProcessOwnershipObservation.js"; import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/providers/native/lldbPrelaunchCleanup.test.ts b/tests/boundary/providers/native/lldbPrelaunchCleanup.test.ts index fb01f23ac9..f3e7643bae 100644 --- a/tests/boundary/providers/native/lldbPrelaunchCleanup.test.ts +++ b/tests/boundary/providers/native/lldbPrelaunchCleanup.test.ts @@ -8,7 +8,7 @@ import { primaryAnalysisError } from "../../../../src/domain/analysisErrorBase.j import { nativeCallObservationInputSchema } from "../../../../src/domain/native/nativeCallObservation.js"; import { ProviderCleanupError } from "../../../../src/domain/providerCleanupError.js"; import { err, ok } from "../../../../src/domain/result.js"; -import { NativeCommandFailure } from "../../../../src/native/CommandRunner.js"; +import { NativeCommandFailure } from "../../../../src/providers/NativeCommandRunner.js"; import { LldbCallTracer } from "../../../../src/native/LldbCallTracer.js"; import { DarwinProcessOwnershipInspectionError } from "../../../../src/process/DarwinProcessRunTokenReader.js"; import * as processBoundary from "../../../../src/process/ProviderProcess.js"; diff --git a/tests/boundary/providers/native/machoSliceReader.test.ts b/tests/boundary/providers/native/machoSliceReader.test.ts index 2ea1237108..000a26fdd1 100644 --- a/tests/boundary/providers/native/machoSliceReader.test.ts +++ b/tests/boundary/providers/native/machoSliceReader.test.ts @@ -4,7 +4,7 @@ import { join } from "node:path"; import { describe, expect, it, onTestFinished } from "vitest"; import { MachOSliceArtifactReader } from "../../../../src/artifacts/MachOSliceArtifactReader.js"; -import { XcrunCommandRunner } from "../../../../src/native/CommandRunner.js"; +import { XcrunCommandRunner } from "../../../../src/providers/NativeCommandRunner.js"; import { DarwinProcessOwnershipInspectionError } from "../../../../src/process/DarwinProcessRunTokenReader.js"; import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js"; diff --git a/tests/boundary/providers/native/nativeCommandResolver.test.ts b/tests/boundary/providers/native/nativeCommandResolver.test.ts index 9f8914764a..fad120699e 100644 --- a/tests/boundary/providers/native/nativeCommandResolver.test.ts +++ b/tests/boundary/providers/native/nativeCommandResolver.test.ts @@ -7,7 +7,7 @@ import { phaseArrival } from "../../../support/lifecycleHarness.js"; import { resolveXcrunTool, type NativeCommandLauncher, -} from "../../../../src/native/CommandRunner.js"; +} from "../../../../src/providers/NativeCommandRunner.js"; const realpathState = vi.hoisted(() => ({ resolve: undefined as ((path: string) => Promise) | undefined, diff --git a/tests/boundary/providers/native/nativeCommandTermination.test.ts b/tests/boundary/providers/native/nativeCommandTermination.test.ts index 93a4def7f5..425315ec65 100644 --- a/tests/boundary/providers/native/nativeCommandTermination.test.ts +++ b/tests/boundary/providers/native/nativeCommandTermination.test.ts @@ -6,7 +6,7 @@ import { afterEach, expect, it, vi } from "vitest"; import { XcrunCommandRunner, type NativeCommandLauncher, -} from "../../../../src/native/CommandRunner.js"; +} from "../../../../src/providers/NativeCommandRunner.js"; import { ok } from "../../../../src/domain/result.js"; import { DarwinProcessOwnershipInspectionError } from "../../../../src/process/DarwinProcessRunTokenReader.js"; diff --git a/tests/boundary/providers/native/nativeInventory.golden.test.ts b/tests/boundary/providers/native/nativeInventory.golden.test.ts index fc1c52376f..c51d02464c 100644 --- a/tests/boundary/providers/native/nativeInventory.golden.test.ts +++ b/tests/boundary/providers/native/nativeInventory.golden.test.ts @@ -14,7 +14,7 @@ import { type NativeCommandCapture, type NativeCommandOptions, type NativeCommandRunner, -} from "../../../../src/native/CommandRunner.js"; +} from "../../../../src/providers/NativeCommandRunner.js"; import { NativeMacOSProvider } from "../../../../src/native/NativeMacOSProvider.js"; import { parseDyldExports, diff --git a/tests/boundary/providers/native/nativeMachoUuidlessInspection.test.ts b/tests/boundary/providers/native/nativeMachoUuidlessInspection.test.ts index cbf648cd81..cf49aeed3b 100644 --- a/tests/boundary/providers/native/nativeMachoUuidlessInspection.test.ts +++ b/tests/boundary/providers/native/nativeMachoUuidlessInspection.test.ts @@ -10,7 +10,7 @@ import { type NativeCommandCapture, type NativeCommandOptions, type NativeCommandRunner, -} from "../../../../src/native/CommandRunner.js"; +} from "../../../../src/providers/NativeCommandRunner.js"; import { err, ok } from "../../../../src/domain/result.js"; import { createTestBinarySession } from "../../../fixtures/binarySession.js"; import { createApplicationMcpHarness } from "../../../fixtures/applicationMcpHarness.js"; diff --git a/tests/boundary/providers/native/nativePlistDiagnostics.test.ts b/tests/boundary/providers/native/nativePlistDiagnostics.test.ts index eaae7937a1..fc02128b0b 100644 --- a/tests/boundary/providers/native/nativePlistDiagnostics.test.ts +++ b/tests/boundary/providers/native/nativePlistDiagnostics.test.ts @@ -5,7 +5,7 @@ import { NativeMacOSProvider } from "../../../../src/native/NativeMacOSProvider. import { NATIVE_FAILURE_DIAGNOSTIC_BYTES, type NativeCommandRunner, -} from "../../../../src/native/CommandRunner.js"; +} from "../../../../src/providers/NativeCommandRunner.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; import { ok } from "../../../../src/domain/result.js"; import { thinMach } from "../../../../src/domain/binaryTarget.fixture.js"; diff --git a/tests/boundary/providers/native/nativeProvider.test.ts b/tests/boundary/providers/native/nativeProvider.test.ts index f82b82a1a4..41fcf32e24 100644 --- a/tests/boundary/providers/native/nativeProvider.test.ts +++ b/tests/boundary/providers/native/nativeProvider.test.ts @@ -22,7 +22,7 @@ import { XcrunCommandRunner, type NativeCommandLauncher, type NativeCommandRunner, -} from "../../../../src/native/CommandRunner.js"; +} from "../../../../src/providers/NativeCommandRunner.js"; import { err, ok } from "../../../../src/domain/result.js"; import { parseLipoFixture } from "../../../fixtures/lipo.js"; import { diff --git a/tests/boundary/providers/native/nativeSelectedArchitecture.test.ts b/tests/boundary/providers/native/nativeSelectedArchitecture.test.ts index 326315c86c..d81c2d23cf 100644 --- a/tests/boundary/providers/native/nativeSelectedArchitecture.test.ts +++ b/tests/boundary/providers/native/nativeSelectedArchitecture.test.ts @@ -11,7 +11,7 @@ import { err } from "../../../../src/domain/result.js"; import { NativeCommandFailure, type NativeCommandRunner, -} from "../../../../src/native/CommandRunner.js"; +} from "../../../../src/providers/NativeCommandRunner.js"; import { NativeMacOSProvider } from "../../../../src/native/NativeMacOSProvider.js"; import type { AnalysisClient } from "../../../../src/ports/AnalysisProvider.js"; import { inspectionImage } from "../../../../src/native/NativeMachoInspection.fixture.js"; diff --git a/tests/boundary/providers/native/nativeSignatureTargetBinding.test.ts b/tests/boundary/providers/native/nativeSignatureTargetBinding.test.ts index 291076db06..d3d8e51658 100644 --- a/tests/boundary/providers/native/nativeSignatureTargetBinding.test.ts +++ b/tests/boundary/providers/native/nativeSignatureTargetBinding.test.ts @@ -31,7 +31,7 @@ import { NativeCommandFailure, XcrunCommandRunner, type NativeCommandRunner, -} from "../../../../src/native/CommandRunner.js"; +} from "../../../../src/providers/NativeCommandRunner.js"; import { inspectSignatureSchema } from "../../../../src/domain/native/nativeInspection.js"; import { err, ok } from "../../../../src/domain/result.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; diff --git a/tests/boundary/providers/native/plistSourceFormat.test.ts b/tests/boundary/providers/native/plistSourceFormat.test.ts index 837a57b701..5f254039c9 100644 --- a/tests/boundary/providers/native/plistSourceFormat.test.ts +++ b/tests/boundary/providers/native/plistSourceFormat.test.ts @@ -12,7 +12,7 @@ import { NativeCommandFailure, type NativeCommandOptions, type NativeCommandRunner, -} from "../../../../src/native/CommandRunner.js"; +} from "../../../../src/providers/NativeCommandRunner.js"; import { NativeMacOSProvider } from "../../../../src/native/NativeMacOSProvider.js"; import { NativeFixtureRunner, diff --git a/tests/fixtures/nativeCommands.ts b/tests/fixtures/nativeCommands.ts index c6bc3d5318..6a35189ee7 100644 --- a/tests/fixtures/nativeCommands.ts +++ b/tests/fixtures/nativeCommands.ts @@ -11,7 +11,7 @@ import type { NativeCommandOptions, NativeCommandRunner, ResolvedTool, -} from "../../src/native/CommandRunner.js"; +} from "../../src/providers/NativeCommandRunner.js"; /** Resolver seam for fixtures with identical invocation and physical paths. */ export const nativeResolvedToolFixture = ( diff --git a/tests/process-global/darwinCompilerCleanup.test.ts b/tests/process-global/darwinCompilerCleanup.test.ts index cbe9c8322f..dc6caeaf95 100644 --- a/tests/process-global/darwinCompilerCleanup.test.ts +++ b/tests/process-global/darwinCompilerCleanup.test.ts @@ -42,7 +42,7 @@ import { DarwinProcessOwnershipInspectionError, } from "../../src/process/DarwinProcessRunTokenReader.js"; import { NativeMacOSProvider } from "../../src/native/NativeMacOSProvider.js"; -import { XcrunCommandRunner } from "../../src/native/CommandRunner.js"; +import { XcrunCommandRunner } from "../../src/providers/NativeCommandRunner.js"; import { nativeMachoTargetForFile } from "../fixtures/nativeCommands.js"; import { GhidraClient } from "../../src/ghidra/GhidraClient.js"; import { GhidraHeadlessLauncher } from "../../src/ghidra/GhidraLauncher.js";