@typespec/http-specs 0.38.0-dev.3 → 0.38.0-dev.5

package/specs/type/scalar/main.tsp

@@ -1,13 +1,12 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
-using Azure.ClientGenerator.Core;
+using Http;
+using SpecLib;
 
 @scenarioService("/type/scalar")
 namespace Type.Scalar;
 
-@operationGroup
 @route("/string")
 interface String {
   #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "For testing"
@@ -25,7 +24,6 @@ interface String {
   put(@body @doc("_") body: string): void;
 }
 
-@operationGroup
 @route("/boolean")
 interface Boolean {
   #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "For testing"
@@ -43,7 +41,6 @@ interface Boolean {
   put(@body @doc("_") body: boolean): void;
 }
 
-@operationGroup
 @route("/unknown")
 interface Unknown {
   #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "For testing"
@@ -62,49 +59,34 @@ interface Unknown {
 }
 
 @doc("Template to have scalar types operations")
-interface ScalarTypesOperations<T, TDoc extends string> {
+interface ScalarTypesOperations<T, TDoc extends valueof string> {
   @scenario
-  @scenarioDoc(
-    """
-      Expected response body:
-      ```json
-      {doc}
-      ```
-      """,
-    {
-      doc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected response body:
+    ```json
+    ${TDoc}
+    ```
+    """)
   @get
   @route("/response_body")
   responseBody(): T;
 
   @scenario
-  @scenarioDoc(
-    """
-      Expected input body:
-      ```json
-      {doc}
-      ```
-      """,
-    {
-      doc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected input body:
+    ```json
+    ${TDoc}
+    ```
+    """)
   @put
   @route("/resquest_body")
   requestBody(@body body: T): void;
 
   @scenario
-  @scenarioDoc(
-    """
-      Expected request parameter:
-      value={doc}
-      """,
-    {
-      doc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected request parameter:
+    value=${TDoc}
+    """)
   @get
   @route("/request_parameter")
   requestParameter(@query value: T): void;
@@ -112,42 +94,34 @@ interface ScalarTypesOperations<T, TDoc extends string> {
 
 @doc("Decimal type")
 @route("/decimal")
-@operationGroup
 interface DecimalType extends ScalarTypesOperations<decimal, "0.33333"> {}
 
 @doc("Decimal128 type")
 @route("/decimal128")
-@operationGroup
 interface Decimal128Type extends ScalarTypesOperations<decimal128, "0.33333"> {}
 
 @doc("Template to verify number types")
-interface NumberTypesVerifyOperations<T, VerifyValues extends string, ResultValue extends string> {
+interface NumberTypesVerifyOperations<
+  T,
+  VerifyValues extends valueof string,
+  ResultValue extends valueof string
+> {
   @scenario
-  @scenarioDoc(
-    """
-      Get verify values:
-      {doc}
-      """,
-    {
-      doc: VerifyValues,
-    }
-  )
+  @scenarioDoc("""
+    Get verify values:
+    ${VerifyValues}
+    """)
   @get
   @route("/prepare_verify")
   prepareVerify(): T[];
 
   @scenario
-  @scenarioDoc(
-    """
-      Expected input body:
-      ```json
-      {doc}
-      ```
-      """,
-    {
-      doc: ResultValue,
-    }
-  )
+  @scenarioDoc("""
+    Expected input body:
+    ```json
+    ${ResultValue}
+    ```
+    """)
   @post
   @route("/verify")
   verify(@body body: T): void;
@@ -155,10 +129,8 @@ interface NumberTypesVerifyOperations<T, VerifyValues extends string, ResultValu
 
 @doc("Decimal type verification")
 @route("/decimal")
-@operationGroup
 interface DecimalVerify extends NumberTypesVerifyOperations<decimal, "[0.1, 0.1, 0.1]", "0.3"> {}
 
 @doc("Decimal128 type verification")
 @route("/decimal128")
-@operationGroup
 interface Decimal128Verify extends NumberTypesVerifyOperations<decimal, "[0.1, 0.1, 0.1]", "0.3"> {}

package/specs/type/union/main.tsp

@@ -1,13 +1,12 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
-using Azure.ClientGenerator.Core;
+using Http;
+using SpecLib;
 
 /**
  * Describe scenarios for various combinations of unions.
  */
-@supportedBy("dpg")
 @scenarioService("/type/union")
 namespace Type.Union;
 
@@ -32,14 +31,12 @@ enum UD {
  * Describe union of string "a" | "b" | "c"
  */
 @route("/strings-only")
-@operationGroup
 interface StringsOnly extends GetAndSend<"a" | "b" | "c", "\"b\""> {}
 
 /**
  * Describe union of string string | "b" | "c"
  */
 @route("/string-extensible")
-@operationGroup
 interface StringExtensible extends GetAndSend<string | "b" | "c", "\"custom\""> {}
 
 union StringExtensibleNamedUnion {
@@ -51,28 +48,24 @@ union StringExtensibleNamedUnion {
  * Describe union of string string | "b" | "c" but where the union is named and some of the variants are named
  */
 @route("/string-extensible-named")
-@operationGroup
 interface StringExtensibleNamed extends GetAndSend<StringExtensibleNamedUnion, "\"custom\""> {}
 
 /**
  * Describe union of integer 1 | 2 | 3
  */
 @route("/ints-only")
-@operationGroup
 interface IntsOnly extends GetAndSend<1 | 2 | 3, "2"> {}
 
 /**
  * Describe union of floats 1.1 | 2.2 | 3.3
  */
 @route("/floats-only")
-@operationGroup
 interface FloatsOnly extends GetAndSend<1.1 | 2.2 | 3.3, "2.2"> {}
 
 /**
  * Describe union of models
  */
 @route("/models-only")
-@operationGroup
 interface ModelsOnly
   extends GetAndSend<
       Cat | Dog,
@@ -95,7 +88,6 @@ model EnumsOnlyCases {
  * Describe union of 2 different enums
  */
 @route("/enums-only")
-@operationGroup
 interface EnumsOnly
   extends GetAndSend<
       LR | UD,
@@ -120,7 +112,6 @@ model StringAndArrayCases {
  * Describe union of a string and an array of strings
  */
 @route("/string-and-array")
-@operationGroup
 interface StringAndArray
   extends GetAndSend<
       string | string[],
@@ -152,7 +143,6 @@ model MixedLiteralsCases {
  * Describe union of floats "a" | 2 | 3.3
  */
 @route("/mixed-literals")
-@operationGroup
 interface MixedLiterals
   extends GetAndSend<
       MixedLiteralsUnion,
@@ -189,7 +179,6 @@ model MixedTypesCases {
  * Describe union of floats "a" | 2 | 3.3
  */
 @route("/mixed-types")
-@operationGroup
 interface MixedTypes
   extends GetAndSend<
       MixedTypesUnion,
@@ -217,7 +206,7 @@ interface MixedTypes
 /**
  * Helper interface to describe a test involving getting and sending a specific data
  */
-interface GetAndSend<Union, Payload extends string, Cases = Union> {
+interface GetAndSend<Union, Payload extends valueof string, Cases = Union> {
   @scenario
   @scenarioDoc(
     """
@@ -228,12 +217,11 @@ interface GetAndSend<Union, Payload extends string, Cases = Union> {
       
       Expected response body:
       ```json
-      { "prop": {value}}
+      { "prop": ${Payload}}
       ```
       """,
     {
       type: Union,
-      value: Payload,
     }
   )
   get(): {
@@ -250,12 +238,11 @@ interface GetAndSend<Union, Payload extends string, Cases = Union> {
       
       Expected request to send body:
       ```json
-      { "prop": {value}}
+      { "prop": ${Payload}}
       ```
       """,
     {
       type: Union,
-      value: Payload,
     }
   )
   send(prop: Cases): void;

package/specs/versioning/added/main.tsp

@@ -2,7 +2,8 @@ import "@typespec/http";
 import "@typespec/spec-lib";
 import "@typespec/versioning";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 using TypeSpec.Versioning;
 
 /**

package/specs/versioning/madeOptional/main.tsp

@@ -2,7 +2,8 @@ import "@typespec/http";
 import "@typespec/spec-lib";
 import "@typespec/versioning";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 using TypeSpec.Versioning;
 
 /**

package/specs/versioning/removed/main.tsp

@@ -2,7 +2,8 @@ import "@typespec/http";
 import "@typespec/spec-lib";
 import "@typespec/versioning";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 using TypeSpec.Versioning;
 
 /**

package/specs/versioning/renamedFrom/main.tsp

@@ -2,7 +2,8 @@ import "@typespec/http";
 import "@typespec/spec-lib";
 import "@typespec/versioning";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 using TypeSpec.Versioning;
 
 /**

package/specs/versioning/returnTypeChangedFrom/main.tsp

@@ -2,7 +2,8 @@ import "@typespec/http";
 import "@typespec/spec-lib";
 import "@typespec/versioning";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 using TypeSpec.Versioning;
 
 /**

package/specs/versioning/typeChangedFrom/main.tsp

@@ -2,7 +2,8 @@ import "@typespec/http";
 import "@typespec/spec-lib";
 import "@typespec/versioning";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 using TypeSpec.Versioning;
 
 /**