@typespec/http-specs 0.1.0-alpha.9-dev.5 → 0.1.0-dev.0

package/specs/encode/bytes/main.tsp

@@ -59,10 +59,7 @@ namespace Query {
     value=dGVzdA, dGVzdA
     """)
   op base64urlArray(
-    #suppress "deprecated" "Deprecated in next release"
-    @query({
-      format: "csv",
-    })
+    @query
     value: base64urlBytes[],
   ): NoContentResponse;
 }
@@ -216,9 +213,7 @@ namespace Header {
     value=dGVzdA,dGVzdA
     """)
   op base64urlArray(
-    @header({
-      format: "csv",
-    })
+    @header
     value: base64urlBytes[],
   ): NoContentResponse;
 }
@@ -228,9 +223,8 @@ namespace RequestBody {
   @route("/default")
   @scenario
   @scenarioDoc("""
-    Test default encode (base64) for bytes in a json body.
-    Expected body:
-    "dGVzdA==" (base64 encode of test, in JSON string)
+    When content type is not defined and body is `bytes` the payload is a binary stream.
+    Stream should match packages/http-specs/assets/image.png file.
     """)
   @post
   op default(
@@ -241,8 +235,8 @@ namespace RequestBody {
   @route("/octet-stream")
   @scenario
   @scenarioDoc("""
-    When content type is application/octet-stream and body is `bytes` the payload is a binary file.
-    File should match packages/cadl-ranch-specs/assets/image.png
+    When content type is application/octet-stream and body is `bytes` the payload is a binary stream.
+    Stream should match packages/http-specs/assets/image.png file.
     """)
   @post
   op octetStream(
@@ -257,7 +251,7 @@ namespace RequestBody {
   @scenario
   @scenarioDoc("""
     When content type is a custom type(image/png here) and body is `bytes` the payload is a binary file.
-    File should match packages/cadl-ranch-specs/assets/image.png
+    File should match packages/http-specs/assets/image.png.
     """)
   @post
   op customContentType(
@@ -277,6 +271,9 @@ namespace RequestBody {
     """)
   @post
   op base64(
+    @header
+    contentType: "application/json",
+
     @body
     @encode(BytesKnownEncoding.base64)
     value: bytes,
@@ -291,6 +288,9 @@ namespace RequestBody {
     """)
   @post
   op base64url(
+    @header
+    contentType: "application/json",
+
     @body
     @encode(BytesKnownEncoding.base64url)
     value: bytes,
@@ -302,9 +302,8 @@ namespace ResponseBody {
   @route("/default")
   @scenario
   @scenarioDoc("""
-    Test default encode (base64) for bytes in a json body.
-    Expected body:
-    "dGVzdA==" (base64 encode of test, in JSON string)
+    When content type is not defined and body is `bytes` the payload is a binary stream.
+    Stream should match packages/http-specs/assets/image.png file.
     """)
   op default(): {
     @body
@@ -314,8 +313,8 @@ namespace ResponseBody {
   @route("/octet-stream")
   @scenario
   @scenarioDoc("""
-    When content type is application/octet-stream and body is `bytes` the payload is a binary file.
-    File should match packages/cadl-ranch-specs/assets/image.png
+    When content type is application/octet-stream and body is `bytes` the payload is a binary stream.
+    Stream should match packages/http-specs/assets/image.png file.
     """)
   op octetStream(): {
     @header
@@ -329,7 +328,7 @@ namespace ResponseBody {
   @scenario
   @scenarioDoc("""
     When content type is a custom type(image/png here) and body is `bytes` the payload is a binary file.
-    File should match packages/cadl-ranch-specs/assets/image.png
+    File should match packages/http-specs/assets/image.png
     """)
   op customContentType(): {
     @header
@@ -347,6 +346,9 @@ namespace ResponseBody {
     "dGVzdA==" (base64 encode of test, in JSON string)
     """)
   op base64(): {
+    @header
+    contentType: "application/json";
+
     @body
     @encode(BytesKnownEncoding.base64)
     value: bytes;
@@ -359,5 +361,12 @@ namespace ResponseBody {
     Expected body:
     "dGVzdA" (base64url encode of test, in JSON string)
     """)
-  op base64url(): base64urlBytes;
+  op base64url(): {
+    @header
+    contentType: "application/json";
+
+    @body
+    @encode(BytesKnownEncoding.base64url)
+    body: base64urlBytes;
+  };
 }

package/specs/encode/bytes/mockapi.ts

@@ -25,7 +25,7 @@ function createQueryServerTests(
     uri,
     method: "get",
     request: {
-      params: data,
+      query: data,
     },
     response: {
       status: 204,
@@ -73,7 +73,7 @@ function createPropertyServerTests(uri: string, data: any, value: any) {
     uri,
     method: "post",
     request: {
-      body: data,
+      body: json(data),
     },
     response: {
       status: 200,
@@ -154,23 +154,23 @@ Scenarios.Encode_Bytes_Header_base64urlArray = createHeaderServerTests(
 function createRequestBodyServerTests(
   uri: string,
   data: any,
-  headersData: any,
-  value: any,
   contentType: string = "application/json",
 ) {
   return passOnSuccess({
     uri,
     method: "post",
     request: {
-      body: data,
-      headers: headersData,
+      body: {
+        contentType: contentType,
+        rawContent: data,
+      },
     },
     response: {
       status: 204,
     },
     handler(req: MockRequest) {
       req.expect.containsHeader("content-type", contentType);
-      req.expect.rawBodyEquals(value);
+      req.expect.rawBodyEquals(data);
       return {
         status: 204,
       };
@@ -180,45 +180,26 @@ function createRequestBodyServerTests(
 }
 Scenarios.Encode_Bytes_RequestBody_default = createRequestBodyServerTests(
   "/encode/bytes/body/request/default",
-  '"dGVzdA=="',
-  {
-    "Content-Type": "application/json",
-  },
-  '"dGVzdA=="',
+  pngFile,
+  "application/octet-stream",
 );
 Scenarios.Encode_Bytes_RequestBody_base64 = createRequestBodyServerTests(
   "/encode/bytes/body/request/base64",
   '"dGVzdA=="',
-  {
-    "Content-Type": "application/json",
-  },
-  '"dGVzdA=="',
 );
 Scenarios.Encode_Bytes_RequestBody_base64url = createRequestBodyServerTests(
   "/encode/bytes/body/request/base64url",
   '"dGVzdA"',
-  {
-    "Content-Type": "application/json",
-  },
-  '"dGVzdA"',
 );
 
 Scenarios.Encode_Bytes_RequestBody_customContentType = createRequestBodyServerTests(
   "/encode/bytes/body/request/custom-content-type",
   pngFile,
-  {
-    "Content-Type": "image/png",
-  },
-  pngFile,
   "image/png",
 );
 Scenarios.Encode_Bytes_RequestBody_octetStream = createRequestBodyServerTests(
   "/encode/bytes/body/request/octet-stream",
   pngFile,
-  {
-    "Content-Type": "application/octet-stream",
-  },
-  pngFile,
   "application/octet-stream",
 );
 function createResponseBodyServerTests(
@@ -255,11 +236,12 @@ function createResponseBodyServerTests(
 }
 Scenarios.Encode_Bytes_ResponseBody_default = createResponseBodyServerTests(
   "/encode/bytes/body/response/default",
-  JSON.stringify("dGVzdA=="),
+  pngFile,
   {
-    "Content-Type": "application/json",
+    "Content-Type": "application/octet-stream",
   },
-  JSON.stringify("dGVzdA=="),
+  pngFile,
+  "application/octet-stream",
 );
 Scenarios.Encode_Bytes_ResponseBody_base64 = createResponseBodyServerTests(
   "/encode/bytes/body/response/base64",

package/specs/encode/datetime/main.tsp

@@ -72,10 +72,7 @@ namespace Query {
     value=1686566864, 1686734256
     """)
   op unixTimestampArray(
-    #suppress "deprecated" "Deprecated in next release"
-    @query({
-      format: "csv",
-    })
+    @query
     value: unixTimestampDatetime[],
   ): NoContentResponse;
 }
@@ -269,9 +266,7 @@ namespace Header {
     value=1686566864,1686734256
     """)
   op unixTimestampArray(
-    @header({
-      format: "csv",
-    })
+    @header
     value: unixTimestampDatetime[],
   ): NoContentResponse;
 }

package/specs/encode/datetime/mockapi.ts

@@ -21,7 +21,7 @@ function createQueryServerTests(
     uri,
     method: "get",
     request: {
-      params: paramData,
+      query: paramData,
     },
     response: {
       status: 204,
@@ -93,7 +93,7 @@ function createPropertyServerTests(
     uri,
     method: "post",
     request: {
-      body: data,
+      body: json(data),
     },
     response: {
       status: 200,