[core-client] wrap response body for more mapper types (Azure#15005)

This PR add more mapper types that are consider primitive thus require wrapping.

Author: jeremymeng

sdk/core/core-client/CHANGELOG.md

@@ -3,6 +3,7 @@
 ## 1.1.1 (Unreleased)
 
 - Expose `allowInsecureConnection` in `ServiceClientOptions` and `OperationRequestOptions` to allow operation requests to HTTP endpoints
+- Consider more mapper types as primitive thus requires wrapping
 
 ## 1.1.0 (2021-03-30)
 

sdk/core/core-client/src/utils.ts

@@ -7,21 +7,25 @@ import { CompositeMapper, FullOperationResponse, OperationResponseMap } from "./
  * The union of all possible types for a primitive response body.
  * @internal
  */
-export type BodyPrimitive = number | string | boolean | undefined | null;
+export type BodyPrimitive = number | string | boolean | Date | Uint8Array | undefined | null;
 
 /**
  * A type guard for a primitive response body.
  * @param value - Value to test
  *
  * @internal
  */
-export function isPrimitiveBody(value: unknown): value is BodyPrimitive {
+export function isPrimitiveBody(value: unknown, mapperTypeName?: string): value is BodyPrimitive {
   return (
-    typeof value === "string" ||
-    typeof value === "number" ||
-    typeof value === "boolean" ||
-    value === undefined ||
-    value === null
+    mapperTypeName !== "Composite" &&
+    mapperTypeName !== "Dictionary" &&
+    (typeof value === "string" ||
+      typeof value === "number" ||
+      typeof value === "boolean" ||
+      mapperTypeName?.match(/^(Date|DateTime|DateTimeRfc1123|UnixTime|ByteArray|Base64Url)$/i) !==
+        null ||
+      value === undefined ||
+      value === null)
   );
 }
 
@@ -173,9 +177,6 @@ export function flattenResponse(
     body: fullResponse.parsedBody,
     headers: parsedHeaders,
     hasNullableType: isNullable,
-    shouldWrapBody:
-      expectedBodyTypeName !== "Composite" &&
-      expectedBodyTypeName !== "Dictionary" &&
-      isPrimitiveBody(fullResponse.parsedBody)
+    shouldWrapBody: isPrimitiveBody(fullResponse.parsedBody, expectedBodyTypeName)
   });
 }

sdk/core/core-client/test/serviceClient.spec.ts

@@ -1165,6 +1165,35 @@ describe("ServiceClient", function() {
       operationSpec
     );
   });
+
+  it("should wrap body when bodyWrapper is specified", async function() {
+    const operationSpec: OperationSpec = {
+      path: "/datetime/invalid",
+      httpMethod: "GET",
+      responses: {
+        200: {
+          bodyMapper: { type: { name: "DateTime" } }
+        }
+      },
+      baseUrl: "http://example.com",
+      serializer: createSerializer()
+    };
+
+    const client = new ServiceClient({
+      httpClient: {
+        sendRequest: (req) => {
+          return Promise.resolve({
+            request: req,
+            status: 200,
+            headers: createHttpHeaders(),
+            bodyAsText: `"201O-18-90D00:89:56.9AX"`
+          });
+        }
+      }
+    });
+    const response = await client.sendOperationRequest<{ body: Date }>({}, operationSpec);
+    assert.ok(response.body);
+  });
 });
 
 async function testSendOperationRequest(