@typespec/http-specs 0.1.0-alpha.16-dev.5 → 0.1.0-alpha.16-dev.7

package/specs/type/model/visibility/mockapi.ts

@@ -6,7 +6,6 @@ function genData(keys: string[]): Record<string, any> {
   const ret: Record<string, any> = {};
   const fullData: Record<string, any> = {
     readProp: "abc",
-    queryProp: 123,
     createProp: ["foo", "bar"],
     updateProp: [1, 2],
     deleteProp: true,
@@ -36,7 +35,7 @@ Scenarios.Type_Model_Visibility_headModel = passOnSuccess({
   uri: "/type/model/visibility",
   method: "head",
   request: {
-    body: { queryProp: 123 },
+    query: { queryProp: 123 },
   },
   response: {
     status: 200,
@@ -47,7 +46,7 @@ Scenarios.Type_Model_Visibility_getModel = passOnSuccess({
   uri: "/type/model/visibility",
   method: "get",
   request: {
-    body: { queryProp: 123 },
+    query: { queryProp: 123 },
   },
   response: {
     status: 200,
@@ -59,10 +58,10 @@ Scenarios.Type_Model_Visibility_putModel = passOnSuccess({
   uri: "/type/model/visibility",
   method: "put",
   request: {
-    body: {
+    body: json({
       createProp: ["foo", "bar"],
       updateProp: [1, 2],
-    },
+    }),
   },
   response: {
     status: 204,
@@ -73,9 +72,9 @@ Scenarios.Type_Model_Visibility_patchModel = passOnSuccess({
   uri: "/type/model/visibility",
   method: "patch",
   request: {
-    body: {
+    body: json({
       updateProp: [1, 2],
-    },
+    }),
   },
   response: {
     status: 204,
@@ -86,9 +85,9 @@ Scenarios.Type_Model_Visibility_postModel = passOnSuccess({
   uri: "/type/model/visibility",
   method: "post",
   request: {
-    body: {
+    body: json({
       createProp: ["foo", "bar"],
-    },
+    }),
   },
   response: {
     status: 204,
@@ -99,7 +98,7 @@ Scenarios.Type_Model_Visibility_deleteModel = passOnSuccess({
   uri: "/type/model/visibility",
   method: "delete",
   request: {
-    body: { deleteProp: true },
+    body: json({ deleteProp: true }),
   },
   response: {
     status: 204,

package/specs/type/property/additional-properties/mockapi.ts

@@ -98,7 +98,7 @@ const recordNonDiscriminatedUnion3Body = {
     end: "2021-01-02T00:00:00Z",
   },
 };
-function createServerTests(url: string, value: any) {
+function createServerTests(url: string, value: unknown) {
   return {
     get: passOnSuccess({
       uri: url,
@@ -114,7 +114,7 @@ function createServerTests(url: string, value: any) {
       uri: url,
       method: `put`,
       request: {
-        body: value,
+        body: json(value),
       },
       response: {
         status: 204,

package/specs/type/property/nullable/mockapi.ts

@@ -7,7 +7,6 @@ function createServerTests(url: string, value: unknown, patchNullableProperty?:
     get: passOnSuccess({
       uri: url,
       method: `get`,
-      request: {},
       response: {
         status: 200,
         body: json(value),
@@ -18,13 +17,13 @@ function createServerTests(url: string, value: unknown, patchNullableProperty?:
       uri: url,
       method: `patch`,
       request: {
-        body: {
-          requiredProperty: "foo",
-          nullableProperty: patchNullableProperty || null,
-        },
-        headers: {
-          "Content-Type": "application/merge-patch+json",
-        },
+        body: json(
+          {
+            requiredProperty: "foo",
+            nullableProperty: patchNullableProperty || null,
+          },
+          "application/merge-patch+json",
+        ),
       },
       response: {
         status: 204,

package/specs/type/property/optionality/mockapi.ts

@@ -18,7 +18,7 @@ function createServerTests(url: string, value: unknown) {
       uri: url,
       method: `put`,
       request: {
-        body: value,
+        body: json(value),
       },
       response: {
         status: 204,

package/specs/type/property/value-types/mockapi.ts

@@ -18,7 +18,7 @@ function createServerTests(url: string, data: unknown) {
       uri: url,
       method: `put`,
       request: {
-        body: data,
+        body: json(data),
       },
       response: {
         status: 204,
@@ -166,9 +166,9 @@ Scenarios.Type_Property_ValueTypes_Never_put = passOnSuccess({
   uri: `/type/property/value-types/never`,
   method: `put`,
   request: {
-    body: {
+    body: json({
       property: undefined,
-    },
+    }),
   },
   response: {
     status: 204,

package/specs/type/scalar/mockapi.ts

@@ -17,7 +17,7 @@ Scenarios.Type_Scalar_String_put = passOnSuccess({
   uri: "/type/scalar/string",
   method: `put`,
   request: {
-    body: "test",
+    body: json("test"),
     headers: {
       "Content-Type": "text/plain",
     },
@@ -43,7 +43,7 @@ Scenarios.Type_Scalar_Boolean_put = passOnSuccess({
   uri: "/type/scalar/boolean",
   method: `put`,
   request: {
-    body: true,
+    body: json(true),
     headers: {
       "Content-Type": "application/json; charset=utf-8",
     },
@@ -68,7 +68,7 @@ Scenarios.Type_Scalar_Unknown_put = passOnSuccess({
   uri: "/type/scalar/unknown",
   method: `put`,
   request: {
-    body: "test",
+    body: json("test"),
     headers: {
       "Content-Type": "text/plain",
     },
@@ -103,7 +103,7 @@ Scenarios.Type_Scalar_DecimalType_requestBody = passOnSuccess({
   uri: "/type/scalar/decimal/resquest_body",
   method: `put`,
   request: {
-    body: 0.33333,
+    body: json(0.33333),
     headers: {
       "Content-Type": "application/json; charset=utf-8",
     },
@@ -117,7 +117,7 @@ Scenarios.Type_Scalar_Decimal128Type_requestBody = passOnSuccess({
   uri: "/type/scalar/decimal128/resquest_body",
   method: `put`,
   request: {
-    body: 0.33333,
+    body: json(0.33333),
     headers: {
       "Content-Type": "application/json; charset=utf-8",
     },
@@ -131,7 +131,7 @@ Scenarios.Type_Scalar_DecimalType_requestParameter = passOnSuccess({
   uri: "/type/scalar/decimal/request_parameter",
   method: `get`,
   request: {
-    params: { value: "0.33333" },
+    query: { value: "0.33333" },
   },
   response: {
     status: 204,
@@ -142,7 +142,7 @@ Scenarios.Type_Scalar_Decimal128Type_requestParameter = passOnSuccess({
   uri: "/type/scalar/decimal128/request_parameter",
   method: `get`,
   request: {
-    params: { value: "0.33333" },
+    query: { value: "0.33333" },
   },
   response: {
     status: 204,
@@ -173,7 +173,7 @@ Scenarios.Type_Scalar_DecimalVerify_verify = passOnSuccess({
   uri: "/type/scalar/decimal/verify",
   method: `post`,
   request: {
-    body: 0.3,
+    body: json(0.3),
     headers: {
       "Content-Type": "application/json; charset=utf-8",
     },
@@ -187,7 +187,7 @@ Scenarios.Type_Scalar_Decimal128Verify_verify = passOnSuccess({
   uri: "/type/scalar/decimal128/verify",
   method: `post`,
   request: {
-    body: 0.3,
+    body: json(0.3),
     headers: {
       "Content-Type": "application/json; charset=utf-8",
     },

package/specs/type/union/mockapi.ts

@@ -20,9 +20,9 @@ function createPostServerTests(url: string, value: unknown) {
     uri: url,
     method: `post`,
     request: {
-      body: {
+      body: json({
         prop: value,
-      },
+      }),
     },
     response: {
       status: 204,

package/specs/versioning/added/mockapi.ts

@@ -6,11 +6,11 @@ Scenarios.Versioning_Added_v1 = passOnSuccess({
   uri: `/versioning/added/api-version:v2/v1`,
   method: `post`,
   request: {
-    body: {
+    body: json({
       prop: "foo",
       enumProp: "enumMemberV2",
       unionProp: 10,
-    },
+    }),
     headers: {
       "header-v2": "bar",
     },
@@ -26,11 +26,11 @@ Scenarios.Versioning_Added_v2 = passOnSuccess({
   uri: `/versioning/added/api-version:v2/v2`,
   method: `post`,
   request: {
-    body: {
+    body: json({
       prop: "foo",
       enumProp: "enumMember",
       unionProp: "bar",
-    },
+    }),
   },
   response: {
     status: 200,
@@ -43,11 +43,11 @@ Scenarios.Versioning_Added_InterfaceV2 = passOnSuccess({
   uri: `/versioning/added/api-version:v2/interface-v2/v2`,
   method: `post`,
   request: {
-    body: {
+    body: json({
       prop: "foo",
       enumProp: "enumMember",
       unionProp: "bar",
-    },
+    }),
   },
   response: {
     status: 200,

package/specs/versioning/madeOptional/mockapi.ts

@@ -6,9 +6,9 @@ Scenarios.Versioning_MadeOptional_test = passOnSuccess({
   uri: `/versioning/made-optional/api-version:v2/test`,
   method: `post`,
   request: {
-    body: {
+    body: json({
       prop: "foo",
-    },
+    }),
   },
   response: {
     status: 200,

package/specs/versioning/removed/mockapi.ts

@@ -6,11 +6,11 @@ Scenarios.Versioning_Removed_v2 = passOnSuccess({
   uri: `/versioning/removed/api-version:v2/v2`,
   method: `post`,
   request: {
-    body: {
+    body: json({
       prop: "foo",
       enumProp: "enumMemberV2",
       unionProp: "bar",
-    },
+    }),
   },
   response: {
     status: 200,
@@ -23,10 +23,10 @@ Scenarios.Versioning_Removed_modelV3 = passOnSuccess({
   uri: `/versioning/removed/api-version[:]v1/v3`,
   method: "post",
   request: {
-    body: {
+    body: json({
       id: "123",
       enumProp: "enumMemberV1",
-    },
+    }),
   },
   response: {
     status: 200,
@@ -39,10 +39,10 @@ Scenarios.Versioning_Removed_modelV3_V2 = passOnSuccess({
   uri: `/versioning/removed/api-version[:]v2/v3`,
   method: "post",
   request: {
-    body: {
+    body: json({
       id: "123",
       enumProp: "enumMemberV1",
-    },
+    }),
   },
   response: {
     status: 200,
@@ -55,9 +55,9 @@ Scenarios.Versioning_Removed_modelV3_V2preview = passOnSuccess({
   uri: `/versioning/removed/api-version[:]v2preview/v3`,
   method: "post",
   request: {
-    body: {
+    body: json({
       id: "123",
-    },
+    }),
   },
   response: {
     status: 200,

package/specs/versioning/renamedFrom/mockapi.ts

@@ -6,12 +6,12 @@ Scenarios.Versioning_RenamedFrom_newOp = passOnSuccess({
   uri: `/versioning/renamed-from/api-version:v2/test`,
   method: `post`,
   request: {
-    body: {
+    body: json({
       newProp: "foo",
       enumProp: "newEnumMember",
       unionProp: 10,
-    },
-    params: {
+    }),
+    query: {
       newQuery: "bar",
     },
   },
@@ -26,11 +26,11 @@ Scenarios.Versioning_RenamedFrom_NewInterface = passOnSuccess({
   uri: `/versioning/renamed-from/api-version:v2/interface/test`,
   method: `post`,
   request: {
-    body: {
+    body: json({
       newProp: "foo",
       enumProp: "newEnumMember",
       unionProp: 10,
-    },
+    }),
   },
   response: {
     status: 200,

package/specs/versioning/returnTypeChangedFrom/mockapi.ts

@@ -6,7 +6,7 @@ Scenarios.Versioning_ReturnTypeChangedFrom_test = passOnSuccess({
   uri: `/versioning/return-type-changed-from/api-version:v2/test`,
   method: `post`,
   request: {
-    body: "test",
+    body: json("test"),
     headers: {
       "Content-Type": "text/plain",
     },

package/specs/versioning/typeChangedFrom/mockapi.ts

@@ -6,13 +6,13 @@ Scenarios.Versioning_TypeChangedFrom_test = passOnSuccess({
   uri: `/versioning/type-changed-from/api-version:v2/test`,
   method: `post`,
   request: {
-    params: {
+    query: {
       param: "baz",
     },
-    body: {
+    body: json({
       prop: "foo",
       changedProp: "bar",
-    },
+    }),
   },
   response: {
     status: 200,