@typespec/http-specs 0.1.0-alpha.33 → 0.1.0-alpha.35-dev.1

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@typespec/http-specs",
   "displayName": "Http Specs",
-  "version": "0.1.0-alpha.33",
+  "version": "0.1.0-alpha.35-dev.1",
   "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/spector": "^0.1.0-alpha.24",
-    "@typespec/spec-api": "^0.1.0-alpha.13"
+    "@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.0",
+    "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.0",
     "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.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"
   },
   "scripts": {
     "watch": "tsc -p ./tsconfig.build.json --watch",

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>

package/specs/special-words/main.tsp

@@ -290,51 +290,51 @@ namespace ModelProperties {
   op withList(@body body: ModelWithList): void;
 }
 
-/**
- * Verify enum member names that are special words using extensible enum (union).
- */
-union ExtensibleString {
-  string,
-  and: "and",
-  as: "as",
-  assert: "assert",
-  async: "async",
-  await: "await",
-  break: "break",
-  class: "class",
-  constructor: "constructor",
-  continue: "continue",
-  def: "def",
-  del: "del",
-  elif: "elif",
-  `else`: "else",
-  except: "except",
-  exec: "exec",
-  finally: "finally",
-  for: "for",
-  from: "from",
-  global: "global",
-  `if`: "if",
-  `import`: "import",
-  in: "in",
-  `is`: "is",
-  lambda: "lambda",
-  not: "not",
-  or: "or",
-  pass: "pass",
-  raise: "raise",
-  `return`: "return",
-  try: "try",
-  while: "while",
-  with: "with",
-  yield: "yield",
-}
-
 /**
  * Verify enum member names that are special words.
  */
 @route("/extensible-strings")
-interface ExtensibleStrings {
+namespace ExtensibleStrings {
+  /**
+   * Verify enum member names that are special words using extensible enum (union).
+   */
+  union ExtensibleString {
+    string,
+    and: "and",
+    as: "as",
+    assert: "assert",
+    async: "async",
+    await: "await",
+    break: "break",
+    class: "class",
+    constructor: "constructor",
+    continue: "continue",
+    def: "def",
+    del: "del",
+    elif: "elif",
+    `else`: "else",
+    except: "except",
+    exec: "exec",
+    finally: "finally",
+    for: "for",
+    from: "from",
+    global: "global",
+    `if`: "if",
+    `import`: "import",
+    in: "in",
+    `is`: "is",
+    lambda: "lambda",
+    not: "not",
+    or: "or",
+    pass: "pass",
+    raise: "raise",
+    `return`: "return",
+    try: "try",
+    while: "while",
+    with: "with",
+    yield: "yield",
+  }
+
   @scenario
   @scenarioDoc("""
     Verify that enum members with special word names can be sent and received properly.
@@ -342,5 +342,11 @@ interface ExtensibleStrings {
     """)
   @put
   @route("/string")
-  putExtensibleStringValue(@body body: ExtensibleString): ExtensibleString;
+  op putExtensibleStringValue(
+    @header contentType: "application/json",
+    @body body: ExtensibleString,
+  ): {
+    @header contentType: "application/json";
+    @body body: ExtensibleString;
+  };
 }