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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@typespec/http-specs",
   "displayName": "Http Specs",
-  "version": "0.1.0-dev.0",
+  "version": "0.1.0-dev.2",
   "description": "Spec scenarios and mock apis",
   "main": "dist/index.js",
   "type": "module",
@@ -22,27 +22,27 @@
   },
   "homepage": "https://github.com/microsoft/typespec#readme",
   "dependencies": {
-    "@typespec/spec-api": "^0.1.0-alpha.13 || >= 0.1.0-dev.0",
-    "@typespec/spector": "^0.1.0-alpha.24 || >= 0.1.0-dev.0",
-    "deep-equal": "^2.2.0"
+    "@typespec/spec-api": "^0.1.0-alpha.13 || >= 0.1.0-alpha.14-dev.3",
+    "@typespec/spector": "^0.1.0-alpha.24 || >= 0.1.0-dev.3",
+    "deep-equal": "^2.2.3"
   },
   "devDependencies": {
-    "@types/deep-equal": "^1.0.1",
-    "@types/multer": "^2.0.0",
-    "@types/node": "~25.3.0",
-    "@typespec/json-schema": "^1.10.0 || >= 1.11.0-dev.0",
-    "@typespec/openapi": "^1.10.0 || >= 1.11.0-dev.0",
-    "@typespec/openapi3": "^1.10.0 || >= 1.11.0-dev.0",
-    "concurrently": "^9.1.2",
+    "@types/deep-equal": "^1.0.4",
+    "@types/multer": "^2.1.0",
+    "@types/node": "~25.5.0",
+    "@typespec/json-schema": "^1.10.0 || >= 1.11.0-dev.2",
+    "@typespec/openapi": "^1.10.0 || >= 1.11.0-dev.2",
+    "@typespec/openapi3": "^1.10.0 || >= 1.11.0-dev.4",
+    "concurrently": "^9.2.1",
     "rimraf": "~6.1.3",
     "typescript": "~5.9.3"
   },
   "peerDependencies": {
-    "@typespec/compiler": "^1.10.0 || >= 1.11.0-dev.0",
-    "@typespec/http": "^1.10.0 || >= 1.11.0-dev.0",
-    "@typespec/rest": "^0.80.0 || >= 0.81.0-dev.0",
-    "@typespec/versioning": "^0.80.0 || >= 0.81.0-dev.0",
-    "@typespec/xml": "^0.80.0 || >= 0.81.0-dev.0"
+    "@typespec/compiler": "^1.10.0 || >= 1.11.0-dev.6",
+    "@typespec/http": "^1.10.0 || >= 1.11.0-dev.3",
+    "@typespec/rest": "^0.80.0 || >= 0.81.0-dev.2",
+    "@typespec/versioning": "^0.80.0 || >= 0.81.0-dev.2",
+    "@typespec/xml": "^0.80.0 || >= 0.81.0-dev.2"
   },
   "scripts": {
     "watch": "tsc -p ./tsconfig.build.json --watch",
@@ -58,7 +58,7 @@
     "upload-coverage": "tsp-spector upload-coverage --generatorName @typespec/http-specs --generatorVersion 0.1.0-alpha.4 --containerName coverages --generatorMode standard --storageAccountName typespec",
     "validate-mock-apis": "tsp-spector validate-mock-apis ./specs",
     "check-scenario-coverage": "tsp-spector check-coverage ./specs",
-    "validate-client-server": "concurrently \"tsp-spector server start ./specs\" \"pnpm knock\"; tsp-spector server stop",
+    "validate-client-server": "concurrently \"tsp-spector server start ./specs\" \"pnpm knock\"; code=$?; tsp-spector server stop; exit $code",
     "build:smoke": "tsp compile smoke/petstore --warn-as-error --no-emit && tsp compile smoke/todoapp --warn-as-error --no-emit",
     "client": "pnpm knock",
     "knock": "tsp-spector knock ./specs",

package/spec-summary.md

@@ -2509,6 +2509,48 @@ Expected response body:
 }
 ```
 
+### Payload_Pageable_ServerDrivenPagination_AlternateInitialVerb_post
+
+- Endpoint: `post /payload/pageable/server-driven-pagination/link/initial-post`
+
+Test case for initial POST request followed by GET for next pages using link pagination.
+The initial request is a POST with a filter body, and the next page is fetched using a GET request on the next link.
+
+Two requests need to be tested.
+
+1. Initial request (POST):
+   Expected route: /payload/pageable/server-driven-pagination/link/initial-post
+   Expected request body:
+
+```json
+{ "filter": "foo eq bar" }
+```
+
+Expected response body:
+
+```json
+{
+  "pets": [
+    { "id": "1", "name": "dog" },
+    { "id": "2", "name": "cat" }
+  ],
+  "next": "http://[host]:[port]/payload/pageable/server-driven-pagination/link/initial-post/nextPage?token=abc"
+}
+```
+
+2. Next page request (GET):
+   Expected route: /payload/pageable/server-driven-pagination/link/initial-post/nextPage?token=abc
+   Expected response body:
+
+```json
+{
+  "pets": [
+    { "id": "3", "name": "bird" },
+    { "id": "4", "name": "fish" }
+  ]
+}
+```
+
 ### Payload_Pageable_ServerDrivenPagination_ContinuationToken_requestHeaderNestedResponseBody
 
 - Endpoint: `get /payload/pageable/server-driven-pagination/continuationtoken/request-header-nested-response-body`
@@ -3207,6 +3249,90 @@ Expected request body:
 </ModelWithEnum>
 ```
 
