Merge branch 'main' into net-iso

Author: timotheeguerin

.chronus/changes/HEAD-2026-5-29-15-47-55.md

@@ -0,0 +1,7 @@
+---
+changeKind: dependencies
+packages:
+  - "@typespec/http-client-java"
+---
+
+Update http-client-java Node.js dependencies

packages/http-client-java/emitter/src/code-model-builder.ts

@@ -172,6 +172,7 @@ import {
   getFilteredApiVersions,
   getServiceApiVersions,
   isStableApiVersionString,
+  resolveApiVersionOption,
 } from "./versioning-utils.js";
 const { isEqual } = pkg;
 
@@ -698,14 +699,15 @@ export class CodeModelBuilder {
     const versions = getServiceApiVersions(this.program, client);
     if (Array.isArray(versions) && versions.length > 0) {
       // consistent api-versions
-      if (!this.sdkContext.apiVersion || ["all", "latest"].includes(this.sdkContext.apiVersion)) {
+      const apiVersionOption = resolveApiVersionOption(this.sdkContext.apiVersion);
+      if (!apiVersionOption || ["all", "latest"].includes(apiVersionOption)) {
         this.apiVersion = versions[versions.length - 1].value;
       } else {
-        this.apiVersion = versions.find((it) => it.value === this.sdkContext.apiVersion)?.value;
+        this.apiVersion = versions.find((it) => it.value === apiVersionOption)?.value;
         if (!this.apiVersion) {
           reportDiagnostic(this.program, {
             code: "invalid-api-version",
-            format: { apiVersion: this.sdkContext.apiVersion },
+            format: { apiVersion: apiVersionOption },
             target: NoTarget,
           });
         }

packages/http-client-java/emitter/src/versioning-utils.ts

@@ -187,6 +187,30 @@ export function isVersionEarlierThan(version: string, compareTo: string): boolea
   return false;
 }
 
+/**
+ * Resolves the emitter "api-version" option to a single string.
+ *
+ * TCGC supports a per-service api-version map (`Record<string, string>`), but the Java
+ * emitter currently only supports a single api-version, "latest", or "all". A map value
+ * is therefore rejected.
+ *
+ * TODO(xiaofei): support the per-service api-version map in a future PR.
+ *
+ * @param apiVersion the api-version option from TCGC, a string, a per-service map, or undefined
+ * @returns the api-version string, or undefined when not set
+ * @throws if the api-version option is a per-service map
+ */
+export function resolveApiVersionOption(
+  apiVersion: string | Record<string, string> | undefined,
+): string | undefined {
+  if (apiVersion !== undefined && typeof apiVersion !== "string") {
+    throw new Error(
+      "A per-service api-version map is not supported. The 'api-version' option must be a single api-version, 'latest', or 'all'.",
+    );
+  }
+  return apiVersion;
+}
+
 function isSdkClientVersioned(client: SdkClientType<SdkHttpOperation>): boolean {
   // on TCGC, the difference of versioned client and not versioned client is on the existence of "apiVersion" parameter in clientInitialization
   return client.clientInitialization.parameters.some((p) => p.name === "apiVersion");

packages/http-client-java/emitter/test/utils.test.ts

@@ -13,6 +13,7 @@ import {
   isStableApiVersionString,
   isVersionEarlierThan,
   isVersionedByDate,
+  resolveApiVersionOption,
 } from "../src/versioning-utils.js";
 
 function createMockVersion(value: string, index: number): Version {
@@ -60,6 +61,16 @@ describe("versioning-utils", () => {
     expect(isStableApiVersionString("2023-12-01-preview")).toBe(false);
   });
 
+  it("resolveApiVersionOption", () => {
+    expect(resolveApiVersionOption(undefined)).toBe(undefined);
+    expect(resolveApiVersionOption("latest")).toBe("latest");
+    expect(resolveApiVersionOption("all")).toBe("all");
+    expect(resolveApiVersionOption("2024-06-01")).toBe("2024-06-01");
+    expect(() => resolveApiVersionOption({ service: "2024-06-01" })).toThrow(
+      /per-service api-version map is not supported/,
+    );
+  });
+
   it("filterApiVersionsByStability filters preview versions for stable target", () => {
     const versions = [
       createMockVersion("2024-01-01-preview", 0),

packages/http-client-java/generator/http-client-generator-clientcore-test/package.json

@@ -30,7 +30,7 @@
     "@typespec/sse": "0.83.0",
     "@typespec/streams": "0.83.0",
     "@azure-tools/typespec-azure-core": "0.69.0",
-    "@azure-tools/typespec-client-generator-core": "0.69.0",
+    "@azure-tools/typespec-client-generator-core": "0.69.1",
     "@azure-tools/typespec-azure-resource-manager": "0.69.1",
     "@azure-tools/typespec-autorest": "0.69.1"
   },

packages/http-client-java/generator/http-client-generator-test/package.json

@@ -30,7 +30,7 @@
     "@typespec/sse": "0.83.0",
     "@typespec/streams": "0.83.0",
     "@azure-tools/typespec-azure-core": "0.69.0",
-    "@azure-tools/typespec-client-generator-core": "0.69.0",
+    "@azure-tools/typespec-client-generator-core": "0.69.1",
     "@azure-tools/typespec-azure-resource-manager": "0.69.1",
     "@azure-tools/typespec-autorest": "0.69.1"
   },