@typespec/http-specs 0.1.0-alpha.27-dev.0 → 0.1.0-alpha.27-dev.2

package/specs/encode/duration/main.tsp

@@ -69,6 +69,42 @@ namespace Query {
     input: duration,
   ): NoContentResponse;
 
+  @route("/int32-milliseconds")
+  @scenario
+  @scenarioDoc("""
+    Test int32 milliseconds encode for a duration parameter.
+    Expected query parameter `input=36000`
+    """)
+  op int32Milliseconds(
+    @query
+    @encode(DurationKnownEncoding.milliseconds, int32)
+    input: duration,
+  ): NoContentResponse;
+
+  @route("/float-milliseconds")
+  @scenario
+  @scenarioDoc("""
+    Test float milliseconds encode for a duration parameter.
+    Expected query parameter `input=35625`
+    """)
+  op floatMilliseconds(
+    @query
+    @encode(DurationKnownEncoding.milliseconds, float)
+    input: duration,
+  ): NoContentResponse;
+
+  @route("/float64-milliseconds")
+  @scenario
+  @scenarioDoc("""
+    Test float64 milliseconds encode for a duration parameter.
+    Expected query parameter `input=35625`
+    """)
+  op float64Milliseconds(
+    @query
+    @encode(DurationKnownEncoding.milliseconds, float64)
+    input: duration,
+  ): NoContentResponse;
+
   @encode(DurationKnownEncoding.seconds, int32)
   scalar Int32Duration extends duration;
 
@@ -82,6 +118,20 @@ namespace Query {
     @query
     input: Int32Duration[],
   ): NoContentResponse;
+
+  @encode(DurationKnownEncoding.milliseconds, int32)
+  scalar Int32MillisecondsDuration extends duration;
+
+  @route("/int32-milliseconds-array")
+  @scenario
+  @scenarioDoc("""
+    Test int32 milliseconds encode for a duration array parameter.
+    Expected query parameter `input=36000,47000`
+    """)
+  op int32MillisecondsArray(
+    @query
+    input: Int32MillisecondsDuration[],
+  ): NoContentResponse;
 }
 
 @route("/property")
@@ -110,6 +160,21 @@ namespace Property {
     value: duration;
   }
 
+  model Int32MillisecondsDurationProperty {
+    @encode(DurationKnownEncoding.milliseconds, int32)
+    value: duration;
+  }
+
+  model FloatMillisecondsDurationProperty {
+    @encode(DurationKnownEncoding.milliseconds, float)
+    value: duration;
+  }
+
+  model Float64MillisecondsDurationProperty {
+    @encode(DurationKnownEncoding.milliseconds, float64)
+    value: duration;
+  }
+
   @encode(DurationKnownEncoding.seconds, float32)
   scalar Float32Duration extends duration;
 
@@ -117,6 +182,13 @@ namespace Property {
     value: Float32Duration[];
   }
 
+  @encode(DurationKnownEncoding.milliseconds, float32)
+  scalar Float32MillisecondsDuration extends duration;
+
+  model FloatMillisecondsDurationArrayProperty {
+    value: Float32MillisecondsDuration[];
+  }
+
   @route("/default")
   @scenario
   @scenarioDoc("""
@@ -214,6 +286,69 @@ namespace Property {
     """)
   op float64Seconds(@body body: Float64SecondsDurationProperty): Float64SecondsDurationProperty;
 
