diff --git a/docs/maven-gradle-metadata.md b/docs/maven-gradle-metadata.md index ae18497e27..5445fa973b 100644 --- a/docs/maven-gradle-metadata.md +++ b/docs/maven-gradle-metadata.md @@ -67,7 +67,9 @@ Gradle's `+` prefix (`1.+`) or a `latest.` selector For Gradle module metadata, `gradle` records `format_version`, `created_by_gradle`, and each variant's name, `org.gradle.category`, `org.gradle.usage`, `available-at` coordinates as spelled, and declared -dependency and constraint counts. Variant dependencies are `origin` +dependency and constraint counts. Nonempty variant names retain their exact +spelling and identify their dependency and constraint rows. Duplicate names +fail with `invalid_format`. Variant dependencies are `origin` `variant-dependencies`; `dependencyConstraints` are `origin` `variant-constraints`. Rich versions keep `requires`, `prefers`, `strictly`, and `rejects`. A variant whose category is `platform` or `enforced-platform` diff --git a/src/java/MavenGradleMetadataParser.ts b/src/java/MavenGradleMetadataParser.ts index 0a275a6558..7924e7a582 100644 --- a/src/java/MavenGradleMetadataParser.ts +++ b/src/java/MavenGradleMetadataParser.ts @@ -557,8 +557,25 @@ const parseGradle = ( const repeatedVariantNames = new Budget( MAVEN_GRADLE_METADATA_REPEATED_VARIANT_NAME_CHARS, ); - for (const variant of variants) { - const name = textOf(variant.name); + const variantNameIndices = new Map(); + for (const [index, variant] of variants.entries()) { + const declaredName = variant.name; + if (declaredName !== undefined && typeof declaredName !== "string") + throw malformedInput( + MAVEN_GRADLE_METADATA_FORMAT, + `Gradle module metadata variant.name at index ${String(index)} is not a string.`, + ); + const name = + declaredName === undefined || declaredName === "" ? null : declaredName; + if (name !== null) { + const previous = variantNameIndices.get(name); + if (previous !== undefined) + throw malformedInput( + MAVEN_GRADLE_METADATA_FORMAT, + `Gradle module metadata declares a duplicate variant name at indices ${String(previous)} and ${String(index)}.`, + ); + variantNameIndices.set(name, index); + } const attributes = gradleObject(variant.attributes, "variant.attributes"); const category = textOf(attributes?.["org.gradle.category"]); const usage = textOf(attributes?.["org.gradle.usage"]); diff --git a/tests/boundary/filesystem/mavenGradleMetadata.test.ts b/tests/boundary/filesystem/mavenGradleMetadata.test.ts index 78a802bba7..f27ec69150 100644 --- a/tests/boundary/filesystem/mavenGradleMetadata.test.ts +++ b/tests/boundary/filesystem/mavenGradleMetadata.test.ts @@ -2,6 +2,7 @@ import { writeFile } from "node:fs/promises"; import { join } from "node:path"; import { describe, expect, it } from "vitest"; import { createMavenGradleMetadataService } from "../../../src/composition/mavenGradleMetadata.js"; +import { mavenGradleMetadataSchema } from "../../../src/domain/java/mavenGradleMetadata.js"; import { mavenPomFixture } from "../../../src/java/MavenGradleMetadata.fixture.js"; import { createTestTempDirectory } from "../../fixtures/temporaryDirectory.js"; @@ -58,6 +59,79 @@ describe("Maven POM and Gradle module metadata stable filesystem boundary", () = } }); + it("uses exact Gradle variant names to identify their dependency rows", async () => { + const root = await createTestTempDirectory("rea-gradle-variant-identity-"); + const path = join(root, "demo.module"); + const service = createMavenGradleMetadataService(); + const inspect = async (names: readonly unknown[]) => { + const variants = names.map((name, index) => ({ + name, + dependencies: [{ group: "example", module: `dep-${String(index)}` }], + dependencyConstraints: [{ group: "example", module: "shared" }], + })); + await writeFile(path, JSON.stringify({ formatVersion: "1.1", variants })); + return service.inspect({ path }); + }; + try { + const whitespaceOnlyName = " \t "; + const distinct = await inspect([ + "runtime", + " runtime ", + "", + undefined, + whitespaceOnlyName, + "", + undefined, + ]); + if (!distinct.ok) throw distinct.error; + const report = mavenGradleMetadataSchema.parse( + distinct.value.normalized_result, + ); + const expectedNames = [ + "runtime", + " runtime ", + null, + null, + whitespaceOnlyName, + null, + null, + ]; + expect(report.gradle?.variants.map((row) => row.name)).toEqual( + expectedNames, + ); + expect(report.dependencies.map((row) => row.variant)).toEqual( + expectedNames, + ); + expect(report.dependency_management.map((row) => row.variant)).toEqual( + expectedNames, + ); + expect(await inspect(["runtime", "runtime"])).toMatchObject({ + ok: false, + error: { + issues: [ + { + reason: "invalid_format", + message: expect.stringContaining("duplicate variant name"), + }, + ], + }, + }); + expect(await inspect([false])).toMatchObject({ + ok: false, + error: { + issues: [ + { + reason: "invalid_format", + message: expect.stringContaining("variant.name"), + }, + ], + }, + }); + } finally { + await service.close(); + } + }); + it("returns typed resource and cancellation failures", async () => { const root = await createTestTempDirectory("rea-maven-gradle-budget-"); const path = join(root, "pom.xml");