Upgrade typespec http runtime version to v0.1.0 for unbranded client (#…

…2947) * upgrade typespec http runtime version * update * fix ci * format * fix ci * update --------- Co-authored-by: Mary Gao <[email protected]>
Azure · Dec 17, 2024 · 9e1b744 · 9e1b744
1 parent b80c904
commit 9e1b744
Show file tree

Hide file tree

Showing 10 changed files with 31 additions and 39 deletions.
diff --git a/common/config/rush/pnpm-lock.yaml b/common/config/rush/pnpm-lock.yaml
diff --git a/packages/rlc-common/src/buildClient.ts b/packages/rlc-common/src/buildClient.ts
@@ -339,10 +339,17 @@ export function getClientFactoryBody(
         `\${${urlParameter.name}}`
       );
     });
-
-    endpointUrl = `options.endpoint ?? options.baseUrl ?? \`${parsedEndpoint}\``;
+    if (model.options.flavor !== "azure") {
+      endpointUrl = `options.endpoint ?? \`${parsedEndpoint}\``;
+    } else {
+      endpointUrl = `options.endpoint ?? options.baseUrl ?? \`${parsedEndpoint}\``;
+    }
   } else {
-    endpointUrl = `options.endpoint ?? options.baseUrl ?? "${endpoint}"`;
+    if (model.options.flavor !== "azure") {
+      endpointUrl = `options.endpoint ??"${endpoint}"`;
+    } else {
+      endpointUrl = `options.endpoint ?? options.baseUrl ?? "${endpoint}"`;
+    }
   }
 
   if (!model.options.isModularLibrary && !clientPackageName.endsWith("-rest")) {

diff --git a/packages/rlc-common/src/helpers/importsUtil.ts b/packages/rlc-common/src/helpers/importsUtil.ts
@@ -55,7 +55,7 @@ export function buildRuntimeImports(flavor?: PackageFlavor): Imports {
       commonFallback: {
         type: "commonFallback",
         specifier: "@typespec/ts-http-runtime",
-        version: "1.0.0-alpha.20240314.2"
+        version: "0.1.0"
       }
     } as Imports;
   }

diff --git a/packages/rlc-common/src/metadata/packageJson/buildFlavorlessPackage.ts b/packages/rlc-common/src/metadata/packageJson/buildFlavorlessPackage.ts
@@ -24,7 +24,7 @@ export function buildFlavorlessPackage(config: PackageCommonInfoConfig) {
     },
     dependencies: {
       ...commonPackageDependencies,
-      "@typespec/ts-http-runtime": "1.0.0-alpha.20240314.2"
+      "@typespec/ts-http-runtime": "0.1.0"
     }
   };
 

diff --git a/packages/rlc-common/test/helpers/importsUtil.spec.ts b/packages/rlc-common/test/helpers/importsUtil.spec.ts
@@ -21,7 +21,7 @@ describe("#buildRuntimeImports", () => {
     expect(imports.commonFallback).to.deep.equal({
       type: "commonFallback",
       specifier: "@typespec/ts-http-runtime",
-      version: "1.0.0-alpha.20240314.2"
+      version: "0.1.0"
     });
     expect(imports.restClient).to.be.undefined;
   });

diff --git a/packages/typespec-test/test/openai_non_branded/generated/typespec-ts/package.json b/packages/typespec-test/test/openai_non_branded/generated/typespec-ts/package.json
@@ -56,7 +56,7 @@
   },
   "dependencies": {
     "tslib": "^2.6.2",
-    "@typespec/ts-http-runtime": "1.0.0-alpha.20240314.2"
+    "@typespec/ts-http-runtime": "0.1.0"
   },
   "exports": {
     "./package.json": "./package.json",

diff --git a/...ages/typespec-test/test/openai_non_branded/generated/typespec-ts/src/api/openAIContext.ts b/...ages/typespec-test/test/openai_non_branded/generated/typespec-ts/src/api/openAIContext.ts
@@ -19,8 +19,7 @@ export function createOpenAI(
   credential: KeyCredential,
   options: OpenAIClientOptionalParams = {},
 ): OpenAIContext {
-  const endpointUrl =
-    options.endpoint ?? options.baseUrl ?? `https://api.openai.com/v1`;
+  const endpointUrl = options.endpoint ?? `https://api.openai.com/v1`;
   const prefixFromOptions = options?.userAgentOptions?.userAgentPrefix;
   const userAgentInfo = `azsdk-js-openai-non-branded/1.0.0-beta.1`;
   const userAgentPrefix = prefixFromOptions

diff --git a/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/package.json b/packages/typespec-test/test/todo_non_branded/generated/typespec-ts/package.json
@@ -47,7 +47,7 @@
   },
   "dependencies": {
     "tslib": "^2.6.2",
-    "@typespec/ts-http-runtime": "1.0.0-alpha.20240314.2"
+    "@typespec/ts-http-runtime": "0.1.0"
   },
   "exports": {
     "./package.json": "./package.json",

diff --git a/packages/typespec-ts/package.json b/packages/typespec-ts/package.json
@@ -89,7 +89,7 @@
     "@typespec/http": ">=0.63.0 <1.0.0",
     "@typespec/openapi": ">=0.63.0, <1.0.0",
     "@typespec/rest": ">=0.63.0 <1.0.0",
-    "@typespec/ts-http-runtime": "1.0.0-alpha.20240314.2",
+    "@typespec/ts-http-runtime": "0.1.0",
     "@typespec/versioning": ">=0.63.0 <1.0.0",
     "chai": "^4.3.6",
     "chalk": "^4.0.0",

diff --git a/packages/typespec-ts/src/modular/helpers/clientHelpers.ts b/packages/typespec-ts/src/modular/helpers/clientHelpers.ts
@@ -194,7 +194,13 @@ export function buildGetClientEndpointParam(
       `\${${getClientParameterName(param)}}`
     );
   }
-  const endpointUrl = `const endpointUrl = options.endpoint ?? options.baseUrl ?? \`${parameterizedEndpointUrl}\``;
+  let endpointUrl = "";
+  if (dpgContext.rlcOptions?.flavor === "azure") {
+    endpointUrl = `const endpointUrl = options.endpoint ?? options.baseUrl ?? \`${parameterizedEndpointUrl}\``;
+  } else {
+    // unbranded does not have the deprecated baseUrl parameter
+    endpointUrl = `const endpointUrl = options.endpoint ?? \`${parameterizedEndpointUrl}\``;
+  }
   context.addStatements(endpointUrl);
   return "endpointUrl";
 }