[TCGC] fix multipart lint (#223)

Azure · Feb 6, 2024 · d46b6bf · d46b6bf
1 parent 8b072f4
commit d46b6bf
Show file tree

Hide file tree

Showing 3 changed files with 39 additions and 3 deletions.
diff --git a/.changeset/afraid-trains-yell.md b/.changeset/afraid-trains-yell.md
@@ -0,0 +1,5 @@
+---
+"@azure-tools/typespec-client-generator-core": none
+---
+
+fix linting error for mfd
diff --git a/packages/typespec-client-generator-core/src/types.ts b/packages/typespec-client-generator-core/src/types.ts
@@ -431,9 +431,13 @@ export function getSdkModel(context: SdkContext, type: Model, operation?: Operat
   const httpOperation = operation
     ? ignoreDiagnostics(getHttpOperation(context.program, operation))
     : undefined;
-  const isFormDataType = httpOperation
-    ? Boolean(httpOperation.parameters.body?.contentTypes.includes("multipart/form-data"))
-    : false;
+  const httpBody = httpOperation?.parameters.body;
+  let isFormDataType = false;
+  if (httpBody && httpBody.type.kind === "Model") {
+    const isMultipartOperation = httpBody.contentTypes.some((x) => x.startsWith("multipart/"));
+    isFormDataType =
+      isMultipartOperation && getEffectivePayloadType(context, httpBody.type) === type;
+  }
   if (sdkType) {
     updateModelsMap(context, type, sdkType, operation);
     if (httpOperation && isFormDataType !== sdkType.isFormDataType) {

diff --git a/packages/typespec-client-generator-core/test/types.test.ts b/packages/typespec-client-generator-core/test/types.test.ts
@@ -2119,6 +2119,33 @@ describe("typespec-client-generator-core: types", () => {
         code: "@azure-tools/typespec-client-generator-core/encoding-multipart-bytes",
       });
     });
+
+    it("multipart with reused error model", async function () {
+      await runner.compileWithBuiltInService(
+        `
+        model PictureWrapper {
+          pictures: bytes[];
+        }
+
+        model ErrorResponse {
+          errorCode: string;
+        }
+        
+        @put op multipartOp(@header contentType: "multipart/form-data", @body body: PictureWrapper): void | ErrorResponse;
+        @post op normalOp(): void | ErrorResponse;
+        `
+      );
+      const models = getAllModels(runner.context);
+      strictEqual(models.length, 2);
+
+      const pictureWrapper = models.find((x) => x.name === "PictureWrapper")!;
+      strictEqual(pictureWrapper.kind, "model");
+      strictEqual(pictureWrapper.isFormDataType, true);
+
+      const errorResponse = models.find((x) => x.name === "ErrorResponse")!;
+      strictEqual(errorResponse.kind, "model");
+      strictEqual(errorResponse.isFormDataType, false);
+    });
   });
   describe("SdkTupleType", () => {
     it("model with tupled properties", async function () {