+### Payload_Xml_ModelWithNamespaceOnPropertiesValue_get
+
+- Endpoint: `get /payload/xml/modelWithNamespaceOnProperties`
+
+Expected response body:
+
+```xml
+<smp:ModelWithNamespaceOnProperties xmlns:smp="http://example.com/schema" xmlns:ns2="http://example.com/ns2">
+  <id>123</id>
+  <smp:title>The Great Gatsby</smp:title>
+  <ns2:author>F. Scott Fitzgerald</ns2:author>
+</smp:ModelWithNamespaceOnProperties>
+```
+
+### Payload_Xml_ModelWithNamespaceOnPropertiesValue_put
+
+- Endpoint: `put /payload/xml/modelWithNamespaceOnProperties`
+
+Expected request body:
+
+```xml
+<smp:ModelWithNamespaceOnProperties xmlns:smp="http://example.com/schema" xmlns:ns2="http://example.com/ns2">
+  <id>123</id>
+  <smp:title>The Great Gatsby</smp:title>
+  <ns2:author>F. Scott Fitzgerald</ns2:author>
+</smp:ModelWithNamespaceOnProperties>
+```
+
+### Payload_Xml_ModelWithNamespaceValue_get
+
+- Endpoint: `get /payload/xml/modelWithNamespace`
+
+Expected response body:
+
+```xml
+<smp:ModelWithNamespace xmlns:smp="http://example.com/schema">
+  <id>123</id>
+  <title>The Great Gatsby</title>
+</smp:ModelWithNamespace>
+```
+
+### Payload_Xml_ModelWithNamespaceValue_put
+
+- Endpoint: `put /payload/xml/modelWithNamespace`
+
+Expected request body:
+
+```xml
+<smp:ModelWithNamespace xmlns:smp="http://example.com/schema">
+  <id>123</id>
+  <title>The Great Gatsby</title>
+</smp:ModelWithNamespace>
+```
+
+### Payload_Xml_ModelWithNestedModelValue_get
+
+- Endpoint: `get /payload/xml/modelWithNestedModel`
+
+Expected response body:
+
+```xml
+<ModelWithNestedModel>
+  <nested>
+    <name>foo</name>
+    <age>123</age>
+  </nested>
+</ModelWithNestedModel>
+```
+
+### Payload_Xml_ModelWithNestedModelValue_put
+
+- Endpoint: `put /payload/xml/modelWithNestedModel`
+
+Expected request body:
+
+```xml
+<ModelWithNestedModel>
+  <nested>
+    <name>foo</name>
+    <age>123</age>
+  </nested>
+</ModelWithNestedModel>
+```
+
 ### Payload_Xml_ModelWithOptionalFieldValue_get
 
 - Endpoint: `get /payload/xml/modelWithOptionalField`
