@azure-tools/typespec-ts 0.57.1-dev.5 → 0.57.1-dev.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-ts",
-  "version": "0.57.1-dev.5",
+  "version": "0.57.1-dev.7",
   "description": "A TypeSpec emitter for TypeScript",
   "main": "dist/src/index.js",
   "type": "module",
@@ -20,7 +20,7 @@
     "@azure-rest/core-client": "^2.8.0",
     "@azure-tools/azure-http-specs": "^0.1.0-alpha.45 || >= 0.1.0-alpha.46-dev.4",
     "@azure-tools/typespec-autorest": "^0.72.0 || >= 0.73.0-dev.1",
-    "@azure-tools/typespec-azure-core": "^0.72.0 || >= 0.73.0-dev.1",
+    "@azure-tools/typespec-azure-core": "^0.72.0 || >= 0.73.0-dev.2",
     "@azure-tools/typespec-azure-resource-manager": "^0.72.0 || >= 0.73.0-dev.2",
     "@azure-tools/typespec-client-generator-core": "^0.72.1 || >= 0.73.0-dev.6",
     "@azure/abort-controller": "^2.2.0",
@@ -40,25 +40,25 @@
     "@types/pluralize": "^0.0.33",
     "yaml": "^2.9.0",
     "@azure-tools/spector-runner": "^0.1.0",
+    "@typespec/http-specs": "^0.1.0-alpha.43",
     "@typespec/spector": "^0.1.0-alpha.29",
     "@typespec/tspd": "^0.77.1",
     "@typespec/compiler": "^1.16.0",
     "@typespec/spec-api": "^0.1.0-alpha.17",
-    "@typespec/http-specs": "^0.1.0-alpha.43",
+    "@typespec/http": "^1.16.0",
     "@typespec/openapi": "^1.16.0",
     "@typespec/rest": "^0.86.0",
     "@typespec/versioning": "^0.86.0",
-    "@typespec/xml": "^0.86.0",
-    "@typespec/http": "^1.16.0"
+    "@typespec/xml": "^0.86.0"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": "^0.72.0 || >= 0.73.0-dev.1",
+    "@azure-tools/typespec-azure-core": "^0.72.0 || >= 0.73.0-dev.2",
     "@azure-tools/typespec-client-generator-core": "^0.72.1 || >= 0.73.0-dev.6",
     "@typespec/compiler": "^1.16.0",
     "@typespec/http": "^1.16.0",
-    "@typespec/rest": "^0.86.0",
+    "@typespec/versioning": "^0.86.0",
     "@typespec/xml": "^0.86.0",
-    "@typespec/versioning": "^0.86.0"
+    "@typespec/rest": "^0.86.0"
   },
   "dependencies": {
     "fast-xml-parser": "^5.11.0",

package/src/modular/helpers/operation-helpers.ts

@@ -985,22 +985,21 @@ export function getOperationFunction(
       responseHeaders.length > 0
         ? buildHeaderOnlyResponseType(context, responseHeaders)
         : "Record<string, unknown>";
+    const emptyBodyType = hasResponseBody && response.optional ? "void" : "undefined";
+    const emptyResponseType =
+      responseHeaders.length > 0
+        ? `${headersType} & ${storageCompatInfoRef}<${emptyBodyType}, ${headersType}>`
+        : `${storageCompatInfoRef}<${emptyBodyType}, ${headersType}>`;
     if (!hasResponseBody) {
-      if (responseHeaders.length > 0) {
-        // Void with headers — headers at top level + StorageCompatResponseInfo
-        finalReturnType = `${headersType} & ${storageCompatInfoRef}<undefined, ${headersType}>`;
-      } else {
-        // Void without headers — just StorageCompatResponseInfo
-        finalReturnType = `${storageCompatInfoRef}<undefined, ${headersType}>`;
-      }
+      finalReturnType = emptyResponseType;
     } else {
-      if (responseHeaders.length > 0) {
-        // Body with headers — headers + body + StorageCompatResponseInfo at top level
-        finalReturnType = `${headersType} & ${bodyType} & ${storageCompatInfoRef}<${bodyType}, ${headersType}>`;
-      } else {
-        // Body without headers — body + StorageCompatResponseInfo
-        finalReturnType = `${bodyType} & ${storageCompatInfoRef}<${bodyType}, ${headersType}>`;
-      }
+      const bodyResponseType =
+        responseHeaders.length > 0
+          ? `${headersType} & ${bodyType} & ${storageCompatInfoRef}<${bodyType}, ${headersType}>`
+          : `${bodyType} & ${storageCompatInfoRef}<${bodyType}, ${headersType}>`;
+      finalReturnType = response.optional
+        ? `${bodyResponseType} | ${emptyResponseType}`
+        : bodyResponseType;
     }
   }