Fix bytes in json part (#2724)

fix #2701
microsoft · Dec 4, 2023 · 81a3b3d · 81a3b3d
1 parent 360add2
commit 81a3b3d
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/common/changes/@typespec/openapi3/fix-bytes-in-json-part_2023-12-04-20-28.json b/common/changes/@typespec/openapi3/fix-bytes-in-json-part_2023-12-04-20-28.json
@@ -0,0 +1,10 @@
+{
+ "changes": [
+ {
+ "packageName": "@typespec/openapi3",
+ "comment": "",
+ "type": "none"
+ }
+ ],
+ "packageName": "@typespec/openapi3"
+}
diff --git a/packages/openapi3/src/schema-emitter.ts b/packages/openapi3/src/schema-emitter.ts
@@ -318,7 +318,9 @@ export class OpenAPI3SchemaEmitter extends TypeEmitter<
  return { type: "string", format: "binary" };
  }
 
- const refSchema = this.emitter.emitTypeReference(prop.type);
+ const refSchema = this.emitter.emitTypeReference(prop.type, {
+ referenceContext: isMultipart ? { contentType: "application/json" } : {},
+ });
  if (refSchema.kind !== "code") {
  throw new Error("Unexpected non-code result from emit reference");
  }

diff --git a/packages/openapi3/test/multipart.test.ts b/packages/openapi3/test/multipart.test.ts
@@ -87,8 +87,7 @@ describe("typespec-autorest: multipart", () => {
  });
  });
 
- // Known issue https://github.com/microsoft/typespec/issues/2701
- it.skip("bytes inside a json part will be treated as base64 encoded by default(same as for a json body)", async () => {
+ it("bytes inside a json part will be treated as base64 encoded by default(same as for a json body)", async () => {
  const res = await openApiFor(
  `
  op upload(@header contentType: "multipart/form-data", address: {city: string, icon: bytes}): void;

diff --git a/packages/samples/test/output/multipart/@typespec/openapi3/openapi.yaml b/packages/samples/test/output/multipart/@typespec/openapi3/openapi.yaml
@@ -23,7 +23,7 @@ paths:
  $ref: '#/components/schemas/DataMultiPart'
 components:
  schemas:
- AddressMultiPart:
+ Address:
  type: object
  required:
  - city
@@ -46,4 +46,4 @@ components:
  type: string
  format: binary
  address:
- $ref: '#/components/schemas/AddressMultiPart'
+ $ref: '#/components/schemas/Address'