@@ -3267,6 +3393,32 @@ Expected request body:
 </ModelWithRenamedArrays>
 ```
 
+### Payload_Xml_ModelWithRenamedAttributeValue_get
+
+- Endpoint: `get /payload/xml/modelWithRenamedAttribute`
+
+Expected response body:
+
+```xml
+<ModelWithRenamedAttribute xml-id="123">
+  <title>The Great Gatsby</title>
+  <author>F. Scott Fitzgerald</author>
+</ModelWithRenamedAttribute>
+```
+
+### Payload_Xml_ModelWithRenamedAttributeValue_put
+
+- Endpoint: `put /payload/xml/modelWithRenamedAttribute`
+
+Expected request body:
+
+```xml
+<ModelWithRenamedAttribute xml-id="123">
+  <title>The Great Gatsby</title>
+  <author>F. Scott Fitzgerald</author>
+</ModelWithRenamedAttribute>
+```
+
 ### Payload_Xml_ModelWithRenamedFieldsValue_get
 
 - Endpoint: `get /payload/xml/modelWithRenamedFields`
@@ -3305,6 +3457,178 @@ Expected request body:
 </ModelWithRenamedFieldsSrc>
 ```
 
+### Payload_Xml_ModelWithRenamedNestedModelValue_get
+
+- Endpoint: `get /payload/xml/modelWithRenamedNestedModel`
+
+Expected response body:
+
+```xml
+<ModelWithRenamedNestedModel>
+  <author>
+    <name>foo</name>
+  </author>
+</ModelWithRenamedNestedModel>
+```
+
+### Payload_Xml_ModelWithRenamedNestedModelValue_put
+
+- Endpoint: `put /payload/xml/modelWithRenamedNestedModel`
+
+Expected request body:
+
+```xml
+<ModelWithRenamedNestedModel>
+  <author>
+    <name>foo</name>
+  </author>
+</ModelWithRenamedNestedModel>
+```
+
+### Payload_Xml_ModelWithRenamedPropertyValue_get
+
+- Endpoint: `get /payload/xml/modelWithRenamedProperty`
+
+Expected response body:
+
+```xml
+<ModelWithRenamedProperty>
+  <renamedTitle>foo</renamedTitle>
+  <author>bar</author>
+</ModelWithRenamedProperty>
+```
+
+### Payload_Xml_ModelWithRenamedPropertyValue_put
+
+- Endpoint: `put /payload/xml/modelWithRenamedProperty`
+
+Expected request body:
+
+```xml
+<ModelWithRenamedProperty>
+  <renamedTitle>foo</renamedTitle>
+  <author>bar</author>
+</ModelWithRenamedProperty>
+```
+
+### Payload_Xml_ModelWithRenamedUnwrappedModelArrayValue_get
+
+- Endpoint: `get /payload/xml/modelWithRenamedUnwrappedModelArray`
+
+Expected response body:
+
+```xml
+<ModelWithRenamedUnwrappedModelArray>
+  <ModelItem>
+    <name>foo</name>
+    <age>123</age>
+  </ModelItem>
+  <ModelItem>
+    <name>bar</name>
+    <age>456</age>
+  </ModelItem>
+</ModelWithRenamedUnwrappedModelArray>
+```
+
+### Payload_Xml_ModelWithRenamedUnwrappedModelArrayValue_put
+
+- Endpoint: `put /payload/xml/modelWithRenamedUnwrappedModelArray`
+
+Expected request body:
+
+```xml
+<ModelWithRenamedUnwrappedModelArray>
+  <ModelItem>
+    <name>foo</name>
+    <age>123</age>
+  </ModelItem>
+  <ModelItem>
+    <name>bar</name>
+    <age>456</age>
+  </ModelItem>
+</ModelWithRenamedUnwrappedModelArray>
+```
+
+### Payload_Xml_ModelWithRenamedWrappedAndItemModelArrayValue_get
+
+- Endpoint: `get /payload/xml/modelWithRenamedWrappedAndItemModelArray`
+
+Expected response body:
+
+```xml
+<ModelWithRenamedWrappedAndItemModelArray>
+  <AllBooks>
+    <XmlBook>
+      <title>The Great Gatsby</title>
+    </XmlBook>
+    <XmlBook>
+      <title>Les Miserables</title>
+    </XmlBook>
+  </AllBooks>
+</ModelWithRenamedWrappedAndItemModelArray>
+```
+
+### Payload_Xml_ModelWithRenamedWrappedAndItemModelArrayValue_put
+
+- Endpoint: `put /payload/xml/modelWithRenamedWrappedAndItemModelArray`
+
+Expected request body:
+
+```xml
+<ModelWithRenamedWrappedAndItemModelArray>
+  <AllBooks>
+    <XmlBook>
+      <title>The Great Gatsby</title>
+    </XmlBook>
+    <XmlBook>
+      <title>Les Miserables</title>
+    </XmlBook>
+  </AllBooks>
+</ModelWithRenamedWrappedAndItemModelArray>
+```
+
+### Payload_Xml_ModelWithRenamedWrappedModelArrayValue_get
+
+- Endpoint: `get /payload/xml/modelWithRenamedWrappedModelArray`
+
+Expected response body:
+
+```xml
+<ModelWithRenamedWrappedModelArray>
+  <AllItems>
+    <SimpleModel>
+      <name>foo</name>
+      <age>123</age>
+    </SimpleModel>
+    <SimpleModel>
+      <name>bar</name>
+      <age>456</age>
+    </SimpleModel>
+  </AllItems>
+</ModelWithRenamedWrappedModelArray>
+```
+
+### Payload_Xml_ModelWithRenamedWrappedModelArrayValue_put
+
+- Endpoint: `put /payload/xml/modelWithRenamedWrappedModelArray`
+
+Expected request body:
+
+```xml
+<ModelWithRenamedWrappedModelArray>
+  <AllItems>
+    <SimpleModel>
+      <name>foo</name>
+      <age>123</age>
+    </SimpleModel>
+    <SimpleModel>
+      <name>bar</name>
+      <age>456</age>
+    </SimpleModel>
+  </AllItems>
+</ModelWithRenamedWrappedModelArray>
+```
+
 ### Payload_Xml_ModelWithSimpleArraysValue_get
 
 - Endpoint: `get /payload/xml/modelWithSimpleArrays`
