Back merge autorest 0.42.1 hotfix into main (Azure#842)

allenjzhang · May 15, 2024 · 46a27cc · 46a27cc
1 parent 00fb10e
commit 46a27cc
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 3 deletions.
diff --git a/packages/typespec-autorest/CHANGELOG.md b/packages/typespec-autorest/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log - @azure-tools/typespec-autorest
 
+## 0.42.1
+
+### Bug Fixes
+
+- [#839](https://github.com/Azure/typespec-azure/pull/839) Do not omit unreferenced non version enum when `omit-unreachable-types` is not set to true
+
+
 ## 0.42.0
 
 ### Bug Fixes

diff --git a/packages/typespec-autorest/package.json b/packages/typespec-autorest/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-autorest",
-  "version": "0.42.0",
+  "version": "0.42.1",
   "author": "Microsoft Corporation",
   "description": "TypeSpec library for emitting openapi from the TypeSpec REST protocol binding",
   "homepage": "https://azure.github.io/typespec-azure",

diff --git a/packages/typespec-autorest/src/openapi.ts b/packages/typespec-autorest/src/openapi.ts
@@ -1262,8 +1262,8 @@ export async function getOpenAPIForService(
     }
 
     function isVersionEnum(program: Program, enumObj: Enum): boolean {
-      const versions = getVersionsForEnum(program, enumObj);
-      if (versions !== undefined && versions.length > 0) {
+      const [_, map] = getVersionsForEnum(program, enumObj);
+      if (map !== undefined && map.getVersions()[0].enumMember.enum === enumObj) {
         return true;
       }
       return false;

diff --git a/packages/typespec-autorest/test/options.test.ts b/packages/typespec-autorest/test/options.test.ts
@@ -245,6 +245,19 @@ op test(): void;
       });
       deepStrictEqual(Object.keys(output.definitions!), ["NotReferenced", "Versions"]);
     });
+
+    it("doesn't omit other enums", async () => {
+      const output = await openapiWithOptions(
+        `@service
+        @versioned(Versions)
+        namespace My {
+          enum Versions {v1, v2}
+          enum NotReferenced {a, b}
+        }`,
+        {}
+      );
+      deepStrictEqual(Object.keys(output.definitions!), ["NotReferenced"]);
+    });
   });
 
   describe("include-x-typespec-name", () => {