From c965d2346b7c868c79db9fc35c0d65224fdf05ea Mon Sep 17 00:00:00 2001 From: morluto <76467478+morluto@users.noreply.github.com> Date: Mon, 16 Nov 2026 06:42:44 +0800 Subject: [PATCH] refactor(resources): move artifact failure translation into resources and declare JavaScript reconstruction's artifact entries (#11558) refactor(resources): give artifact failure translation to resources and declare JavaScript reconstruction's artifact entries translateArtifactFailure projects ArtifactReaderFailure, which src/resources owns, and depends only on resources and domain, so it moves to src/resources and is exported from its index. JavaScript reconstruction drives the canonical inventory scan, the format reader and the source read inside one resource scope; those three artifacts files are declared entry files. application -> artifacts past-entry imports go from 7 to 1 (the ZIP reader, moved by #11525). Refs #11359 --- scripts/lib/module-layers.baseline.json | 2 +- scripts/lib/module-layers.mjs | 5 +++++ .../rules/provider-failure-classifier-baseline.json | 2 +- .../javascript/JavaScriptApplicationService.ts | 2 +- .../javascript/JavaScriptArtifactAnalysis.ts | 6 ++++-- .../javascript/JavaScriptPreloadDiscovery.ts | 2 +- src/artifacts/ArtifactProvider.ts | 2 +- src/artifacts/DesktopApplicationReader.ts | 2 +- src/artifacts/NativeDmgProtocol.test.ts | 2 +- src/artifacts/NativeDmgRootObservation.test.ts | 2 +- src/artifacts/ZipArtifactReader.test.ts | 2 +- src/artifacts/apple/AppleAssetCatalogAnalysis.ts | 2 +- .../apple/InterfaceBuilderFinalization.test.ts | 2 +- src/artifacts/apple/KeyedArchiveRawRefusal.test.ts | 2 +- src/artifacts/apple/KeyedArchiveReader.ts | 2 +- .../inventory/ArtifactGraphConstruction.test.ts | 6 ++++-- .../pyinstaller/PyInstallerBoundaries.test.ts | 2 +- .../ArtifactOperationFailure.test.ts | 10 +++++----- .../ArtifactOperationFailure.ts | 4 ++-- src/resources/ArtifactResourceScope.test.ts | 2 +- src/resources/index.ts | 1 + .../filesystem/artifactInventorySnapshot.test.ts | 2 +- tests/boundary/filesystem/asarHeaderAdmission.test.ts | 10 +++++----- tests/process-global/dmgCancellationReason.test.ts | 2 +- tests/process-global/stableArtifactConsumers.test.ts | 2 +- 25 files changed, 44 insertions(+), 34 deletions(-) rename src/{artifacts => resources}/ArtifactOperationFailure.test.ts (95%) rename src/{artifacts => resources}/ArtifactOperationFailure.ts (96%) diff --git a/scripts/lib/module-layers.baseline.json b/scripts/lib/module-layers.baseline.json index e7a2482825..ed3b3b41f1 100644 --- a/scripts/lib/module-layers.baseline.json +++ b/scripts/lib/module-layers.baseline.json @@ -22,7 +22,7 @@ "native -> artifacts": 2 }, "entry": { - "application -> artifacts": 7, + "application -> artifacts": 1, "application -> browser": 2, "application -> desktop": 41, "application -> frida": 2, diff --git a/scripts/lib/module-layers.mjs b/scripts/lib/module-layers.mjs index c043e8d3c0..886411edc8 100644 --- a/scripts/lib/module-layers.mjs +++ b/scripts/lib/module-layers.mjs @@ -245,6 +245,11 @@ export const ENTRY_FILES = Object.freeze( "ArtifactProviderMetadata.ts", "DesktopApplicationReader.ts", "ReleaseExposureReader.ts", + // JavaScript reconstruction owns one resource scope across the + // inventory scan, the format reader and the source read. + "inventory/scanCanonical.ts", + "javascript/JavaScriptArtifactFiles.ts", + "javascript/JavaScriptArtifactReader.ts", ], browser: [ "CdpBrowserProvider.ts", diff --git a/scripts/lint/rules/provider-failure-classifier-baseline.json b/scripts/lint/rules/provider-failure-classifier-baseline.json index 580a20f3b4..9d99b544b0 100644 --- a/scripts/lint/rules/provider-failure-classifier-baseline.json +++ b/scripts/lint/rules/provider-failure-classifier-baseline.json @@ -18,7 +18,6 @@ "src/application/desktop/DesktopTaskReaderCleanup.ts": 2, "src/application/ntfs/NtfsJournalService.ts": 1, "src/application/process/ProcessCli.ts": 1, - "src/artifacts/ArtifactOperationFailure.ts": 1, "src/artifacts/ReleaseExposureReader.ts": 1, "src/browser/BrowserScenarioPartialObservation.ts": 1, "src/browser/CdpBrowserProvider.ts": 1, @@ -60,6 +59,7 @@ "src/providers/AnalysisClientFailure.ts": 1, "src/providers/OwnedCommandCleanup.ts": 2, "src/providers/runOwned.ts": 1, + "src/resources/ArtifactOperationFailure.ts": 1, "src/resources/StableArtifactFailure.ts": 2, "src/rust/RustBinaryProvider.ts": 1 } diff --git a/src/application/javascript/JavaScriptApplicationService.ts b/src/application/javascript/JavaScriptApplicationService.ts index 1809137309..80345d3839 100644 --- a/src/application/javascript/JavaScriptApplicationService.ts +++ b/src/application/javascript/JavaScriptApplicationService.ts @@ -11,8 +11,8 @@ import { z } from "zod"; import { ArtifactReaderFailure, type ArtifactResourceScope, + translateArtifactFailure, } from "../../resources/index.js"; -import { translateArtifactFailure } from "../../artifacts/ArtifactOperationFailure.js"; import { analyzeJavaScriptApplicationInputSchema, type JavaScriptApplicationAnalysisResult, diff --git a/src/application/javascript/JavaScriptArtifactAnalysis.ts b/src/application/javascript/JavaScriptArtifactAnalysis.ts index 3018d7db01..195be47611 100644 --- a/src/application/javascript/JavaScriptArtifactAnalysis.ts +++ b/src/application/javascript/JavaScriptArtifactAnalysis.ts @@ -46,8 +46,10 @@ import { htmlArtifactReferences } from "../../domain/javascript/htmlArtifactRefe import type { JavaScriptSourceAnalysisPort } from "../../domain/javascript/javascriptSourceAnalysis.js"; import type { JavaScriptSemanticGraphProjection } from "./JavaScriptSemanticGraphBuilder.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; -import { ArtifactReaderFailure } from "../../resources/index.js"; -import { translateArtifactFailure } from "../../artifacts/ArtifactOperationFailure.js"; +import { + ArtifactReaderFailure, + translateArtifactFailure, +} from "../../resources/index.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { AnalysisResourceConstraintError, diff --git a/src/application/javascript/JavaScriptPreloadDiscovery.ts b/src/application/javascript/JavaScriptPreloadDiscovery.ts index c636d2ed99..0671b35635 100644 --- a/src/application/javascript/JavaScriptPreloadDiscovery.ts +++ b/src/application/javascript/JavaScriptPreloadDiscovery.ts @@ -6,7 +6,7 @@ import { AnalysisCancelledError, AnalysisResourceConstraintError, } from "../../domain/analysisErrorCore.js"; -import { translateArtifactFailure } from "../../artifacts/ArtifactOperationFailure.js"; +import { translateArtifactFailure } from "../../resources/index.js"; import type { JavaScriptArtifactFileSet } from "../../domain/javascript/javascriptArtifactFiles.js"; import type { JavaScriptSourceAnalysisLimits } from "../../domain/javascript/javascriptSourceAnalysis.js"; import type { ArtifactResourceScope } from "../../resources/index.js"; diff --git a/src/artifacts/ArtifactProvider.ts b/src/artifacts/ArtifactProvider.ts index 702ffa8898..076bb1eb5c 100644 --- a/src/artifacts/ArtifactProvider.ts +++ b/src/artifacts/ArtifactProvider.ts @@ -12,9 +12,9 @@ import { ArtifactReaderFailure, ArtifactResourceScope, withArtifactTargetIdentity, + translateArtifactFailure, } from "../resources/index.js"; import type { AnalysisError } from "../domain/analysisErrorBase.js"; -import { translateArtifactFailure } from "./ArtifactOperationFailure.js"; import { snapshotEnvironment } from "../process/snapshotEnvironment.js"; import { createAnalysisExecution, diff --git a/src/artifacts/DesktopApplicationReader.ts b/src/artifacts/DesktopApplicationReader.ts index 0804018891..fac5f9d883 100644 --- a/src/artifacts/DesktopApplicationReader.ts +++ b/src/artifacts/DesktopApplicationReader.ts @@ -12,9 +12,9 @@ import { ArtifactResourceScope, type ArtifactResourceOwner, abortIfNeeded, + translateArtifactFailure, } from "../resources/index.js"; import { declaredArtifactEntries } from "./ArtifactTraversalObservation.js"; -import { translateArtifactFailure } from "./ArtifactOperationFailure.js"; import { inspectDesktopFile, RETAINED_FACT_BYTES, diff --git a/src/artifacts/NativeDmgProtocol.test.ts b/src/artifacts/NativeDmgProtocol.test.ts index 5cf0123570..f0ecd3a9f2 100644 --- a/src/artifacts/NativeDmgProtocol.test.ts +++ b/src/artifacts/NativeDmgProtocol.test.ts @@ -6,7 +6,7 @@ import { NativeDmgArtifactReader, type NativeDmgHost, } from "./NativeDmgArtifactReader.js"; -import { translateArtifactFailure } from "./ArtifactOperationFailure.js"; +import { translateArtifactFailure } from "../resources/index.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { mkdir, writeFile } from "node:fs/promises"; import { join } from "node:path"; diff --git a/src/artifacts/NativeDmgRootObservation.test.ts b/src/artifacts/NativeDmgRootObservation.test.ts index 8ee16cd2a9..cdb725aac7 100644 --- a/src/artifacts/NativeDmgRootObservation.test.ts +++ b/src/artifacts/NativeDmgRootObservation.test.ts @@ -9,7 +9,7 @@ import { NativeDmgArtifactReader, type NativeDmgHost, } from "./NativeDmgArtifactReader.js"; -import { translateArtifactFailure } from "./ArtifactOperationFailure.js"; +import { translateArtifactFailure } from "../resources/index.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; it.each(["same", "other", "missing-path", "no-path", "empty-group"] as const)( diff --git a/src/artifacts/ZipArtifactReader.test.ts b/src/artifacts/ZipArtifactReader.test.ts index 05aec55d5d..eb15785edc 100644 --- a/src/artifacts/ZipArtifactReader.test.ts +++ b/src/artifacts/ZipArtifactReader.test.ts @@ -32,7 +32,7 @@ import { ZipArtifactReader } from "./ZipArtifactReader.js"; import { openRegularFile } from "../filesystem/RegularFile.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import { hashReadable } from "./ArtifactHash.js"; -import { translateArtifactFailure } from "./ArtifactOperationFailure.js"; +import { translateArtifactFailure } from "../resources/index.js"; import { analysisErrorUserMessage } from "../domain/analysisErrorPresentation.js"; import { waitFor } from "../../tests/support/testWait.js"; diff --git a/src/artifacts/apple/AppleAssetCatalogAnalysis.ts b/src/artifacts/apple/AppleAssetCatalogAnalysis.ts index d0c2e4e4cc..c5e070d041 100644 --- a/src/artifacts/apple/AppleAssetCatalogAnalysis.ts +++ b/src/artifacts/apple/AppleAssetCatalogAnalysis.ts @@ -20,9 +20,9 @@ import { sameArtifactSourceIdentity, type ArtifactEntry, type ArtifactReaderTraversal, + translateArtifactFailure, } from "../../resources/index.js"; import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; -import { translateArtifactFailure } from "../ArtifactOperationFailure.js"; import { InternalInvariantError } from "../../domain/internalInvariant.js"; import { ProviderAdapterError } from "../../domain/providerAdapterError.js"; import { ARTIFACT_GRAPH_PROVIDER } from "../../domain/investigationProviders.js"; diff --git a/src/artifacts/apple/InterfaceBuilderFinalization.test.ts b/src/artifacts/apple/InterfaceBuilderFinalization.test.ts index 3f0937ba22..24ce87aed3 100644 --- a/src/artifacts/apple/InterfaceBuilderFinalization.test.ts +++ b/src/artifacts/apple/InterfaceBuilderFinalization.test.ts @@ -7,7 +7,7 @@ import { analyzeInterfaceBuilderBundle } from "./InterfaceBuilderAnalysis.js"; import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; -import { translateArtifactFailure } from "../ArtifactOperationFailure.js"; +import { translateArtifactFailure } from "../../resources/index.js"; const bundle = async () => { const path = await createTestTempDirectory("rea-ib-finalization-"); diff --git a/src/artifacts/apple/KeyedArchiveRawRefusal.test.ts b/src/artifacts/apple/KeyedArchiveRawRefusal.test.ts index b430660aea..3b6e064c8e 100644 --- a/src/artifacts/apple/KeyedArchiveRawRefusal.test.ts +++ b/src/artifacts/apple/KeyedArchiveRawRefusal.test.ts @@ -8,7 +8,7 @@ import { expect, it, vi } from "vitest"; import { AnalysisAccessDeniedError } from "../../domain/analysisErrorCore.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; -import { translateArtifactFailure } from "../ArtifactOperationFailure.js"; +import { translateArtifactFailure } from "../../resources/index.js"; import { inspectBundleKeyedArchive } from "./KeyedArchiveReader.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; diff --git a/src/artifacts/apple/KeyedArchiveReader.ts b/src/artifacts/apple/KeyedArchiveReader.ts index 198f6b332f..d6dc76753f 100644 --- a/src/artifacts/apple/KeyedArchiveReader.ts +++ b/src/artifacts/apple/KeyedArchiveReader.ts @@ -10,6 +10,7 @@ import { assertArtifactReadActive, bindArtifactFileCleanup, ArtifactResourceScope, + translateArtifactFailure, } from "../../resources/index.js"; import { createHash } from "node:crypto"; import { @@ -55,7 +56,6 @@ import { DirectoryArtifactEntryAccessDenied, } from "../DirectoryArtifactReader.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; -import { translateArtifactFailure } from "../ArtifactOperationFailure.js"; import { analysisErrorWithCleanupDependencies } from "../../domain/analysisErrorCleanup.js"; import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection.js"; diff --git a/src/artifacts/inventory/ArtifactGraphConstruction.test.ts b/src/artifacts/inventory/ArtifactGraphConstruction.test.ts index 7f6879ead4..e246576bae 100644 --- a/src/artifacts/inventory/ArtifactGraphConstruction.test.ts +++ b/src/artifacts/inventory/ArtifactGraphConstruction.test.ts @@ -15,7 +15,10 @@ import { } from "./ArtifactGraphConstruction.js"; import { createArtifactClassificationProbe } from "../ArtifactClassificationProbe.js"; import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; -import { translateArtifactFailure } from "../ArtifactOperationFailure.js"; +import { + translateArtifactFailure, + createAsarHeaderSignatureProbe, +} from "../../resources/index.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { artifactIdForContent } from "../../domain/artifactIdentity.js"; import { pe } from "../../domain/binaryTarget.fixture.js"; @@ -42,7 +45,6 @@ import { } from "../../../tests/fixtures/espImage.js"; import { devicetreeFixture } from "../../domain/firmware/devicetree.fixture.js"; import { fitFixture } from "../fit/FitImage.fixture.js"; -import { createAsarHeaderSignatureProbe } from "../../resources/index.js"; it("joins only observed PE signature bytes across stream chunks", () => { const bytes = pe(0x8664, 8190); diff --git a/src/artifacts/pyinstaller/PyInstallerBoundaries.test.ts b/src/artifacts/pyinstaller/PyInstallerBoundaries.test.ts index f791a4d533..a12f7dd1dd 100644 --- a/src/artifacts/pyinstaller/PyInstallerBoundaries.test.ts +++ b/src/artifacts/pyinstaller/PyInstallerBoundaries.test.ts @@ -11,7 +11,7 @@ import { expect, it, vi } from "vitest"; import { PyInstallerArtifactReader } from "../PyInstallerArtifactReader.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; import { hashReadable } from "../ArtifactHash.js"; -import { translateArtifactFailure } from "../ArtifactOperationFailure.js"; +import { translateArtifactFailure } from "../../resources/index.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { marshalCode } from "../../python/PythonPyc.fixture.js"; import * as artifactPaths from "../../resources/ArtifactPaths.js"; diff --git a/src/artifacts/ArtifactOperationFailure.test.ts b/src/resources/ArtifactOperationFailure.test.ts similarity index 95% rename from src/artifacts/ArtifactOperationFailure.test.ts rename to src/resources/ArtifactOperationFailure.test.ts index 37ea0b6963..1917eba1c2 100644 --- a/src/artifacts/ArtifactOperationFailure.test.ts +++ b/src/resources/ArtifactOperationFailure.test.ts @@ -1,18 +1,18 @@ import { expect, it } from "vitest"; -import { ArtifactReaderFailure } from "../resources/ArtifactReader.js"; +import { ArtifactReaderFailure } from "./ArtifactReader.js"; import { translateArtifactFailure } from "./ArtifactOperationFailure.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { constants as bufferConstants } from "node:buffer"; import { imageFileSizeRemediation, readerIntegrityFailure, -} from "../resources/StableArtifactFailure.js"; +} from "./StableArtifactFailure.js"; import { artifactIntegrityDetails } from "../domain/artifactIntegrity.js"; -import { ArtifactFileCleanupFailure } from "../resources/ArtifactFileOperation.js"; -import { AnalysisCleanupLease } from "../resources/AnalysisCleanupLease.js"; +import { ArtifactFileCleanupFailure } from "./ArtifactFileOperation.js"; +import { AnalysisCleanupLease } from "./AnalysisCleanupLease.js"; import { RegularFileCleanupFailure } from "../filesystem/OwnedRegularFile.js"; -import { artifactReaderLimitFailure } from "../resources/index.js"; +import { artifactReaderLimitFailure } from "./index.js"; // The provider ceiling test uses a sparse file and is skipped on Windows. it.skipIf(process.platform !== "win32")( diff --git a/src/artifacts/ArtifactOperationFailure.ts b/src/resources/ArtifactOperationFailure.ts similarity index 96% rename from src/artifacts/ArtifactOperationFailure.ts rename to src/resources/ArtifactOperationFailure.ts index 51c5bbb3e8..7ec0a5f4e3 100644 --- a/src/artifacts/ArtifactOperationFailure.ts +++ b/src/resources/ArtifactOperationFailure.ts @@ -2,11 +2,11 @@ import { analysisSettingLimit } from "../domain/analysisSettingDefinitions.js"; import { AnalysisError } from "../domain/analysisErrorBase.js"; import { ArtifactOperationError } from "../domain/artifactOperationError.js"; import { InternalInvariantError } from "../domain/internalInvariant.js"; +import { ArtifactReaderFailure } from "./ArtifactReader.js"; import { - ArtifactReaderFailure, artifactFileCancellationCause, bindArtifactFileCleanup, -} from "../resources/index.js"; +} from "./ArtifactFileOperation.js"; /** * Translate one artifact boundary failure while retaining cleanup evidence. A diff --git a/src/resources/ArtifactResourceScope.test.ts b/src/resources/ArtifactResourceScope.test.ts index 67b1d65191..e03e20179a 100644 --- a/src/resources/ArtifactResourceScope.test.ts +++ b/src/resources/ArtifactResourceScope.test.ts @@ -19,7 +19,7 @@ import { ArtifactReaderFailure, type ArtifactReader, } from "./ArtifactReader.js"; -import { translateArtifactFailure } from "../artifacts/ArtifactOperationFailure.js"; +import { translateArtifactFailure } from "./ArtifactOperationFailure.js"; it("waits for admitted operations and shares concurrent close", async () => { const scope = new ArtifactResourceScope(); diff --git a/src/resources/index.ts b/src/resources/index.ts index 77fc43532c..1e7045a888 100644 --- a/src/resources/index.ts +++ b/src/resources/index.ts @@ -25,6 +25,7 @@ export { ArtifactFileSource, assertArtifactFileSelectedSource, } from "./ArtifactFileSource.js"; +export { translateArtifactFailure } from "./ArtifactOperationFailure.js"; export { ArtifactFileCancelled, ArtifactFileCleanupFailure, diff --git a/tests/boundary/filesystem/artifactInventorySnapshot.test.ts b/tests/boundary/filesystem/artifactInventorySnapshot.test.ts index eece07e64a..d6133e5dd8 100644 --- a/tests/boundary/filesystem/artifactInventorySnapshot.test.ts +++ b/tests/boundary/filesystem/artifactInventorySnapshot.test.ts @@ -6,7 +6,7 @@ import { describe, expect, it, onTestFinished, vi } from "vitest"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; -import { translateArtifactFailure } from "../../../src/artifacts/ArtifactOperationFailure.js"; +import { translateArtifactFailure } from "../../../src/resources/index.js"; import { ArtifactReaderFailure, type ArtifactEntry, diff --git a/tests/boundary/filesystem/asarHeaderAdmission.test.ts b/tests/boundary/filesystem/asarHeaderAdmission.test.ts index 0f599051e1..9f9e5ed9f8 100644 --- a/tests/boundary/filesystem/asarHeaderAdmission.test.ts +++ b/tests/boundary/filesystem/asarHeaderAdmission.test.ts @@ -4,7 +4,11 @@ import { join } from "node:path"; import { createPackage } from "@electron/asar"; import { afterEach, expect, it, vi } from "vitest"; -import { translateArtifactFailure } from "../../../src/artifacts/ArtifactOperationFailure.js"; +import { + translateArtifactFailure, + admitAsarHeader, + asarHeaderAdmissionRecovery, +} from "../../../src/resources/index.js"; import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { parseEnvironment } from "../../../src/config/environment.js"; import { createDirectAnalysis } from "../../../src/composition/directAnalysis.js"; @@ -22,10 +26,6 @@ import { projectAnalysisError } from "../../../src/domain/analysisErrorProjectio import { inventoryArtifact } from "../../fixtures/artifactInventory.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { analyzeJavaScriptApplication } from "../../support/javascriptApplicationScope.js"; -import { - admitAsarHeader, - asarHeaderAdmissionRecovery, -} from "../../../src/resources/index.js"; const createFixture = async () => { const root = await createTestTempDirectory("rea-asar-header-admission-"); diff --git a/tests/process-global/dmgCancellationReason.test.ts b/tests/process-global/dmgCancellationReason.test.ts index 508099ba6a..3398fad673 100644 --- a/tests/process-global/dmgCancellationReason.test.ts +++ b/tests/process-global/dmgCancellationReason.test.ts @@ -35,7 +35,7 @@ vi.mock("../../src/process/ExecFileOutput.js", async (importOriginal) => { import { NativeDmgArtifactReader } from "../../src/artifacts/NativeDmgArtifactReader.js"; import { ArtifactReaderFailure } from "../../src/resources/ArtifactReader.js"; import { ExecFileOutputCancelledError } from "../../src/process/ExecFileOutput.js"; -import { translateArtifactFailure } from "../../src/artifacts/ArtifactOperationFailure.js"; +import { translateArtifactFailure } from "../../src/resources/index.js"; it.skipIf(process.platform !== "darwin").each([false, true])( "preserves exact DMG caller reason and settles the command before return (pre-aborted: %s)", diff --git a/tests/process-global/stableArtifactConsumers.test.ts b/tests/process-global/stableArtifactConsumers.test.ts index 690e07f70d..7ad1f33bcf 100644 --- a/tests/process-global/stableArtifactConsumers.test.ts +++ b/tests/process-global/stableArtifactConsumers.test.ts @@ -89,7 +89,7 @@ import { withArtifactRegularFile, } from "../../src/resources/ArtifactFileOperation.js"; import { AnalysisCleanupLease } from "../../src/resources/AnalysisCleanupLease.js"; -import { translateArtifactFailure } from "../../src/artifacts/ArtifactOperationFailure.js"; +import { translateArtifactFailure } from "../../src/resources/index.js"; import { OwnedFileHandle } from "../../src/filesystem/OwnedFileHandle.js"; import { OwnedRegularFileOperationFailure,