From af0db0960574a6e93ab33c5db088dc256d1355ff Mon Sep 17 00:00:00 2001 From: morluto <76467478+morluto@users.noreply.github.com> Date: Mon, 16 Nov 2026 07:32:08 +0800 Subject: [PATCH] refactor(resources): move the directory artifact reader into src/resources (#11520) --- scripts/lib/module-boundaries.mjs | 2 +- scripts/lib/module-layers.baseline.json | 1 - src/apktool/ApktoolDecodedInventory.ts | 2 +- src/apktool/ApktoolWorkspace.ts | 2 +- src/artifacts/ArtifactSourceResolution.test.ts | 8 +++++--- src/artifacts/AsarArtifactReader.ts | 2 +- src/artifacts/DesktopApplicationReader.ts | 10 ++++------ src/artifacts/NativeDmgArtifactReader.ts | 2 +- src/artifacts/NativeDmgProtocol.test.ts | 6 ++++-- src/artifacts/apple/AppleAssetCatalogAnalysis.ts | 2 +- src/artifacts/apple/DylibResolutionReader.ts | 2 +- src/artifacts/apple/InterfaceBuilderAnalysis.ts | 2 +- .../apple/InterfaceBuilderFinalization.test.ts | 6 ++++-- src/artifacts/apple/KeyedArchiveReadFailure.test.ts | 10 +++++----- src/artifacts/apple/KeyedArchiveReader.ts | 6 ++---- src/artifacts/apple/MachoLoadCommandReader.test.ts | 2 +- src/artifacts/artifactFormats.ts | 2 +- src/artifacts/extraction/ArtifactExtraction.test.ts | 6 ++++-- src/artifacts/extraction/ArtifactExtraction.ts | 6 ++---- src/artifacts/inventory/ArtifactInventory.ts | 6 ++++-- .../inventory/ArtifactInventoryFinalization.test.ts | 6 ++++-- src/artifacts/inventory/classify.ts | 2 +- src/artifacts/inventory/scanCanonical.ts | 2 +- src/artifacts/inventory/scanReader.ts | 8 +++----- src/artifacts/javascript/JavaScriptArtifactReader.ts | 2 +- .../ArtifactSelectedSource.ts | 6 ++---- .../DirectoryArtifactReader.ts | 12 +++++++----- .../hostExecutableMarking.test.ts | 1 - .../hostExecutableMarking.ts | 0 src/resources/index.ts | 12 ++++++++++++ .../filesystem/artifactInventorySnapshot.test.ts | 6 ++++-- .../filesystem/asarInventoryFreshness.test.ts | 2 +- .../filesystem/assetCatalogFinalization.test.ts | 2 +- tests/boundary/filesystem/desktopApplication.test.ts | 2 +- .../directoryArtifactReaderFifoRace.test.ts | 4 ++-- .../filesystem/directoryArtifactReaderOpen.test.ts | 2 +- .../directoryArtifactReaderOwnership.test.ts | 2 +- .../filesystem/directoryRootIdentity.test.ts | 2 +- .../filesystem/interfaceBuilderBundle.test.ts | 2 +- .../javascriptArtifactContentIdentity.test.ts | 2 +- .../filesystem/javascriptDirectoryCoverage.test.ts | 2 +- .../filesystem/wideDirectoryTraversal.test.ts | 2 +- .../artifactProvider.extractionCompleteness.test.ts | 2 +- .../providers/native/nativeDmgArtifactReader.test.ts | 2 +- tests/evaluation/moduleBoundaries.test.ts | 4 ++-- .../assetCatalogCancellationReason.test.ts | 2 +- .../javascriptArtifactVerification.test.ts | 2 +- 47 files changed, 97 insertions(+), 81 deletions(-) rename src/{artifacts => resources}/ArtifactSelectedSource.ts (91%) rename src/{artifacts => resources}/DirectoryArtifactReader.ts (99%) rename src/{artifacts => resources}/hostExecutableMarking.test.ts (99%) rename src/{artifacts => resources}/hostExecutableMarking.ts (100%) diff --git a/scripts/lib/module-boundaries.mjs b/scripts/lib/module-boundaries.mjs index 249017db27..0b83b0810b 100644 --- a/scripts/lib/module-boundaries.mjs +++ b/scripts/lib/module-boundaries.mjs @@ -109,7 +109,7 @@ const failedBoundary = (file, target, typeOnly) => { return "process-capture"; if ( file.startsWith("src/application/javascript/") && - /^src\/artifacts\/(?:Asar|Directory)ArtifactReader\.(?:js|ts)$/u.test( + /^src\/(?:artifacts\/AsarArtifactReader|resources\/DirectoryArtifactReader)\.(?:js|ts)$/u.test( target, ) ) diff --git a/scripts/lib/module-layers.baseline.json b/scripts/lib/module-layers.baseline.json index 3857aebc41..cd0f395378 100644 --- a/scripts/lib/module-layers.baseline.json +++ b/scripts/lib/module-layers.baseline.json @@ -8,7 +8,6 @@ "main <-> server" ], "crossProvider": { - "apktool -> artifacts": 2, "desktop -> electron": 1, "gpu -> artifacts": 1, "model -> artifacts": 1 diff --git a/src/apktool/ApktoolDecodedInventory.ts b/src/apktool/ApktoolDecodedInventory.ts index 83433804c5..436c4c4d1c 100644 --- a/src/apktool/ApktoolDecodedInventory.ts +++ b/src/apktool/ApktoolDecodedInventory.ts @@ -3,8 +3,8 @@ import { type ArtifactEntry, type ArtifactTraversalOmission, assertArtifactReadActive, + DirectoryArtifactTraversalLimit, } from "../resources/index.js"; -import { DirectoryArtifactTraversalLimit } from "../artifacts/DirectoryArtifactReader.js"; import { classifyAndroidStringsTable } from "../domain/apktool/apktoolResourceAnalysis.js"; import type { ApktoolWorkspace } from "./ApktoolWorkspace.js"; diff --git a/src/apktool/ApktoolWorkspace.ts b/src/apktool/ApktoolWorkspace.ts index a431553028..8f7034c6b4 100644 --- a/src/apktool/ApktoolWorkspace.ts +++ b/src/apktool/ApktoolWorkspace.ts @@ -8,11 +8,11 @@ import { mapArtifactFileFailure, withArtifactFileHandle, withArtifactRegularFile, + DirectoryArtifactReader, } from "../resources/index.js"; import { createHash } from "node:crypto"; import { chmod, open } from "node:fs/promises"; import { join } from "node:path"; -import { DirectoryArtifactReader } from "../artifacts/DirectoryArtifactReader.js"; import { AnalysisInputError, AnalysisAccessDeniedError, diff --git a/src/artifacts/ArtifactSourceResolution.test.ts b/src/artifacts/ArtifactSourceResolution.test.ts index eef258b237..136c0d5b93 100644 --- a/src/artifacts/ArtifactSourceResolution.test.ts +++ b/src/artifacts/ArtifactSourceResolution.test.ts @@ -4,13 +4,15 @@ import { expect, it } from "vitest"; import { createTestTempDirectory } from "../../tests/fixtures/temporaryDirectory.js"; import { openRegularFile } from "../filesystem/RegularFile.js"; -import { assertArtifactSelectedSource } from "./ArtifactSelectedSource.js"; import { readStableArtifact } from "../resources/readStableArtifact.js"; -import { DirectoryArtifactReader } from "./DirectoryArtifactReader.js"; import { createDesktopApplicationService } from "../composition/desktop.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { desktopApplicationSchema } from "../domain/desktopApplication.js"; -import { assertArtifactFileSelectedSource } from "../resources/index.js"; +import { + assertArtifactFileSelectedSource, + assertArtifactSelectedSource, + DirectoryArtifactReader, +} from "../resources/index.js"; it.skipIf(process.platform === "win32")( "admits a caller-selected directory symlink without changing its target identity", diff --git a/src/artifacts/AsarArtifactReader.ts b/src/artifacts/AsarArtifactReader.ts index 6675832d34..17d248a14a 100644 --- a/src/artifacts/AsarArtifactReader.ts +++ b/src/artifacts/AsarArtifactReader.ts @@ -1,4 +1,3 @@ -import { assertArtifactSelectedSource } from "./ArtifactSelectedSource.js"; import { appendCallerPath } from "../filesystem/callerPath.js"; import type { AsarHeaderAdmission } from "../config/asarHeaderAdmission.js"; import { artifactIntegrityDetails } from "../domain/artifactIntegrity.js"; @@ -26,6 +25,7 @@ import { type ArtifactReader, type ArtifactTraversalOptions, readArtifactFileChunks, + assertArtifactSelectedSource, admitAsarHeader, readAsarHeader, type AsarHeaderExtents, diff --git a/src/artifacts/DesktopApplicationReader.ts b/src/artifacts/DesktopApplicationReader.ts index fac5f9d883..117fc25b49 100644 --- a/src/artifacts/DesktopApplicationReader.ts +++ b/src/artifacts/DesktopApplicationReader.ts @@ -1,17 +1,15 @@ import { desktopPathConventions } from "../domain/nativeConvention.js"; import { basename, isAbsolute } from "node:path"; -import { - DirectoryArtifactReader, - DirectoryArtifactRootFailure, - DirectoryArtifactTraversalLimit, - type DirectoryArtifactEntry, -} from "./DirectoryArtifactReader.js"; import { ArtifactReaderFailure, artifactFileCompletion, ArtifactResourceScope, type ArtifactResourceOwner, abortIfNeeded, + DirectoryArtifactReader, + DirectoryArtifactRootFailure, + DirectoryArtifactTraversalLimit, + type DirectoryArtifactEntry, translateArtifactFailure, } from "../resources/index.js"; import { declaredArtifactEntries } from "./ArtifactTraversalObservation.js"; diff --git a/src/artifacts/NativeDmgArtifactReader.ts b/src/artifacts/NativeDmgArtifactReader.ts index 767ad3b631..80aa8d1d0e 100644 --- a/src/artifacts/NativeDmgArtifactReader.ts +++ b/src/artifacts/NativeDmgArtifactReader.ts @@ -11,8 +11,8 @@ import { type ArtifactEntry, type ArtifactReader, type ArtifactTraversalOptions, + DirectoryArtifactReader, } from "../resources/index.js"; -import { DirectoryArtifactReader } from "./DirectoryArtifactReader.js"; import { declaredArtifactEntries } from "./ArtifactTraversalObservation.js"; import { NonRegularFileReadError, diff --git a/src/artifacts/NativeDmgProtocol.test.ts b/src/artifacts/NativeDmgProtocol.test.ts index f0ecd3a9f2..a2075e9f9d 100644 --- a/src/artifacts/NativeDmgProtocol.test.ts +++ b/src/artifacts/NativeDmgProtocol.test.ts @@ -6,12 +6,14 @@ import { NativeDmgArtifactReader, type NativeDmgHost, } from "./NativeDmgArtifactReader.js"; -import { translateArtifactFailure } from "../resources/index.js"; +import { + translateArtifactFailure, + DirectoryArtifactReader, +} from "../resources/index.js"; import { projectAnalysisError } from "../domain/analysisErrorProjection.js"; import { mkdir, writeFile } from "node:fs/promises"; import { join } from "node:path"; import type { ArtifactReaderTraversal } from "../resources/ArtifactReader.js"; -import { DirectoryArtifactReader } from "./DirectoryArtifactReader.js"; it.skipIf(process.platform === "win32").each([false, true])( "preserves mounted-directory coverage alongside readable DMG entries (unknown coverage: %s)", diff --git a/src/artifacts/apple/AppleAssetCatalogAnalysis.ts b/src/artifacts/apple/AppleAssetCatalogAnalysis.ts index c5e070d041..4d10322dd6 100644 --- a/src/artifacts/apple/AppleAssetCatalogAnalysis.ts +++ b/src/artifacts/apple/AppleAssetCatalogAnalysis.ts @@ -20,9 +20,9 @@ import { sameArtifactSourceIdentity, type ArtifactEntry, type ArtifactReaderTraversal, + DirectoryArtifactReader, translateArtifactFailure, } from "../../resources/index.js"; -import { DirectoryArtifactReader } from "../DirectoryArtifactReader.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/DylibResolutionReader.ts b/src/artifacts/apple/DylibResolutionReader.ts index 3acb53f6cd..fdbcf1864b 100644 --- a/src/artifacts/apple/DylibResolutionReader.ts +++ b/src/artifacts/apple/DylibResolutionReader.ts @@ -23,9 +23,9 @@ import { ArtifactResourceScope, assertArtifactReadActive, targetDigestChangedFailure, + DirectoryArtifactReader, } from "../../resources/index.js"; import { ArtifactTraversalObservation } from "../ArtifactTraversalObservation.js"; -import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; import { consumeWithOrderedReads } from "../OrderedReads.js"; import { DylibFileAccess, diff --git a/src/artifacts/apple/InterfaceBuilderAnalysis.ts b/src/artifacts/apple/InterfaceBuilderAnalysis.ts index 85f6f3f419..29d4698a64 100644 --- a/src/artifacts/apple/InterfaceBuilderAnalysis.ts +++ b/src/artifacts/apple/InterfaceBuilderAnalysis.ts @@ -26,8 +26,8 @@ import { ArtifactReaderFailure, type ArtifactEntry, type ArtifactReaderTraversal, + DirectoryArtifactReader, } from "../../resources/index.js"; -import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; import { ArtifactTraversalObservation } from "../ArtifactTraversalObservation.js"; import { projectPlistValue, diff --git a/src/artifacts/apple/InterfaceBuilderFinalization.test.ts b/src/artifacts/apple/InterfaceBuilderFinalization.test.ts index 24ce87aed3..14157df649 100644 --- a/src/artifacts/apple/InterfaceBuilderFinalization.test.ts +++ b/src/artifacts/apple/InterfaceBuilderFinalization.test.ts @@ -4,10 +4,12 @@ import { buildBinary } from "plist"; import { expect, it, vi } from "vitest"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; 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 "../../resources/index.js"; +import { + translateArtifactFailure, + DirectoryArtifactReader, +} from "../../resources/index.js"; const bundle = async () => { const path = await createTestTempDirectory("rea-ib-finalization-"); diff --git a/src/artifacts/apple/KeyedArchiveReadFailure.test.ts b/src/artifacts/apple/KeyedArchiveReadFailure.test.ts index 35756d1bd8..c39b081e03 100644 --- a/src/artifacts/apple/KeyedArchiveReadFailure.test.ts +++ b/src/artifacts/apple/KeyedArchiveReadFailure.test.ts @@ -8,15 +8,15 @@ import { ArtifactReaderFailure, type ArtifactEntry, } from "../../resources/ArtifactReader.js"; -import { - DirectoryArtifactEntryAccessDenied, - DirectoryArtifactReader, - DirectoryArtifactRootFailure, -} from "../DirectoryArtifactReader.js"; import { inspectBundleKeyedArchive } from "./KeyedArchiveReader.js"; import { AnalysisAccessDeniedError } from "../../domain/analysisErrorCore.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; +import { + DirectoryArtifactEntryAccessDenied, + DirectoryArtifactReader, + DirectoryArtifactRootFailure, +} from "../../resources/index.js"; const archive = build({ $archiver: "NSKeyedArchiver", diff --git a/src/artifacts/apple/KeyedArchiveReader.ts b/src/artifacts/apple/KeyedArchiveReader.ts index 85e67d16e0..8ef2748b7c 100644 --- a/src/artifacts/apple/KeyedArchiveReader.ts +++ b/src/artifacts/apple/KeyedArchiveReader.ts @@ -10,6 +10,8 @@ import { assertArtifactReadActive, bindArtifactFileCleanup, ArtifactResourceScope, + DirectoryArtifactReader, + DirectoryArtifactEntryAccessDenied, translateArtifactFailure, } from "../../resources/index.js"; import { createHash } from "node:crypto"; @@ -51,10 +53,6 @@ import { keyedArchiveResultSchema, projectKeyedArchive, } from "../../domain/apple/keyedArchive.js"; -import { - DirectoryArtifactReader, - DirectoryArtifactEntryAccessDenied, -} from "../DirectoryArtifactReader.js"; import { AnalysisError } from "../../domain/analysisErrorBase.js"; import { analysisErrorWithCleanupDependencies } from "../../domain/analysisErrorCleanup.js"; import { analysisInputErrorFromIssues } from "../../domain/inputIssueProjection.js"; diff --git a/src/artifacts/apple/MachoLoadCommandReader.test.ts b/src/artifacts/apple/MachoLoadCommandReader.test.ts index ca7012f810..70b1625739 100644 --- a/src/artifacts/apple/MachoLoadCommandReader.test.ts +++ b/src/artifacts/apple/MachoLoadCommandReader.test.ts @@ -29,9 +29,9 @@ import { } from "../../domain/apple/machoLoadCommandReader.js"; import { hasMachoMagic } from "../../domain/apple/machoContainer.js"; import { traceDylibResolution } from "./DylibResolutionReader.js"; -import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { javaClassFile } from "../../../tests/fixtures/javaClassFile.js"; +import { DirectoryArtifactReader } from "../../resources/index.js"; // Independently exercise the dependency and reference budgets. const MAX_LAZY_INFO_DEPENDENCIES = 1024; diff --git a/src/artifacts/artifactFormats.ts b/src/artifacts/artifactFormats.ts index 85ad346547..0f1d8a52cc 100644 --- a/src/artifacts/artifactFormats.ts +++ b/src/artifacts/artifactFormats.ts @@ -13,6 +13,7 @@ import { import { ArtifactReaderFailure, type ArtifactReader, + DirectoryArtifactReader, ZipArtifactReader, } from "../resources/index.js"; import type { ArtifactReaderAdmission } from "./ArtifactReaderAdmission.js"; @@ -22,7 +23,6 @@ import { BunStandaloneArtifactReader } from "./BunStandaloneArtifactReader.js"; import type { DenoStandaloneAdmission } from "./deno/DenoStandaloneAdmission.js"; import { DenoStandaloneArtifactReader } from "./DenoStandaloneArtifactReader.js"; import { DfuSeArtifactReader } from "./DfuSeArtifactReader.js"; -import { DirectoryArtifactReader } from "./DirectoryArtifactReader.js"; import type { DotnetBundleAdmission } from "./dotnet/DotnetBundleAdmission.js"; import { DotnetBundleArtifactReader } from "./DotnetBundleArtifactReader.js"; import { diff --git a/src/artifacts/extraction/ArtifactExtraction.test.ts b/src/artifacts/extraction/ArtifactExtraction.test.ts index 2a23bd6508..354c628184 100644 --- a/src/artifacts/extraction/ArtifactExtraction.test.ts +++ b/src/artifacts/extraction/ArtifactExtraction.test.ts @@ -9,11 +9,13 @@ import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; import { openRegularFile } from "../../filesystem/RegularFile.js"; -import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; +import { + ZipArtifactReader, + DirectoryArtifactReader, +} from "../../resources/index.js"; import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirectory.js"; import { asarHeaderBytes } from "../../../tests/fixtures/asarHeader.js"; import { extractArtifact } from "./ArtifactExtraction.js"; -import { ZipArtifactReader } from "../../resources/index.js"; const zipBytes = async (content?: string): Promise => { const writer = new ZipWriter(new Uint8ArrayWriter()); diff --git a/src/artifacts/extraction/ArtifactExtraction.ts b/src/artifacts/extraction/ArtifactExtraction.ts index 31ad22371e..25ed9d05d7 100644 --- a/src/artifacts/extraction/ArtifactExtraction.ts +++ b/src/artifacts/extraction/ArtifactExtraction.ts @@ -1,10 +1,6 @@ import { selectArtifactExtractionOccurrences } from "./ArtifactExtractionSelection.js"; import type { ArtifactReaderLimits } from "../../domain/artifactReaderLimits.js"; import { assertAdmittedRootDigest } from "../inventory/classify.js"; -import { - assertArtifactSelectedSource, - resolveArtifactSourcePath, -} from "../ArtifactSelectedSource.js"; import { InesArtifactReader } from "../InesArtifactReader.js"; import { openRootArtifact, @@ -24,6 +20,8 @@ import { SafeOutputTree, SafeOutputTreeCreationFailure, assertArtifactFileSelectedSource, + assertArtifactSelectedSource, + resolveArtifactSourcePath, resolveAsarHeaderAdmission, } from "../../resources/index.js"; import { absoluteCallerPath } from "../../filesystem/callerPath.js"; diff --git a/src/artifacts/inventory/ArtifactInventory.ts b/src/artifacts/inventory/ArtifactInventory.ts index 38b91dc212..37f6d84696 100644 --- a/src/artifacts/inventory/ArtifactInventory.ts +++ b/src/artifacts/inventory/ArtifactInventory.ts @@ -1,5 +1,4 @@ import { absoluteCallerPath } from "../../filesystem/callerPath.js"; -import { resolveArtifactSourcePath } from "../ArtifactSelectedSource.js"; import { artifactInventoryResultSchema, @@ -13,7 +12,10 @@ import { import type { ArtifactInventoryOptions } from "./types.js"; import type { ArtifactInventorySnapshot } from "../../domain/artifactInventorySnapshot.js"; import type { ArtifactEmbeddedFormatProbeFacts } from "../ArtifactEmbeddedFormatProbes.js"; -import { abortIfNeeded } from "../../resources/index.js"; +import { + abortIfNeeded, + resolveArtifactSourcePath, +} from "../../resources/index.js"; /** Inventory one local artifact and return every graph collection inline. */ export const inventoryArtifact = async ( diff --git a/src/artifacts/inventory/ArtifactInventoryFinalization.test.ts b/src/artifacts/inventory/ArtifactInventoryFinalization.test.ts index d50ffbab0c..e770c57460 100644 --- a/src/artifacts/inventory/ArtifactInventoryFinalization.test.ts +++ b/src/artifacts/inventory/ArtifactInventoryFinalization.test.ts @@ -7,14 +7,16 @@ import { createTestTempDirectory } from "../../../tests/fixtures/temporaryDirect import { ArtifactProvider } from "../ArtifactProvider.js"; import { ArtifactReaderFailure } from "../../resources/ArtifactReader.js"; import { ArtifactResourceScope } from "../../resources/ArtifactResourceScope.js"; -import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; +import { + ZipArtifactReader, + DirectoryArtifactReader, +} from "../../resources/index.js"; import { OwnedFileHandle } from "../../filesystem/OwnedFileHandle.js"; import { projectAnalysisError } from "../../domain/analysisErrorProjection.js"; import { scanCanonicalArtifactInventoryForExtractionInScope, scanCanonicalArtifactInventoryInScope, } from "./scanCanonical.js"; -import { ZipArtifactReader } from "../../resources/index.js"; afterEach(() => vi.restoreAllMocks()); diff --git a/src/artifacts/inventory/classify.ts b/src/artifacts/inventory/classify.ts index 4f161ca5ac..f895ef7560 100644 --- a/src/artifacts/inventory/classify.ts +++ b/src/artifacts/inventory/classify.ts @@ -4,6 +4,7 @@ import { openRootArtifact, releaseRootArtifact, abortIfNeeded, + assertArtifactSelectedSource, } from "../../resources/index.js"; import { nesContainerFormat, @@ -21,7 +22,6 @@ import { locateEspFlashLayout, type EspFlashSelection, } from "../../domain/firmware/espFlashLocation.js"; -import { assertArtifactSelectedSource } from "../ArtifactSelectedSource.js"; import { artifactNameForClassification } from "../../domain/artifactNameSelection.js"; import type { AsarHeaderAdmission } from "../../config/asarHeaderAdmission.js"; import { diff --git a/src/artifacts/inventory/scanCanonical.ts b/src/artifacts/inventory/scanCanonical.ts index 3b3305a655..a2d52c06f7 100644 --- a/src/artifacts/inventory/scanCanonical.ts +++ b/src/artifacts/inventory/scanCanonical.ts @@ -22,6 +22,7 @@ import { type ArtifactResourceOwner, hashStableRootArtifact, hashStableRootArtifactHandle, + hostExecutableMarking, } from "../../resources/index.js"; import { artifactInventoryResultSchema, @@ -45,7 +46,6 @@ import { artifactManifestId, } from "../../domain/artifactIdentity.js"; import { classifyAndHashRootForInventory } from "./classify.js"; -import { hostExecutableMarking } from "../hostExecutableMarking.js"; import type { HashResult } from "../ArtifactHash.js"; import { createReader, inventoryCoverage } from "./reader.js"; import { diff --git a/src/artifacts/inventory/scanReader.ts b/src/artifacts/inventory/scanReader.ts index dda17de618..f3eb1cf55c 100644 --- a/src/artifacts/inventory/scanReader.ts +++ b/src/artifacts/inventory/scanReader.ts @@ -19,16 +19,14 @@ import { type ArtifactReader, type ArtifactReaderTraversal, abortIfNeeded, + DirectoryArtifactEntryAccessDenied, + DirectoryArtifactReader, + DirectoryArtifactTraversalLimit, } from "../../resources/index.js"; import { ArtifactTraversalObservation, declaredArtifactEntries, } from "../ArtifactTraversalObservation.js"; -import { - DirectoryArtifactEntryAccessDenied, - DirectoryArtifactReader, - DirectoryArtifactTraversalLimit, -} from "../DirectoryArtifactReader.js"; import type { ArtifactInventoryOptions } from "./types.js"; import { AsarArtifactReader } from "../AsarArtifactReader.js"; import { diff --git a/src/artifacts/javascript/JavaScriptArtifactReader.ts b/src/artifacts/javascript/JavaScriptArtifactReader.ts index 5805dd8294..164d560d37 100644 --- a/src/artifacts/javascript/JavaScriptArtifactReader.ts +++ b/src/artifacts/javascript/JavaScriptArtifactReader.ts @@ -1,7 +1,7 @@ import type { AsarHeaderAdmission } from "../../config/asarHeaderAdmission.js"; import { AsarArtifactReader } from "../AsarArtifactReader.js"; import type { ArtifactReader } from "../../resources/index.js"; -import { DirectoryArtifactReader } from "../DirectoryArtifactReader.js"; +import { DirectoryArtifactReader } from "../../resources/index.js"; /** Create the reader for an admitted JavaScript artifact format. */ export const createJavaScriptArtifactReader = ( diff --git a/src/artifacts/ArtifactSelectedSource.ts b/src/resources/ArtifactSelectedSource.ts similarity index 91% rename from src/artifacts/ArtifactSelectedSource.ts rename to src/resources/ArtifactSelectedSource.ts index e075877313..1f7dbc27bf 100644 --- a/src/artifacts/ArtifactSelectedSource.ts +++ b/src/resources/ArtifactSelectedSource.ts @@ -1,8 +1,6 @@ import { realpath, stat } from "node:fs/promises"; -import { - ArtifactReaderFailure, - artifactSelectedPathErrno, -} from "../resources/index.js"; +import { ArtifactReaderFailure } from "./ArtifactReader.js"; +import { artifactSelectedPathErrno } from "./ArtifactFileOperation.js"; /** Canonicalize only a path that native filesystem lookup actually accepts. */ export const resolveArtifactSourcePath = async ( diff --git a/src/artifacts/DirectoryArtifactReader.ts b/src/resources/DirectoryArtifactReader.ts similarity index 99% rename from src/artifacts/DirectoryArtifactReader.ts rename to src/resources/DirectoryArtifactReader.ts index e492b2b62d..9e4336a9d0 100644 --- a/src/artifacts/DirectoryArtifactReader.ts +++ b/src/resources/DirectoryArtifactReader.ts @@ -17,12 +17,13 @@ import { type ArtifactReaderFailureOptions, type ArtifactTraversalOmission, type ArtifactTraversalOptions, +} from "./ArtifactReader.js"; +import { ArtifactFileCancelled, ArtifactFileCleanupFailure, - AnalysisCleanupLease, - readArtifactFileChunks, -} from "../resources/index.js"; -import { hostExecutableMarking } from "./hostExecutableMarking.js"; +} from "./ArtifactFileOperation.js"; +import { AnalysisCleanupLease } from "./AnalysisCleanupLease.js"; +import { readArtifactFileChunks } from "./readArtifactFileChunks.js"; import { OwnedDirectoryHandle } from "../filesystem/OwnedDirectoryHandle.js"; import { OwnedFileHandle } from "../filesystem/OwnedFileHandle.js"; import { @@ -32,8 +33,9 @@ import { } from "../filesystem/OwnedRegularFile.js"; import { RegularFileOperationCancelled } from "../filesystem/RegularFile.js"; import { decodeDirectoryEntryName } from "../filesystem/decodeDirectoryEntryName.js"; -import { resolveArtifactSourcePath } from "./ArtifactSelectedSource.js"; import { invariantViolation } from "../domain/internalInvariant.js"; +import { hostExecutableMarking } from "./hostExecutableMarking.js"; +import { resolveArtifactSourcePath } from "./ArtifactSelectedSource.js"; import { errorMessage } from "../kernel/errorMessage.js"; export type DirectoryArtifactEntry = ArtifactEntry & { diff --git a/src/artifacts/hostExecutableMarking.test.ts b/src/resources/hostExecutableMarking.test.ts similarity index 99% rename from src/artifacts/hostExecutableMarking.test.ts rename to src/resources/hostExecutableMarking.test.ts index ad1b39858c..5fde54e79c 100644 --- a/src/artifacts/hostExecutableMarking.test.ts +++ b/src/resources/hostExecutableMarking.test.ts @@ -1,5 +1,4 @@ import { describe, expect, it } from "vitest"; - import { hostExecutableMarking } from "./hostExecutableMarking.js"; const file = (mode: number) => ({ diff --git a/src/artifacts/hostExecutableMarking.ts b/src/resources/hostExecutableMarking.ts similarity index 100% rename from src/artifacts/hostExecutableMarking.ts rename to src/resources/hostExecutableMarking.ts diff --git a/src/resources/index.ts b/src/resources/index.ts index 438a187531..3c1d0af75a 100644 --- a/src/resources/index.ts +++ b/src/resources/index.ts @@ -64,6 +64,18 @@ export type { ArtifactTraversalSink, CleanupFailedRead, } from "./ArtifactReader.js"; +export { + assertArtifactSelectedSource, + resolveArtifactSourcePath, +} from "./ArtifactSelectedSource.js"; +export { + DirectoryArtifactEntryAccessDenied, + DirectoryArtifactReader, + DirectoryArtifactRootFailure, + DirectoryArtifactTraversalLimit, +} from "./DirectoryArtifactReader.js"; +export type { DirectoryArtifactEntry } from "./DirectoryArtifactReader.js"; +export { hostExecutableMarking } from "./hostExecutableMarking.js"; export { ArtifactResourceRetryFailure, ArtifactResourceScope, diff --git a/tests/boundary/filesystem/artifactInventorySnapshot.test.ts b/tests/boundary/filesystem/artifactInventorySnapshot.test.ts index d6133e5dd8..0c91b3396a 100644 --- a/tests/boundary/filesystem/artifactInventorySnapshot.test.ts +++ b/tests/boundary/filesystem/artifactInventorySnapshot.test.ts @@ -6,7 +6,10 @@ import { describe, expect, it, onTestFinished, vi } from "vitest"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; -import { translateArtifactFailure } from "../../../src/resources/index.js"; +import { + translateArtifactFailure, + DirectoryArtifactReader, +} from "../../../src/resources/index.js"; import { ArtifactReaderFailure, type ArtifactEntry, @@ -14,7 +17,6 @@ import { } from "../../../src/resources/ArtifactReader.js"; import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; import { AsarArtifactReader } from "../../../src/artifacts/AsarArtifactReader.js"; -import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { scanCanonicalArtifactInventoryInScope } from "../../../src/artifacts/inventory/scanCanonical.js"; import { scanArtifactInventory } from "../../fixtures/artifactInventory.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; diff --git a/tests/boundary/filesystem/asarInventoryFreshness.test.ts b/tests/boundary/filesystem/asarInventoryFreshness.test.ts index 52b2c5e80a..892adebfc2 100644 --- a/tests/boundary/filesystem/asarInventoryFreshness.test.ts +++ b/tests/boundary/filesystem/asarInventoryFreshness.test.ts @@ -7,11 +7,11 @@ import { createPackage, listPackage, uncache } from "@electron/asar"; import { describe, expect, it, onTestFinished } from "vitest"; import { ArtifactResourceScope } from "../../../src/resources/ArtifactResourceScope.js"; -import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { inventoryArtifact } from "../../fixtures/artifactInventory.js"; import { AsarArtifactReader } from "../../../src/artifacts/AsarArtifactReader.js"; import { scanCanonicalArtifactInventoryInScope } from "../../../src/artifacts/inventory/scanCanonical.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; +import { DirectoryArtifactReader } from "../../../src/resources/index.js"; const CONTENT = "module.exports = 42;\n"; diff --git a/tests/boundary/filesystem/assetCatalogFinalization.test.ts b/tests/boundary/filesystem/assetCatalogFinalization.test.ts index a5f8e81ae4..ad77dfcd5b 100644 --- a/tests/boundary/filesystem/assetCatalogFinalization.test.ts +++ b/tests/boundary/filesystem/assetCatalogFinalization.test.ts @@ -3,10 +3,10 @@ import { join } from "node:path"; import { expect, it, vi } from "vitest"; import { ArtifactProvider } from "../../../src/artifacts/ArtifactProvider.js"; import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; -import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { projectAnalysisError } from "../../../src/domain/analysisErrorProjection.js"; import * as processOutput from "../../../src/process/ExecFileOutput.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; +import { DirectoryArtifactReader } from "../../../src/resources/index.js"; it.skipIf(process.platform !== "darwin").each([ ["success", false, false], diff --git a/tests/boundary/filesystem/desktopApplication.test.ts b/tests/boundary/filesystem/desktopApplication.test.ts index 6395f9d9f9..df66343d8b 100644 --- a/tests/boundary/filesystem/desktopApplication.test.ts +++ b/tests/boundary/filesystem/desktopApplication.test.ts @@ -36,12 +36,12 @@ import { machoImage, } from "../../../src/artifacts/apple/MachoImage.fixture.js"; import { locateGodotPck } from "../../../src/artifacts/GodotPckLocation.js"; -import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { artifactFilePrimaryFacts } from "../../../src/resources/ArtifactFileOperation.js"; import { DesktopApplicationReader } from "../../../src/artifacts/DesktopApplicationReader.js"; import { inspectDesktopFile } from "../../../src/artifacts/DesktopFileInspection.js"; import { DesktopApplicationService } from "../../../src/application/artifacts/DesktopApplicationService.js"; +import { DirectoryArtifactReader } from "../../../src/resources/index.js"; const inspect = async (path: string, extra: Record = {}) => { const service = createDesktopApplicationService(); diff --git a/tests/boundary/filesystem/directoryArtifactReaderFifoRace.test.ts b/tests/boundary/filesystem/directoryArtifactReaderFifoRace.test.ts index 7e504bd22a..29b33183f4 100644 --- a/tests/boundary/filesystem/directoryArtifactReaderFifoRace.test.ts +++ b/tests/boundary/filesystem/directoryArtifactReaderFifoRace.test.ts @@ -26,7 +26,7 @@ it.skipIf(process.platform === "win32")( ); const readerModule = fileURLToPath( new URL( - "../../../dist/artifacts/DirectoryArtifactReader.js", + "../../../dist/resources/DirectoryArtifactReader.js", import.meta.url, ), ); @@ -70,7 +70,7 @@ it.skipIf(process.platform === "win32")( ); const readerModule = fileURLToPath( new URL( - "../../../dist/artifacts/DirectoryArtifactReader.js", + "../../../dist/resources/DirectoryArtifactReader.js", import.meta.url, ), ); diff --git a/tests/boundary/filesystem/directoryArtifactReaderOpen.test.ts b/tests/boundary/filesystem/directoryArtifactReaderOpen.test.ts index aff4cec120..4eb4a8ef00 100644 --- a/tests/boundary/filesystem/directoryArtifactReaderOpen.test.ts +++ b/tests/boundary/filesystem/directoryArtifactReaderOpen.test.ts @@ -5,8 +5,8 @@ import { buffer } from "node:stream/consumers"; import { describe, expect, it } from "vitest"; import type { ArtifactEntry } from "../../../src/resources/ArtifactReader.js"; -import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; +import { DirectoryArtifactReader } from "../../../src/resources/index.js"; const sampleEntry = async ( reader: DirectoryArtifactReader, diff --git a/tests/boundary/filesystem/directoryArtifactReaderOwnership.test.ts b/tests/boundary/filesystem/directoryArtifactReaderOwnership.test.ts index 3aab658d55..a726e86fb0 100644 --- a/tests/boundary/filesystem/directoryArtifactReaderOwnership.test.ts +++ b/tests/boundary/filesystem/directoryArtifactReaderOwnership.test.ts @@ -30,8 +30,8 @@ vi.mock("node:fs/promises", async (importOriginal) => { }); import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; -import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; +import { DirectoryArtifactReader } from "../../../src/resources/index.js"; const makeFixture = async () => { const root = await createTestTempDirectory("rea-directory-owner-"); diff --git a/tests/boundary/filesystem/directoryRootIdentity.test.ts b/tests/boundary/filesystem/directoryRootIdentity.test.ts index 8e6a03ebbc..f641f6d9e1 100644 --- a/tests/boundary/filesystem/directoryRootIdentity.test.ts +++ b/tests/boundary/filesystem/directoryRootIdentity.test.ts @@ -2,12 +2,12 @@ import { mkdir, rename, symlink, writeFile } from "node:fs/promises"; import { join } from "node:path"; import { expect, it } from "vitest"; -import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { DesktopApplicationReader } from "../../../src/artifacts/DesktopApplicationReader.js"; import { DesktopApplicationService } from "../../../src/application/artifacts/DesktopApplicationService.js"; import { parseEvidence } from "../../../src/domain/evidence.js"; import { desktopApplicationSchema } from "../../../src/domain/desktopApplication.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; +import { DirectoryArtifactReader } from "../../../src/resources/index.js"; it.each(["before-open", "during-inspection", "during-stream"] as const)( "rejects replacement of the admitted physical root %s even when file identity survives", diff --git a/tests/boundary/filesystem/interfaceBuilderBundle.test.ts b/tests/boundary/filesystem/interfaceBuilderBundle.test.ts index a2a54c9e12..ddeb58577c 100644 --- a/tests/boundary/filesystem/interfaceBuilderBundle.test.ts +++ b/tests/boundary/filesystem/interfaceBuilderBundle.test.ts @@ -8,7 +8,6 @@ import { buildBinary } from "plist"; import { describe, expect, it, onTestFinished, vi } from "vitest"; import { analyzeInterfaceBuilderBundle } from "../../../src/artifacts/apple/InterfaceBuilderAnalysis.js"; -import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { InterfaceBuilderDecodeBudget } from "../../../src/artifacts/apple/InterfaceBuilderDecodeBudget.js"; import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; import { encodeNibArchiveFixture } from "../../../src/artifacts/apple/NibArchive.fixture.js"; @@ -26,6 +25,7 @@ import { invalidInterfaceBuilderEncodings, } from "../../fixtures/interfaceBuilderEncoding.js"; import { cliTest } from "../../support/cli/cliFixture.js"; +import { DirectoryArtifactReader } from "../../../src/resources/index.js"; const compile = async ( command: string, diff --git a/tests/boundary/filesystem/javascriptArtifactContentIdentity.test.ts b/tests/boundary/filesystem/javascriptArtifactContentIdentity.test.ts index f462f23dff..7edae074a8 100644 --- a/tests/boundary/filesystem/javascriptArtifactContentIdentity.test.ts +++ b/tests/boundary/filesystem/javascriptArtifactContentIdentity.test.ts @@ -8,9 +8,9 @@ import { describe, expect, it } from "vitest"; import { scanArtifactInventory } from "../../fixtures/artifactInventory.js"; import { readJavaScriptArtifactFiles } from "../../support/javascriptApplicationScope.js"; import { AsarArtifactReader } from "../../../src/artifacts/AsarArtifactReader.js"; -import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; import { asarHeaderBytes } from "../../fixtures/asarHeader.js"; +import { DirectoryArtifactReader } from "../../../src/resources/index.js"; const fixture = async () => { const root = await createTestTempDirectory("rea-ingestion-content-identity-"); diff --git a/tests/boundary/filesystem/javascriptDirectoryCoverage.test.ts b/tests/boundary/filesystem/javascriptDirectoryCoverage.test.ts index 8836d155ef..1b23720965 100644 --- a/tests/boundary/filesystem/javascriptDirectoryCoverage.test.ts +++ b/tests/boundary/filesystem/javascriptDirectoryCoverage.test.ts @@ -7,8 +7,8 @@ import { expect, it } from "vitest"; import { scanArtifactInventory } from "../../fixtures/artifactInventory.js"; import { analyzeJavaScriptApplication } from "../../support/javascriptApplicationScope.js"; import { javascriptApplicationAnalysisResultSchema } from "../../../src/domain/javascript/javascriptApplicationAnalysis.js"; -import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; +import { DirectoryArtifactReader } from "../../../src/resources/index.js"; it.skipIf(process.platform === "win32")( "projects inventoried special-entry omissions into partial application coverage", diff --git a/tests/boundary/filesystem/wideDirectoryTraversal.test.ts b/tests/boundary/filesystem/wideDirectoryTraversal.test.ts index d6baf1c168..e06320ede2 100644 --- a/tests/boundary/filesystem/wideDirectoryTraversal.test.ts +++ b/tests/boundary/filesystem/wideDirectoryTraversal.test.ts @@ -3,13 +3,13 @@ import { join } from "node:path"; import { afterAll, beforeAll, describe, expect, it } from "vitest"; import { ArtifactReaderFailure } from "../../../src/resources/ArtifactReader.js"; -import { DirectoryArtifactReader } from "../../../src/artifacts/DirectoryArtifactReader.js"; import { readReferenceSource } from "../../support/referenceSourceResourceScope.js"; import { createTestWorkspace, removeTestWorkspace, type TestWorkspace, } from "../../support/workspace/workspaceFixture.js"; +import { DirectoryArtifactReader } from "../../../src/resources/index.js"; /** More children than one call can receive as arguments on V8's default stack. */ const CHILD_DIRECTORIES = 130_000; diff --git a/tests/boundary/providers/native/artifactProvider.extractionCompleteness.test.ts b/tests/boundary/providers/native/artifactProvider.extractionCompleteness.test.ts index 8ea9b49efe..12c328ddfc 100644 --- a/tests/boundary/providers/native/artifactProvider.extractionCompleteness.test.ts +++ b/tests/boundary/providers/native/artifactProvider.extractionCompleteness.test.ts @@ -20,7 +20,7 @@ import { } from "../../../fixtures/artifactInventory.js"; import { projectAnalysisError } from "../../../../src/domain/analysisErrorProjection.js"; import { createTestTempDirectory } from "../../../fixtures/temporaryDirectory.js"; -import { DirectoryArtifactReader } from "../../../../src/artifacts/DirectoryArtifactReader.js"; +import { DirectoryArtifactReader } from "../../../../src/resources/index.js"; it.for([false, true])( "preserves source traversal coverage when invalid-byte names are present: %s", diff --git a/tests/boundary/providers/native/nativeDmgArtifactReader.test.ts b/tests/boundary/providers/native/nativeDmgArtifactReader.test.ts index f2e18c41c3..bda035d735 100644 --- a/tests/boundary/providers/native/nativeDmgArtifactReader.test.ts +++ b/tests/boundary/providers/native/nativeDmgArtifactReader.test.ts @@ -24,13 +24,13 @@ import { type ArtifactTraversalOmission, } from "../../../../src/resources/ArtifactReader.js"; import { ArtifactResourceScope } from "../../../../src/resources/ArtifactResourceScope.js"; -import { DirectoryArtifactReader } from "../../../../src/artifacts/DirectoryArtifactReader.js"; import { OwnedFileHandle } from "../../../../src/filesystem/OwnedFileHandle.js"; import { NativeDmgArtifactReader, type NativeDmgHost, } from "../../../../src/artifacts/NativeDmgArtifactReader.js"; import { scanCanonicalArtifactInventoryInScope } from "../../../../src/artifacts/inventory/scanCanonical.js"; +import { DirectoryArtifactReader } from "../../../../src/resources/index.js"; const createAttachedReader = async ( path: string, diff --git a/tests/evaluation/moduleBoundaries.test.ts b/tests/evaluation/moduleBoundaries.test.ts index 9ef89a2897..380dd7be65 100644 --- a/tests/evaluation/moduleBoundaries.test.ts +++ b/tests/evaluation/moduleBoundaries.test.ts @@ -234,7 +234,7 @@ describe("incremental module import boundaries", () => { ], [ "src/application/javascript/probe.ts", - "../../artifacts/DirectoryArtifactReader.js", + "../../resources/DirectoryArtifactReader.js", false, ], [ @@ -595,7 +595,7 @@ describe.each(["apple", "inventory", "extraction"])( ["../../domain/apple/plistValue.js", true], ["../../domain/artifactInventorySnapshot.js", true], ["../../contracts/artifactGraph.js", true], - ["../DirectoryArtifactReader.js", true], + ["../AsarArtifactReader.js", true], ["../ArtifactHash.js", true], ])("checks the producer dependency %s", (dependency, allowed) => { const violations = inspectModuleBoundaries( diff --git a/tests/process-global/assetCatalogCancellationReason.test.ts b/tests/process-global/assetCatalogCancellationReason.test.ts index 1f236603a3..951a21ecc3 100644 --- a/tests/process-global/assetCatalogCancellationReason.test.ts +++ b/tests/process-global/assetCatalogCancellationReason.test.ts @@ -25,9 +25,9 @@ vi.mock("../../src/process/ExecFileOutput.js", async (importOriginal) => { import { execFileOutput } from "../../src/process/ExecFileOutput.js"; import { ArtifactReaderFailure } from "../../src/resources/ArtifactReader.js"; -import { DirectoryArtifactReader } from "../../src/artifacts/DirectoryArtifactReader.js"; import { analyzeAppleAssetCatalogs } from "../../src/artifacts/apple/AppleAssetCatalogAnalysis.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; +import { DirectoryArtifactReader } from "../../src/resources/index.js"; const createBundle = async (): Promise => { const bundle = await createTestTempDirectory( diff --git a/tests/process-global/javascriptArtifactVerification.test.ts b/tests/process-global/javascriptArtifactVerification.test.ts index 73b2e60500..19b3fbb6ff 100644 --- a/tests/process-global/javascriptArtifactVerification.test.ts +++ b/tests/process-global/javascriptArtifactVerification.test.ts @@ -6,8 +6,8 @@ import { expect, it, onTestFinished, vi } from "vitest"; import { analyzeJavaScriptApplication } from "../../src/application/javascript/JavaScriptApplicationService.js"; import { ArtifactResourceScope } from "../../src/resources/ArtifactResourceScope.js"; import { OwnedFileHandle } from "../../src/filesystem/OwnedFileHandle.js"; -import { DirectoryArtifactReader } from "../../src/artifacts/DirectoryArtifactReader.js"; import { createTestTempDirectory } from "../fixtures/temporaryDirectory.js"; +import { DirectoryArtifactReader } from "../../src/resources/index.js"; const injected = vi.hoisted(() => ({ opened: undefined as ((path: unknown, file: FileHandle) => void) | undefined,