From 97112f14a1f21a21a91578b5371fe4dfbfbb7835 Mon Sep 17 00:00:00 2001 From: morluto <76467478+morluto@users.noreply.github.com> Date: Mon, 16 Nov 2026 03:36:40 +0800 Subject: [PATCH] refactor(domain): move the source map format parser into src/domain (#11348) SourceMapFormat imports only zod, domain modules and a type from @jridgewell/trace-mapping, and is read by src/artifacts (release exposure), src/browser and src/javascript. Under src/javascript it made src/artifacts import the JavaScript provider. It now sits beside domain/sourceMapEnvelope.ts and domain/sourceMapLimits.ts. Pure move: git mv plus import specifier updates. --- src/artifacts/ReleaseExposureReader.ts | 2 +- src/browser/WebSourceMapFetcher.ts | 2 +- .../SourceMapFormat.ts => domain/sourceMapFormat.ts} | 8 ++++---- src/javascript/sourceMaps/DecodedSourceMap.ts | 2 +- src/javascript/sourceMaps/SourceMapAdmission.test.ts | 2 +- src/javascript/sourceMaps/SourceMapCodecProcess.ts | 2 +- src/javascript/sourceMaps/TraceSourceMap.test.ts | 2 +- src/javascript/sourceMaps/TraceSourceMap.ts | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) rename src/{javascript/sourceMaps/SourceMapFormat.ts => domain/sourceMapFormat.ts} (98%) diff --git a/src/artifacts/ReleaseExposureReader.ts b/src/artifacts/ReleaseExposureReader.ts index 766827c7e8..f583be9e67 100644 --- a/src/artifacts/ReleaseExposureReader.ts +++ b/src/artifacts/ReleaseExposureReader.ts @@ -126,7 +126,7 @@ import { sourceMapJsonText } from "../domain/sourceMapEnvelope.js"; import { inspectSourceMap, inspectSourceMapSourceContent, -} from "../javascript/sourceMaps/SourceMapFormat.js"; +} from "../domain/sourceMapFormat.js"; import { htmlArtifactReferences } from "../domain/javascript/htmlArtifactReferences.js"; import { parseJavaScriptSource } from "../domain/javascript/javascriptSourceParser.js"; import { addSourceMapDirectives } from "../domain/javascript/javascriptStaticAnalysisCalls.js"; diff --git a/src/browser/WebSourceMapFetcher.ts b/src/browser/WebSourceMapFetcher.ts index a236152124..d40ddffc87 100644 --- a/src/browser/WebSourceMapFetcher.ts +++ b/src/browser/WebSourceMapFetcher.ts @@ -48,7 +48,7 @@ import { isSourceMapSectionOverlap, sourceMapLimitFailure, type SourceMapLeaf, -} from "../javascript/sourceMaps/SourceMapFormat.js"; +} from "../domain/sourceMapFormat.js"; import { malformedInput, type ParseFailureError, diff --git a/src/javascript/sourceMaps/SourceMapFormat.ts b/src/domain/sourceMapFormat.ts similarity index 98% rename from src/javascript/sourceMaps/SourceMapFormat.ts rename to src/domain/sourceMapFormat.ts index 47a7d9847c..e8146ef131 100644 --- a/src/javascript/sourceMaps/SourceMapFormat.ts +++ b/src/domain/sourceMapFormat.ts @@ -4,20 +4,20 @@ import { sourceMapLimitRecovery, type SourceMapLimitSelection, type SourceMapLimits, -} from "../../domain/sourceMapLimits.js"; +} from "./sourceMapLimits.js"; import { malformedInput, ParseFailureError, type ParseFailureKind, unsupportedInput, -} from "../../domain/parseFailure.js"; +} from "./parseFailure.js"; import { classifySourceMapSection, classifySourceMapSections, sourceMapJsonText, sourceMapMappingsSchema, -} from "../../domain/sourceMapEnvelope.js"; -import type { SourceMapSection } from "../../domain/sourceMapEnvelope.js"; +} from "./sourceMapEnvelope.js"; +import type { SourceMapSection } from "./sourceMapEnvelope.js"; import type { EncodedSourceMapXInput } from "@jridgewell/trace-mapping"; const leafSchema = z.object({ diff --git a/src/javascript/sourceMaps/DecodedSourceMap.ts b/src/javascript/sourceMaps/DecodedSourceMap.ts index 215ee5938e..211e552d5c 100644 --- a/src/javascript/sourceMaps/DecodedSourceMap.ts +++ b/src/javascript/sourceMaps/DecodedSourceMap.ts @@ -4,7 +4,7 @@ import { SOURCE_MAP_FORMAT, sourceMapSectionOverlap, type SourceMapLeaf, -} from "./SourceMapFormat.js"; +} from "../../domain/sourceMapFormat.js"; /** Determine whether a leaf-local mapping falls before its enclosing boundary. */ const isBeforeSourceMapLeafStop = ( diff --git a/src/javascript/sourceMaps/SourceMapAdmission.test.ts b/src/javascript/sourceMaps/SourceMapAdmission.test.ts index 5eb9da1899..53424aea3e 100644 --- a/src/javascript/sourceMaps/SourceMapAdmission.test.ts +++ b/src/javascript/sourceMaps/SourceMapAdmission.test.ts @@ -5,7 +5,7 @@ import { selectedSourceMapLimits } from "../../domain/sourceMapLimits.js"; import { expect, it } from "vitest"; import { inspectSourceMapEnvelope } from "../../domain/sourceMapEnvelope.js"; -import { inspectSourceMapValue } from "./SourceMapFormat.js"; +import { inspectSourceMapValue } from "../../domain/sourceMapFormat.js"; import { traceSourceMap } from "./TraceSourceMap.js"; const leaf = { diff --git a/src/javascript/sourceMaps/SourceMapCodecProcess.ts b/src/javascript/sourceMaps/SourceMapCodecProcess.ts index 382a7bc2e1..2d3ff9a994 100644 --- a/src/javascript/sourceMaps/SourceMapCodecProcess.ts +++ b/src/javascript/sourceMaps/SourceMapCodecProcess.ts @@ -9,7 +9,7 @@ import { isSourceMapFailure, SOURCE_MAP_FORMAT, sourceMapLimitFailure, -} from "./SourceMapFormat.js"; +} from "../../domain/sourceMapFormat.js"; import { malformedInput } from "../../domain/parseFailure.js"; import { sourceMapCodecInputSchema, diff --git a/src/javascript/sourceMaps/TraceSourceMap.test.ts b/src/javascript/sourceMaps/TraceSourceMap.test.ts index bf7392cfd6..c9faadf905 100644 --- a/src/javascript/sourceMaps/TraceSourceMap.test.ts +++ b/src/javascript/sourceMaps/TraceSourceMap.test.ts @@ -5,7 +5,7 @@ import { traceSourceMap } from "./TraceSourceMap.js"; import { inspectSourceMap, isSourceMapSectionOverlap, -} from "./SourceMapFormat.js"; +} from "../../domain/sourceMapFormat.js"; import { ParseFailureError } from "../../domain/parseFailure.js"; const url = "https://app.test/maps/app.js.map?v=2#map"; diff --git a/src/javascript/sourceMaps/TraceSourceMap.ts b/src/javascript/sourceMaps/TraceSourceMap.ts index 7f8226e376..b5d1bc296e 100644 --- a/src/javascript/sourceMaps/TraceSourceMap.ts +++ b/src/javascript/sourceMaps/TraceSourceMap.ts @@ -28,7 +28,7 @@ import { SOURCE_MAP_FORMAT, sourceMapLimitFailure, type SourceMapSourceDeclaration, -} from "./SourceMapFormat.js"; +} from "../../domain/sourceMapFormat.js"; import { decodeValidatedSourceMapLeaves } from "./DecodedSourceMap.js"; /** Decode with the pinned upstream codec; preserve every equal-position candidate. */