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

package/specs/type/property/value-types/main.tsp

@@ -1,8 +1,8 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
-using Azure.ClientGenerator.Core;
+using Http;
+using SpecLib;
 
 @doc("Illustrates various property types for models")
 @scenarioService("/type/property/value-types")
@@ -16,37 +16,27 @@ model ModelTemplate<TProperty> {
 }
 
 @doc("Template to have models operations")
-interface ModelOperations<TModel, TDoc extends string> {
+interface ModelOperations<TModel, TDoc extends valueof string> {
   #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "For testing"
   @scenario
-  @scenarioDoc(
-    """
-      Expected response body:
-      ```json
-      {"property": {doc}}
-      ```
-      """,
-    {
-      doc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected response body:
+    ```json
+    {"property": ${TDoc}}
+    ```
+    """)
   @get
   @doc("Get call")
   get(): TModel;
 
   #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "For testing"
   @scenario
-  @scenarioDoc(
-    """
-      Expected input body:
-      ```json
-      {"property": {doc}}
-      ```
-      """,
-    {
-      doc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected input body:
+    ```json
+    {"property": ${TDoc}}
+    ```
+    """)
   @put
   @doc("Put operation")
   put(@body @doc("body") body: TModel): void;
@@ -56,63 +46,54 @@ interface ModelOperations<TModel, TDoc extends string> {
 @doc("Model with a boolean property")
 model BooleanProperty is ModelTemplate<boolean>;
 @route("/boolean")
-@operationGroup
 interface Boolean extends ModelOperations<BooleanProperty, "true"> {}
 
 // Test a model with a string property
 @doc("Model with a string property")
 model StringProperty is ModelTemplate<string>;
 @route("/string")
-@operationGroup
 interface String extends ModelOperations<StringProperty, "\"hello\""> {}
 
 // Test a model with a bytes property
 @doc("Model with a bytes property")
 model BytesProperty is ModelTemplate<bytes>;
 @route("/bytes")
-@operationGroup
 interface Bytes extends ModelOperations<BytesProperty, "aGVsbG8sIHdvcmxkIQ=="> {}
 
 // Test a model with an int property
 @doc("Model with a int property")
 model IntProperty is ModelTemplate<int32>;
 @route("/int")
-@operationGroup
 interface Int extends ModelOperations<IntProperty, "42"> {}
 
 // Test a model with a float property
 @doc("Model with a float property")
 model FloatProperty is ModelTemplate<float32>;
 @route("/float")
-@operationGroup
 interface Float extends ModelOperations<FloatProperty, "43.125"> {}
 
 // Test a model with a decimal property
 @doc("Model with a decimal property")
 model DecimalProperty is ModelTemplate<decimal>;
 @route("/decimal")
-@operationGroup
 interface Decimal extends ModelOperations<DecimalProperty, "0.33333"> {}
 
 // Test a model with a decimal128 property
 @doc("Model with a decimal128 property")
 model Decimal128Property is ModelTemplate<decimal128>;
 @route("/decimal128")
-@operationGroup
 interface Decimal128 extends ModelOperations<Decimal128Property, "0.33333"> {}
 
 // Test a model with a datetime property
 @doc("Model with a datetime property")
 model DatetimeProperty is ModelTemplate<utcDateTime>;
 @route("/datetime")
-@operationGroup
 interface Datetime extends ModelOperations<DatetimeProperty, "2022-08-26T18:38:00Z"> {}
 
 // Test a model with a duration property
 @doc("Model with a duration property")
 model DurationProperty is ModelTemplate<duration>;
 @route("/duration")
-@operationGroup
 interface Duration extends ModelOperations<DurationProperty, "P123DT22H14M12.011S"> {}
 
 // Test a model with an enum property
@@ -127,9 +108,7 @@ union InnerEnum {
   ValueTwo: "ValueTwo",
 }
 
-#suppress "@azure-tools/typespec-azure-core/use-extensible-enum" "For testing"
 @doc("Enum that will be used as a property for model EnumProperty. Non-extensible.")
-@Azure.Core.fixed
 enum FixedInnerEnum {
   @doc("First value.")
   ValueOne,
@@ -141,13 +120,11 @@ enum FixedInnerEnum {
 @doc("Model with enum properties")
 model EnumProperty is ModelTemplate<FixedInnerEnum>;
 @route("/enum")
-@operationGroup
 interface Enum extends ModelOperations<EnumProperty, "\"ValueOne\""> {}
 
 @doc("Model with extensible enum properties")
 model ExtensibleEnumProperty is ModelTemplate<InnerEnum>;
 @route("/extensible-enum")
-@operationGroup
 interface ExtensibleEnum extends ModelOperations<ExtensibleEnumProperty, "\"UnknownValue\""> {}
 
 // Test a model with a model property
@@ -159,14 +136,12 @@ model InnerModel {
 @doc("Model with model properties")
 model ModelProperty is ModelTemplate<InnerModel>;
 @route("/model")
-@operationGroup
 interface Model extends ModelOperations<ModelProperty, "{'property': 'hello'}"> {}
 
 // Test a model with a string collection property
 @doc("Model with collection string properties")
 model CollectionsStringProperty is ModelTemplate<string[]>;
 @route("/collections/string")
-@operationGroup
 interface CollectionsString
   extends ModelOperations<CollectionsStringProperty, "['hello', 'world']"> {}
 
@@ -174,14 +149,12 @@ interface CollectionsString
 @doc("Model with collection int properties")
 model CollectionsIntProperty is ModelTemplate<int32[]>;
 @route("/collections/int")
-@operationGroup
 interface CollectionsInt extends ModelOperations<CollectionsIntProperty, "[1, 2]"> {}
 
 // Test a model with a model collection property
 @doc("Model with collection model properties")
 model CollectionsModelProperty is ModelTemplate<InnerModel[]>;
 @route("/collections/model")
-@operationGroup
 interface CollectionsModel
   extends ModelOperations<
       CollectionsModelProperty,
@@ -192,7 +165,6 @@ interface CollectionsModel
 @doc("Model with dictionary string properties")
 model DictionaryStringProperty is ModelTemplate<Record<string>>;
 @route("/dictionary/string")
-@operationGroup
 interface DictionaryString
   extends ModelOperations<DictionaryStringProperty, "{'k1': 'hello', 'k2': 'world'}"> {}
 
@@ -200,77 +172,65 @@ interface DictionaryString
 @doc("Model with a property never. (This property should not be included).")
 model NeverProperty is ModelTemplate<never>;
 @route("/never")
-@operationGroup
 interface Never extends ModelOperations<NeverProperty, "<don't include this property>"> {}
 
 // Test a model with unknown and string
 @doc("Model with a property unknown, and the data is a string.")
 model UnknownStringProperty is ModelTemplate<unknown>;
 @route("/unknown/string")
-@operationGroup
 interface UnknownString extends ModelOperations<UnknownStringProperty, "\"hello\""> {}
 
 // Test a model with unknown and int
 @doc("Model with a property unknown, and the data is a int32.")
 model UnknownIntProperty is ModelTemplate<unknown>;
 @route("/unknown/int")
-@operationGroup
 interface UnknownInt extends ModelOperations<UnknownIntProperty, "42"> {}
 
 // Test a model with unknown and a dictionnary
 @doc("Model with a property unknown, and the data is a dictionnary.")
 model UnknownDictProperty is ModelTemplate<unknown>;
 @route("/unknown/dict")
-@operationGroup
 interface UnknownDict extends ModelOperations<UnknownDictProperty, "{'k1': 'hello', 'k2': 42}"> {}
 
 // Test a model with unknown and an array
 @doc("Model with a property unknown, and the data is an array.")
 model UnknownArrayProperty is ModelTemplate<unknown>;
 @route("/unknown/array")
-@operationGroup
 interface UnknownArray extends ModelOperations<UnknownArrayProperty, "['hello', 'world']"> {}
 
 @doc("Model with a string literal property.")
 model StringLiteralProperty is ModelTemplate<"hello">;
 @route("/string/literal")
-@operationGroup
 interface StringLiteral extends ModelOperations<StringLiteralProperty, "\"hello\""> {}
 
 @doc("Model with a int literal property.")
 model IntLiteralProperty is ModelTemplate<42>;
 @route("/int/literal")
-@operationGroup
 interface IntLiteral extends ModelOperations<IntLiteralProperty, "42"> {}
 
 @doc("Model with a float literal property.")
 model FloatLiteralProperty is ModelTemplate<43.125>;
 @route("/float/literal")
-@operationGroup
 interface FloatLiteral extends ModelOperations<FloatLiteralProperty, "43.125"> {}
 
 @doc("Model with a boolean literal property.")
 model BooleanLiteralProperty is ModelTemplate<true>;
 @route("/boolean/literal")
-@operationGroup
 interface BooleanLiteral extends ModelOperations<BooleanLiteralProperty, "true"> {}
 
 @doc("Model with a union of string literal as property.")
 model UnionStringLiteralProperty is ModelTemplate<"hello" | "world">;
 @route("/union/string/literal")
-@operationGroup
 interface UnionStringLiteral extends ModelOperations<UnionStringLiteralProperty, "\"world\""> {}
 
 @doc("Model with a union of int literal as property.")
 model UnionIntLiteralProperty is ModelTemplate<42 | 43>;
 @route("/union/int/literal")
-@operationGroup
 interface UnionIntLiteral extends ModelOperations<UnionIntLiteralProperty, "42"> {}
 
 @doc("Model with a union of float literal as property.")
 model UnionFloatLiteralProperty is ModelTemplate<43.125 | 46.875>;
 @route("/union/float/literal")
-@operationGroup
 interface UnionFloatLiteral extends ModelOperations<UnionFloatLiteralProperty, "46.875"> {}
 
 union ExtendedEnum {
@@ -281,5 +241,4 @@ union ExtendedEnum {
 model UnionEnumValueProperty is ModelTemplate<ExtendedEnum.EnumValue2>;
 
 @route("/union-enum-value")
-@operationGroup
 interface UnionEnumValue extends ModelOperations<UnionEnumValueProperty, "\"value2\""> {}

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;
 
 /**