Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix when rendering version enum only include current member and mark it modelAsString: true #923

Merged
merged 3 commits into from
May 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions .chronus/changes/fix-emit-api-version-2024-4-25-9-53-10.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
---
changeKind: fix
packages:
- "@azure-tools/typespec-autorest"
---

When emitting version enum only include current version and mark with `modelAsString: true`
Original file line number Diff line number Diff line change
Expand Up @@ -121,12 +121,17 @@
"required": true,
"type": "string",
"enum": [
"v1",
"v2"
"v1"
],
"x-ms-enum": {
"name": "Versions",
"modelAsString": false
"modelAsString": true,
"values": [
{
"name": "v1",
"value": "v1"
}
]
},
"x-ms-parameter-location": "method",
"x-ms-client-name": "apiVersion"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -149,12 +149,17 @@
"required": true,
"type": "string",
"enum": [
"v1",
"v2"
],
"x-ms-enum": {
"name": "Versions",
"modelAsString": false
"modelAsString": true,
"values": [
{
"name": "v2",
"value": "v2"
}
]
},
"x-ms-parameter-location": "method",
"x-ms-client-name": "apiVersion"
Expand Down
44 changes: 38 additions & 6 deletions packages/typespec-autorest/src/openapi.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1259,14 +1259,14 @@ export async function getOpenAPIForService(
}
return false;
}
}

function isVersionEnum(program: Program, enumObj: Enum): boolean {
const [_, map] = getVersionsForEnum(program, enumObj);
if (map !== undefined && map.getVersions()[0].enumMember.enum === enumObj) {
return true;
}
return false;
function isVersionEnum(program: Program, enumObj: Enum): boolean {
const [_, map] = getVersionsForEnum(program, enumObj);
if (map !== undefined && map.getVersions()[0].enumMember.enum === enumObj) {
return true;
}
return false;
}

function emitTags() {
Expand Down Expand Up @@ -1322,6 +1322,34 @@ export async function getOpenAPIForService(
return {};
}

/**
* Version enum is special so we we just render the current version with modelAsString: true
*/
function getSchemaForVersionEnum(e: Enum, currentVersion: string): OpenAPI2Schema {
const member = [...e.members.values()].find((x) => (x.value ?? x.name) === currentVersion);
compilerAssert(
member,
`Version enum ${e.name} does not have a member for ${currentVersion}.`,
e
);
return {
type: "string",
description: getDoc(program, e),
enum: [member.value ?? member.name],
"x-ms-enum": {
name: e.name,
modelAsString: true,
values: [
{
name: member.name,
value: member.value ?? member.name,
description: getDoc(program, member),
},
],
},
};
}

function getSchemaForEnum(e: Enum): OpenAPI2Schema {
const values = [];
if (e.members.size === 0) {
Expand All @@ -1338,6 +1366,10 @@ export async function getOpenAPIForService(
}
}

// If we are rendering a specific version and trying to render the version enum we should treat it specially to only include the current version.
if (isVersionEnum(program, e) && context.version) {
return getSchemaForVersionEnum(e, context.version);
}
const schema: OpenAPI2Schema = { type, description: getDoc(program, e) };
if (values.length > 0) {
schema.enum = values;
Expand Down
60 changes: 59 additions & 1 deletion packages/typespec-autorest/test/versioning.test.ts
Original file line number Diff line number Diff line change
@@ -1,8 +1,66 @@
import { deepStrictEqual, strictEqual } from "assert";
import { describe, it } from "vitest";
import { describe, expect, it } from "vitest";
import { OpenAPI2Document } from "../src/openapi2-document.js";
import { openApiFor } from "./test-host.js";

describe("typespec-autorest: versioning", () => {
it("if version enum is referenced only include current member and mark it with modelAsString: true", async () => {
const { v1, v2 } = (await openApiFor(
`
@service
@versioned(Versions)
@server(
"https://example.com/{apiVersion}",
"Doc",
{
@path apiVersion: Versions,
}
)
namespace MyService {
enum Versions {
v1,
v2,
}
}
`,
["v1", "v2"]
)) as { v1: OpenAPI2Document; v2: OpenAPI2Document };
expect(v1["x-ms-parameterized-host"]?.parameters?.[0]).toEqual({
enum: ["v1"],
in: "path",
name: "apiVersion",
required: true,
type: "string",
"x-ms-enum": {
modelAsString: true,
name: "Versions",
values: [
{
name: "v1",
value: "v1",
},
],
},
});
expect(v2["x-ms-parameterized-host"]?.parameters?.[0]).toEqual({
enum: ["v2"],
in: "path",
name: "apiVersion",
required: true,
type: "string",
"x-ms-enum": {
modelAsString: true,
name: "Versions",
values: [
{
name: "v2",
value: "v2",
},
],
},
});
});

it("works with models", async () => {
const { v1, v2, v3 } = await openApiFor(
`
Expand Down
Loading