+  @route("/int32-milliseconds")
+  @scenario
+  @scenarioDoc("""
+    Test operation with request and response model contains a duration property with int32 milliseconds encode.
+    Expected request body:
+    ```json
+    {
+      "value": 36000
+    }
+    ```
+    Expected response body:
+    ```json
+    {
+      "value": 36000
+    }
+    ```
+    """)
+  op int32Milliseconds(
+    @body body: Int32MillisecondsDurationProperty,
+  ): Int32MillisecondsDurationProperty;
+
+  @route("/float-milliseconds")
+  @scenario
+  @scenarioDoc("""
+    Test operation with request and response model contains a duration property with float milliseconds encode.
+    Expected request body:
+    ```json
+    {
+      "value": 35625
+    }
+    ```
+    Expected response body:
+    ```json
+    {
+      "value": 35625
+    }
+    ```
+    """)
+  op floatMilliseconds(
+    @body body: FloatMillisecondsDurationProperty,
+  ): FloatMillisecondsDurationProperty;
+
+  @route("/float64-milliseconds")
+  @scenario
+  @scenarioDoc("""
+    Test operation with request and response model contains a duration property with float64 milliseconds encode.
+    Expected request body:
+    ```json
+    {
+      "value": 35625
+    }
+    ```
+    Expected response body:
+    ```json
+    {
+      "value": 35625
+    }
+    ```
+    """)
+  op float64Milliseconds(
+    @body body: Float64MillisecondsDurationProperty,
+  ): Float64MillisecondsDurationProperty;
+
   @route("/float-seconds-array")
   @scenario
   @scenarioDoc("""
@@ -234,6 +369,27 @@ namespace Property {
   op floatSecondsArray(
     @body body: FloatSecondsDurationArrayProperty,
   ): FloatSecondsDurationArrayProperty;
+
+  @route("/float-milliseconds-array")
+  @scenario
+  @scenarioDoc("""
+    Test operation with request and response model contains an array property which elements are duration with float milliseconds encode.
+    Expected request body:
+    ```json
+    {
+      "value": [35625, 46750]
+    }
+    ```
+    Expected response body:
+    ```json
+    {
+      "value": [35625, 46750]
+    }
+    ```
+    """)
+  op floatMillisecondsArray(
+    @body body: FloatMillisecondsDurationArrayProperty,
+  ): FloatMillisecondsDurationArrayProperty;
 }
 
 @route("/header")
@@ -310,4 +466,54 @@ namespace Header {
     @encode(DurationKnownEncoding.seconds, float64)
     duration: duration,
   ): NoContentResponse;
+
+  @route("/int32-milliseconds")
+  @scenario
+  @scenarioDoc("""
+    Test int32 milliseconds encode for a duration header.
+    Expected header `duration: 36000`
+    """)
+  op int32Milliseconds(
+    @header
+    @encode(DurationKnownEncoding.milliseconds, int32)
+    duration: duration,
+  ): NoContentResponse;
+
+  @route("/float-milliseconds")
+  @scenario
+  @scenarioDoc("""
+    Test float milliseconds encode for a duration header.
+    Expected header `duration: 35625`
+    """)
+  op floatMilliseconds(
+    @header
+    @encode(DurationKnownEncoding.milliseconds, float)
+    duration: duration,
+  ): NoContentResponse;
+
+  @route("/float64-milliseconds")
+  @scenario
+  @scenarioDoc("""
+    Test float64 milliseconds encode for a duration header.
+    Expected header `duration: 35625`
+    """)
+  op float64Milliseconds(
+    @header
+    @encode(DurationKnownEncoding.milliseconds, float64)
+    duration: duration,
+  ): NoContentResponse;
+
+  @encode(DurationKnownEncoding.milliseconds, int32)
+  scalar Int32MillisecondsDuration extends duration;
+
+  @route("/int32-milliseconds-array")
+  @scenario
+  @scenarioDoc("""
+    Test int32 milliseconds encode for a duration array header.
+    Expected header `duration: [36000,47000]`
+    """)
+  op int32MillisecondsArray(
+    @header
+    duration: Int32MillisecondsDuration[],
+  ): NoContentResponse;
 }

package/specs/encode/duration/mockapi.ts

@@ -65,6 +65,35 @@ Scenarios.Encode_Duration_Property_floatSecondsArray = createBodyServerTests(
   [35.625, 46.75],
 );
 
+Scenarios.Encode_Duration_Property_int32Milliseconds = createBodyServerTests(
+  "/encode/duration/property/int32-milliseconds",
+  {
+    value: 36000,
+  },
+  36000,
+);
+Scenarios.Encode_Duration_Property_floatMilliseconds = createBodyServerTests(
+  "/encode/duration/property/float-milliseconds",
+  {
+    value: 35625,
+  },
+  35625,
+);
+Scenarios.Encode_Duration_Property_float64Milliseconds = createBodyServerTests(
+  "/encode/duration/property/float64-milliseconds",
+  {
+    value: 35625,
+  },
+  35625,
+);
+Scenarios.Encode_Duration_Property_floatMillisecondsArray = createBodyServerTests(
+  "/encode/duration/property/float-milliseconds-array",
+  {
+    value: [35625, 46750],
+  },
+  [35625, 46750],
+);
+
 function createQueryServerTests(
   uri: string,
   paramData: any,
@@ -133,6 +162,36 @@ Scenarios.Encode_Duration_Query_float64Seconds = createQueryServerTests(
   "35.625",
 );
 
+Scenarios.Encode_Duration_Query_int32Milliseconds = createQueryServerTests(
+  "/encode/duration/query/int32-milliseconds",
+  {
+    input: 36000,
+  },
+  "36000",
+);
+Scenarios.Encode_Duration_Query_floatMilliseconds = createQueryServerTests(
+  "/encode/duration/query/float-milliseconds",
+  {
+    input: 35625,
+  },
+  "35625",
+);
+Scenarios.Encode_Duration_Query_float64Milliseconds = createQueryServerTests(
+  "/encode/duration/query/float64-milliseconds",
+  {
+    input: 35625,
+  },
+  "35625",
+);
+Scenarios.Encode_Duration_Query_int32MillisecondsArray = createQueryServerTests(
+  "/encode/duration/query/int32-milliseconds-array",
+  {
+    input: [36000, 47000].join(","),
+  },
+  ["36000", "47000"],
+  "csv",
+);
+
 function createHeaderServerTests(uri: string, headersData: any, value: any) {
   return passOnSuccess({
     uri,
@@ -189,3 +248,32 @@ Scenarios.Encode_Duration_Header_iso8601Array = createHeaderServerTests(
   },
   "P40D,P50D",
 );
+
+Scenarios.Encode_Duration_Header_int32Milliseconds = createHeaderServerTests(
+  "/encode/duration/header/int32-milliseconds",
+  {
+    duration: "36000",
+  },
+  "36000",
+);
+Scenarios.Encode_Duration_Header_floatMilliseconds = createHeaderServerTests(
+  "/encode/duration/header/float-milliseconds",
+  {
+    duration: "35625",
+  },
+  "35625",
+);
+Scenarios.Encode_Duration_Header_float64Milliseconds = createHeaderServerTests(
+  "/encode/duration/header/float64-milliseconds",
+  {
+    duration: "35625",
+  },
+  "35625",
+);
+Scenarios.Encode_Duration_Header_int32MillisecondsArray = createHeaderServerTests(
+  "/encode/duration/header/int32-milliseconds-array",
+  {
+    duration: ["36000", "47000"].join(","),
+  },
+  "36000,47000",
+);

package/specs/payload/pageable/main.tsp

@@ -449,27 +449,68 @@ namespace ServerDrivenPagination {
   }
 }
 
-@scenario
-@scenarioDoc("""
-  Test case for simple pagination without nextlink or continuationToken.
-  
-  Single request:
-  Expected route: /payload/pageable/simple
-  
-  Expected response body:
-  ```json
-  { "pets": [
-      { "id": "1", "name": "dog" },
-      { "id": "2", "name": "cat" },
-      { "id": "3", "name": "bird" },
-      { "id": "4", "name": "fish" }
-    ]
-  }
-  ```
-  """)
-@route("/simple")
-@list
-op listWithoutContinuation(): {
-  @pageItems
-  pets: Pet[];
-};
+@route("/pagesize")
+namespace PageSize {
+  @scenario
+  @scenarioDoc("""
+    Test case for simple pagination without nextlink or continuationToken.
+    
+    Single request:
+    Expected route: /payload/pageable/pagesize/without-continuation
+    
+    Expected response body:
+    ```json
+    { "pets": [
+        { "id": "1", "name": "dog" },
+        { "id": "2", "name": "cat" },
+        { "id": "3", "name": "bird" },
+        { "id": "4", "name": "fish" }
+      ]
+    }
+    ```
+    """)
+  @route("/without-continuation")
+  @list
+  op listWithoutContinuation(): {
+    @pageItems
+    pets: Pet[];
+  };
+
+  @scenario
+  @scenarioDoc("""
+    Test case for pagination with a regular @pageSize parameter.
+    
+    Two requests need to be tested:
+    1. Request with pageSize=2:
+    Expected route: /payload/pageable/pagesize/list?pageSize=2
+    
+    Expected response body:
+    ```json
+    { "pets": [
+        { "id": "1", "name": "dog" },
+        { "id": "2", "name": "cat" }
+      ]
+    }
+    ```
+    
+    2. Request with pageSize=4:
+    Expected route: /payload/pageable/pagesize/list?pageSize=4
+    
+    Expected response body:
+    ```json
+    { "pets": [
+        { "id": "1", "name": "dog" },
+        { "id": "2", "name": "cat" },
+        { "id": "3", "name": "bird" },
+        { "id": "4", "name": "fish" }
+      ]
+    }
+    ```
+    """)
+  @route("/list")
+  @list
+  op listWithPageSize(@pageSize @query pageSize?: int32): {
+    @pageItems
+    pets: Pet[];
+  };
+}

package/specs/payload/pageable/mockapi.ts

@@ -187,9 +187,9 @@ Scenarios.Payload_Pageable_ServerDrivenPagination_ContinuationToken_requestQuery
 Scenarios.Payload_Pageable_ServerDrivenPagination_ContinuationToken_requestHeaderResponseHeader =
   createTests("header", "header");
 
-Scenarios.Payload_Pageable_listWithoutContinuation = passOnSuccess([
+Scenarios.Payload_Pageable_PageSize_listWithoutContinuation = passOnSuccess([
   {
-    uri: "/payload/pageable/simple",
+    uri: "/payload/pageable/pagesize/without-continuation",
     method: "get",
     request: {},
     response: {
@@ -207,6 +207,101 @@ Scenarios.Payload_Pageable_listWithoutContinuation = passOnSuccess([
   },
 ]);
 
+Scenarios.Payload_Pageable_PageSize_listWithPageSize = passOnSuccess([
+  {
+    uri: "/payload/pageable/pagesize/list",
+    method: "get",
+    request: { query: { pageSize: "2" } },
+    response: {
+      status: 200,
+      body: json({
+        pets: [
+          { id: "1", name: "dog" },
+          { id: "2", name: "cat" },
+        ],
+      }),
+    },
+    handler: (req: MockRequest) => {
+      const pageSize = req.query?.pageSize;
+
+      switch (pageSize) {
+        case "2":
+          return {
+            status: 200,
+            body: json({
+              pets: [
+                { id: "1", name: "dog" },
+                { id: "2", name: "cat" },
+              ],
+            }),
+          };
+        case "4":
+          return {
+            status: 200,
+            body: json({
+              pets: [
+                { id: "1", name: "dog" },
+                { id: "2", name: "cat" },
+                { id: "3", name: "bird" },
+                { id: "4", name: "fish" },
+              ],
+            }),
+          };
+        default:
+          throw new ValidationError("Unsupported page size", `"2" | "4"`, pageSize);
+      }
+    },
+    kind: "MockApiDefinition",
+  },
+  {
+    uri: "/payload/pageable/pagesize/list",
+    method: "get",
+    request: { query: { pageSize: "4" } },
+    response: {
+      status: 200,
+      body: json({
+        pets: [
+          { id: "1", name: "dog" },
+          { id: "2", name: "cat" },
+          { id: "3", name: "bird" },
+          { id: "4", name: "fish" },
+        ],
+      }),
+    },
+    handler: (req: MockRequest) => {
+      const pageSize = req.query?.pageSize;
+
+      switch (pageSize) {
+        case "2":
+          return {
+            status: 200,
+            body: json({
+              pets: [
+                { id: "1", name: "dog" },
+                { id: "2", name: "cat" },
+              ],
+            }),
+          };
+        case "4":
+          return {
+            status: 200,
+            body: json({
+              pets: [
+                { id: "1", name: "dog" },
+                { id: "2", name: "cat" },
+                { id: "3", name: "bird" },
+                { id: "4", name: "fish" },
+              ],
+            }),
+          };
+        default:
+          throw new ValidationError("Unsupported page size", `"2" | "4"`, pageSize);
+      }
+    },
+    kind: "MockApiDefinition",
+  },
+]);
+
 Scenarios.Payload_Pageable_ServerDrivenPagination_ContinuationToken_requestQueryNestedResponseBody =
   passOnSuccess([
     {