@@ -3405,6 +3729,74 @@ Expected request body:
 </ModelWithUnwrappedArray>
 ```
 
+### Payload_Xml_ModelWithUnwrappedModelArrayValue_get
+
+- Endpoint: `get /payload/xml/modelWithUnwrappedModelArray`
+
+Expected response body:
+
+```xml
+<ModelWithUnwrappedModelArray>
+  <items>
+    <name>foo</name>
+    <age>123</age>
+  </items>
+  <items>
+    <name>bar</name>
+    <age>456</age>
+  </items>
+</ModelWithUnwrappedModelArray>
+```
+
+### Payload_Xml_ModelWithUnwrappedModelArrayValue_put
+
+- Endpoint: `put /payload/xml/modelWithUnwrappedModelArray`
+
+Expected request body:
+
+```xml
+<ModelWithUnwrappedModelArray>
+  <items>
+    <name>foo</name>
+    <age>123</age>
+  </items>
+  <items>
+    <name>bar</name>
+    <age>456</age>
+  </items>
+</ModelWithUnwrappedModelArray>
+```
+
+### Payload_Xml_ModelWithWrappedPrimitiveCustomItemNamesValue_get
+
+- Endpoint: `get /payload/xml/modelWithWrappedPrimitiveCustomItemNames`
+
+Expected response body:
+
+```xml
+<ModelWithWrappedPrimitiveCustomItemNames>
+  <ItemsTags>
+    <ItemName>fiction</ItemName>
+    <ItemName>classic</ItemName>
+  </ItemsTags>
+</ModelWithWrappedPrimitiveCustomItemNames>
+```
+
+### Payload_Xml_ModelWithWrappedPrimitiveCustomItemNamesValue_put
+
+- Endpoint: `put /payload/xml/modelWithWrappedPrimitiveCustomItemNames`
+
+Expected request body:
+
+```xml
+<ModelWithWrappedPrimitiveCustomItemNames>
+  <ItemsTags>
+    <ItemName>fiction</ItemName>
+    <ItemName>classic</ItemName>
+  </ItemsTags>
+</ModelWithWrappedPrimitiveCustomItemNames>
+```
+
 ### Payload_Xml_SimpleModelValue_get
 
 - Endpoint: `get /payload/xml/simpleModel`

package/specs/encode/duration/mockapi.ts

@@ -295,6 +295,11 @@ function createHeaderFloatServerTests(uri: string, value: number) {
   return passOnSuccess({
     uri,
     method: "get",
+    request: {
+      headers: {
+        duration: String(value),
+      },
+    },
     response: {
       status: 204,
     },

package/specs/payload/multipart/mockapi.ts

@@ -437,9 +437,11 @@ Scenarios.Payload_MultiPart_FormData_File_uploadFileSpecificContentType = passOn
   uri: "/multipart/form-data/file/specific-content-type",
   method: "post",
   request: {
-    headers: {
-      "content-type": "multipart/form-data",
-    },
+    body: multipart({
+      files: [
+        { fieldname: "file", originalname: "image.png", buffer: pngFile, mimetype: "image/png" },
+      ],
+    }),
   },
   response: {
     status: 204,
@@ -460,9 +462,11 @@ Scenarios.Payload_MultiPart_FormData_File_uploadFileRequiredFilename = passOnSuc
   uri: "/multipart/form-data/file/required-filename",
   method: "post",
   request: {
-    headers: {
-      "content-type": "multipart/form-data",
-    },
+    body: multipart({
+      files: [
+        { fieldname: "file", originalname: "image.png", buffer: pngFile, mimetype: "image/png" },
+      ],
+    }),
   },
   response: {
     status: 204,
@@ -483,9 +487,12 @@ Scenarios.Payload_MultiPart_FormData_File_uploadFileArray = passOnSuccess({
   uri: "/multipart/form-data/file/file-array",
   method: "post",
   request: {
-    headers: {
-      "content-type": "multipart/form-data",
-    },
+    body: multipart({
+      files: [
+        { fieldname: "files", originalname: "image.png", buffer: pngFile, mimetype: "image/png" },
+        { fieldname: "files", originalname: "image.png", buffer: pngFile, mimetype: "image/png" },
+      ],
+    }),
   },
   response: {
     status: 204,

package/specs/payload/pageable/main.tsp

@@ -141,6 +141,53 @@ namespace ServerDrivenPagination {
     };
   };
 
+  /** Scenario where the initial request is not a GET request. However following the next link always result in a GET request. */
+  namespace AlternateInitialVerb {
+    model Filter {
+      filter: string;
+    }
+
+    @scenario
+    @scenarioDoc("""
+      Test case for initial POST request followed by GET for next pages using link pagination.
+      The initial request is a POST with a filter body, and the next page is fetched using a GET request on the next link.
+      
+      Two requests need to be tested.
+      1. Initial request (POST):
+      Expected route: /payload/pageable/server-driven-pagination/link/initial-post
+      Expected request body:
+      ```json
+      { "filter": "foo eq bar" }
+      ```
+      Expected response body:
+      ```json
+      { "pets": [
+          { "id": "1", "name": "dog" },
+          { "id": "2", "name": "cat" }
+        ],
+        "next": "http://[host]:[port]/payload/pageable/server-driven-pagination/link/initial-post/nextPage?token=abc"
+      }
+      ```
+      2. Next page request (GET):
+      Expected route: /payload/pageable/server-driven-pagination/link/initial-post/nextPage?token=abc
+      Expected response body:
+      ```json
+      { "pets": [
+          { "id": "3", "name": "bird" },
+          { "id": "4", "name": "fish" }
+        ]
+      }
+      ```
+      """)
+    @route("/link/initial-post")
+    @list
+    @post
+    op post(@body body: Filter): {
+      @pageItems pets: Pet[];
+      @nextLink next?: url;
+    };
+  }
+
   @route("/continuationtoken")
   namespace ContinuationToken {
     @scenario

package/specs/payload/pageable/mockapi.ts

@@ -4,6 +4,7 @@ import {
   json,
   MockRequest,
   passOnSuccess,
+  ResolverConfig,
   ScenarioMockApi,
   ValidationError,
   xml,
@@ -176,6 +177,34 @@ Scenarios.Payload_Pageable_ServerDrivenPagination_nestedLink = passOnSuccess([
   },
 ]);
 
+// POST-THEN-GET LINK PAGINATION
+Scenarios.Payload_Pageable_ServerDrivenPagination_AlternateInitialVerb_post = passOnSuccess([
+  {
+    uri: "/payload/pageable/server-driven-pagination/link/initial-post",
+    method: "post",
+    request: {
+      body: json({ filter: "foo eq bar" }),
+    },
+    response: {
+      status: 200,
+      body: json({
+        pets: FirstPage,
+        next: dyn`${dynItem("baseUrl")}/payload/pageable/server-driven-pagination/link/initial-post/nextPage?token=abc`,
+      }),
+    },
+    kind: "MockApiDefinition",
+  },
+  {
+    uri: "/payload/pageable/server-driven-pagination/link/initial-post/nextPage",
+    method: "get",
+    request: {
+      query: { token: "abc" },
+    },
+    response: SecondResponse,
+    kind: "MockApiDefinition",
+  },
+]);
+
 Scenarios.Payload_Pageable_ServerDrivenPagination_ContinuationToken_requestQueryResponseBody =
   createTests("query", "body");
 
@@ -553,7 +582,7 @@ Scenarios.Payload_Pageable_XmlPagination_listWithContinuation = passOnSuccess([
       status: 200,
       body: xml(XmlContTokenFirstPage),
       headers: {
-        "content-type": "application/xml",
+        "content-type": "application/xml; charset=utf-8",
       },
     },
     handler: (req: MockRequest) => {
@@ -590,7 +619,7 @@ Scenarios.Payload_Pageable_XmlPagination_listWithContinuation = passOnSuccess([
       status: 200,
       body: xml(XmlContTokenSecondPage),
       headers: {
-        "content-type": "application/xml",
+        "content-type": "application/xml; charset=utf-8",
       },
     },
     handler: (req: MockRequest) => {
@@ -659,9 +688,15 @@ Scenarios.Payload_Pageable_XmlPagination_listWithNextLink = passOnSuccess([
     request: {},
     response: {
       status: 200,
-      body: xml(xmlNextLinkFirstPage("PLACEHOLDER_BASE_URL")),
+      body: {
+        contentType: "application/xml",
+        rawContent: {
+          serialize: (config: ResolverConfig) =>
+            `<?xml version='1.0' encoding='UTF-8'?>` + xmlNextLinkFirstPage(config.baseUrl),
+        },
+      },
       headers: {
-        "content-type": "application/xml",
+        "content-type": "application/xml; charset=utf-8",
       },
     },
     handler: (req: MockRequest) => {
@@ -683,7 +718,7 @@ Scenarios.Payload_Pageable_XmlPagination_listWithNextLink = passOnSuccess([
       status: 200,
       body: xml(XmlNextLinkSecondPage),
       headers: {
-        "content-type": "application/xml",
+        "content-type": "application/xml; charset=utf-8",
       },
     },
     kind: "MockApiDefinition",