@typespec/http-specs 0.1.0-alpha.34 → 0.1.0-alpha.35-dev.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@typespec/http-specs",
   "displayName": "Http Specs",
-  "version": "0.1.0-alpha.34",
+  "version": "0.1.0-alpha.35-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": {
-    "deep-equal": "^2.2.0",
-    "@typespec/spec-api": "^0.1.0-alpha.13",
-    "@typespec/spector": "^0.1.0-alpha.24"
+    "@typespec/spec-api": "^0.1.0-alpha.13 || >= 0.1.0-alpha.14-dev.1",
+    "@typespec/spector": "^0.1.0-alpha.24 || >= 0.1.0-dev.1",
+    "deep-equal": "^2.2.0"
   },
   "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.2",
     "concurrently": "^9.1.2",
     "rimraf": "~6.1.3",
-    "typescript": "~5.9.3",
-    "@typespec/json-schema": "^1.10.0",
-    "@typespec/openapi": "^1.10.0",
-    "@typespec/openapi3": "^1.10.0"
+    "typescript": "~5.9.3"
   },
   "peerDependencies": {
-    "@typespec/compiler": "^1.10.0",
-    "@typespec/http": "^1.10.0",
-    "@typespec/rest": "^0.80.0",
-    "@typespec/versioning": "^0.80.0",
-    "@typespec/xml": "^0.80.0"
+    "@typespec/compiler": "^1.10.0 || >= 1.11.0-dev.3",
+    "@typespec/http": "^1.10.0 || >= 1.11.0-dev.1",
+    "@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"
   },
   "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/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/mockapi.ts

@@ -4,6 +4,7 @@ import {
   json,
   MockRequest,
   passOnSuccess,
+  ResolverConfig,
   ScenarioMockApi,
   ValidationError,
   xml,
@@ -553,7 +554,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 +591,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 +660,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 +690,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",

package/specs/payload/xml/mockapi.ts

@@ -136,6 +136,16 @@ export const modelWithDatetime = `
 </ModelWithDatetime>
 `;
 
+// Some clients serialize UTC datetimes without trailing zero milliseconds. Both
+// "2022-08-26T18:38:00.000Z" and "2022-08-26T18:38:00Z" are valid RFC3339 representations
+// of the same instant; accept either form.
+const modelWithDatetimeNoMs = `
+<ModelWithDatetime>
+  <rfc3339>2022-08-26T18:38:00Z</rfc3339>
+  <rfc7231>Fri, 26 Aug 2022 14:38:00 GMT</rfc7231>
+</ModelWithDatetime>
+`;
+
 function createServerTests(uri: string, data?: any) {
   return {
     get: passOnSuccess({
@@ -251,12 +261,44 @@ const Payload_Xml_ModelWithEnum = createServerTests("/payload/xml/modelWithEnum"
 Scenarios.Payload_Xml_ModelWithEnumValue_get = Payload_Xml_ModelWithEnum.get;
 Scenarios.Payload_Xml_ModelWithEnumValue_put = Payload_Xml_ModelWithEnum.put;
 
-const Payload_Xml_ModelWithDatetime = createServerTests(
-  "/payload/xml/modelWithDatetime",
-  modelWithDatetime,
-);
-Scenarios.Payload_Xml_ModelWithDatetimeValue_get = Payload_Xml_ModelWithDatetime.get;
-Scenarios.Payload_Xml_ModelWithDatetimeValue_put = Payload_Xml_ModelWithDatetime.put;
+Scenarios.Payload_Xml_ModelWithDatetimeValue_get = passOnSuccess({
+  uri: "/payload/xml/modelWithDatetime",
+  method: "get",
+  request: {},
+  response: {
+    status: 200,
+    body: xml(modelWithDatetime),
+  },
+  kind: "MockApiDefinition",
+});
+
+Scenarios.Payload_Xml_ModelWithDatetimeValue_put = passOnSuccess({
+  uri: "/payload/xml/modelWithDatetime",
+  method: "put",
+  request: {
+    body: xml(modelWithDatetime),
+  },
+  handler: (req: MockRequest) => {
+    req.expect.containsHeader("content-type", "application/xml");
+    // Accept both "2022-08-26T18:38:00.000Z" and "2022-08-26T18:38:00Z" as equivalent UTC datetimes.
+    let firstError: unknown;
+    try {
+      req.expect.xmlBodyEquals(modelWithDatetime);
+    } catch (e) {
+      firstError = e;
+    }
+    if (firstError !== undefined) {
+      req.expect.xmlBodyEquals(modelWithDatetimeNoMs);
+    }
+    return {
+      status: 204,
+    };
+  },
+  response: {
+    status: 204,
+  },
+  kind: "MockApiDefinition",
+});
 
 export const xmlError = `
 <XmlErrorBody>