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

package/specs/type/property/additional-properties/main.tsp

@@ -1,28 +1,23 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
-using Azure.ClientGenerator.Core;
+using Http;
+using SpecLib;
 
 @doc("Tests for additional properties of models")
 @scenarioService("/type/property/additionalProperties")
 namespace Type.Property.AdditionalProperties;
 
 @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
-      {doc}
-      ```
-      """,
-    {
-      doc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected response body:
+    ```json
+    ${TDoc}
+    ```
+    """)
   @get
   @doc("Get call")
   get(): TModel;
@@ -30,17 +25,12 @@ interface ModelOperations<TModel, TDoc extends string> {
   #suppress "@azure-tools/typespec-azure-core/use-standard-operations" "For testing"
   #suppress "@azure-tools/typespec-azure-core/bad-record-type" "For testing"
   @scenario
-  @scenarioDoc(
-    """
-      Expected input body:
-      ```json
-      {doc}
-      ```
-      """,
-    {
-      doc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected input body:
+    ```json
+    ${TDoc}
+    ```
+    """)
   @put
   @doc("Put operation")
   put(@body @doc("body") body: TModel): void;
@@ -55,7 +45,6 @@ model ExtendsUnknownAdditionalProperties extends Record<unknown> {
 }
 
 @route("/extendsRecordUnknown")
-@operationGroup
 interface ExtendsUnknown
   extends ModelOperations<
       ExtendsUnknownAdditionalProperties,
@@ -72,7 +61,6 @@ model ExtendsUnknownAdditionalPropertiesDerived extends ExtendsUnknownAdditional
 }
 
 @route("/extendsRecordUnknownDerived")
-@operationGroup
 interface ExtendsUnknownDerived
   extends ModelOperations<
       ExtendsUnknownAdditionalPropertiesDerived,
@@ -102,7 +90,6 @@ model ExtendsUnknownAdditionalPropertiesDiscriminatedDerived
 }
 
 @route("/extendsUnknownDiscriminated")
-@operationGroup
 interface ExtendsUnknownDiscriminated
   extends ModelOperations<
       ExtendsUnknownAdditionalPropertiesDiscriminated,
@@ -117,7 +104,6 @@ model IsUnknownAdditionalProperties is Record<unknown> {
 }
 
 @route("/isRecordUnknown")
-@operationGroup
 interface IsUnknown
   extends ModelOperations<
       IsUnknownAdditionalProperties,
@@ -134,7 +120,6 @@ model IsUnknownAdditionalPropertiesDerived extends IsUnknownAdditionalProperties
 }
 
 @route("/isRecordUnknownDerived")
-@operationGroup
 interface IsUnknownDerived
   extends ModelOperations<
       IsUnknownAdditionalPropertiesDerived,
@@ -164,7 +149,6 @@ model IsUnknownAdditionalPropertiesDiscriminatedDerived
 }
 
 @route("/isUnknownDiscriminated")
-@operationGroup
 interface IsUnknownDiscriminated
   extends ModelOperations<
       IsUnknownAdditionalPropertiesDiscriminated,
@@ -181,7 +165,6 @@ model ExtendsStringAdditionalProperties extends Record<string> {
 }
 
 @route("/extendsRecordString")
-@operationGroup
 interface ExtendsString
   extends ModelOperations<
       ExtendsStringAdditionalProperties,
@@ -196,7 +179,6 @@ model IsStringAdditionalProperties is Record<string> {
 }
 
 @route("/isRecordstring")
-@operationGroup
 interface IsString
   extends ModelOperations<
       IsStringAdditionalProperties,
@@ -212,7 +194,6 @@ model SpreadStringRecord {
 }
 
 @route("/spreadRecordString")
-@operationGroup
 interface SpreadString
   extends ModelOperations<SpreadStringRecord, "{'name': 'SpreadSpringRecord', 'prop': 'abc'}"> {}
 
@@ -225,7 +206,6 @@ model ExtendsFloatAdditionalProperties extends Record<float32> {
 }
 
 @route("/extendsRecordFloat")
-@operationGroup
 interface ExtendsFloat
   extends ModelOperations<ExtendsFloatAdditionalProperties, "{'id': 43.125, 'prop': 43.125}"> {}
 
@@ -237,7 +217,6 @@ model IsFloatAdditionalProperties is Record<float32> {
 }
 
 @route("/isRecordFloat")
-@operationGroup
 interface IsFloat
   extends ModelOperations<IsFloatAdditionalProperties, "{'id': 43.125, 'prop': 43.125}"> {}
 
@@ -250,7 +229,6 @@ model SpreadFloatRecord {
 }
 
 @route("/spreadRecordFloat")
-@operationGroup
 interface SpreadFloat
   extends ModelOperations<SpreadFloatRecord, "{'id': 43.125, 'prop': 43.125}"> {}
 
@@ -268,7 +246,6 @@ model ExtendsModelAdditionalProperties extends Record<ModelForRecord> {
 }
 
 @route("/extendsRecordModel")
-@operationGroup
 interface ExtendsModel
   extends ModelOperations<
       ExtendsModelAdditionalProperties,
@@ -282,7 +259,6 @@ model IsModelAdditionalProperties is Record<ModelForRecord> {
 }
 
 @route("/isRecordModel")
-@operationGroup
 interface IsModel
   extends ModelOperations<
       IsModelAdditionalProperties,
@@ -296,7 +272,6 @@ model SpreadModelRecord {
 }
 
 @route("/spreadRecordModel")
-@operationGroup
 interface SpreadModel
   extends ModelOperations<
       SpreadModelRecord,
@@ -311,7 +286,6 @@ model ExtendsModelArrayAdditionalProperties extends Record<ModelForRecord[]> {
 }
 
 @route("/extendsRecordModelArray")
-@operationGroup
 interface ExtendsModelArray
   extends ModelOperations<
       ExtendsModelArrayAdditionalProperties,
@@ -325,7 +299,6 @@ model IsModelArrayAdditionalProperties is Record<ModelForRecord[]> {
 }
 
 @route("/isRecordModelArray")
-@operationGroup
 interface IsModelArray
   extends ModelOperations<
       IsModelArrayAdditionalProperties,
@@ -338,7 +311,6 @@ model SpreadModelArrayRecord {
 }
 
 @route("/spreadRecordModelArray")
-@operationGroup
 interface SpreadModelArray
   extends ModelOperations<
       SpreadModelArrayRecord,
@@ -356,7 +328,6 @@ model DifferentSpreadStringRecord {
 }
 
 @route("/spreadDifferentRecordString")
-@operationGroup
 interface SpreadDifferentString
   extends ModelOperations<DifferentSpreadStringRecord, "{'id': 43.125, 'prop': 'abc'}"> {}
 
@@ -370,7 +341,6 @@ model DifferentSpreadFloatRecord {
 }
 
 @route("/spreadDifferentRecordFloat")
-@operationGroup
 interface SpreadDifferentFloat
   extends ModelOperations<DifferentSpreadFloatRecord, "{'name': 'abc', 'prop': 43.125}"> {}
 
@@ -382,7 +352,6 @@ model DifferentSpreadModelRecord {
 }
 
 @route("/spreadDifferentRecordModel")
-@operationGroup
 interface SpreadDifferentModel
   extends ModelOperations<
       DifferentSpreadModelRecord,
@@ -397,7 +366,6 @@ model DifferentSpreadModelArrayRecord {
 }
 
 @route("/spreadDifferentRecordModelArray")
-@operationGroup
 interface SpreadDifferentModelArray
   extends ModelOperations<
       DifferentSpreadModelArrayRecord,
@@ -412,7 +380,6 @@ model DifferentSpreadStringDerived extends DifferentSpreadStringRecord {
 }
 
 @route("/extendsDifferentSpreadString")
-@operationGroup
 interface ExtendsDifferentSpreadString
   extends ModelOperations<
       DifferentSpreadStringDerived,
@@ -427,7 +394,6 @@ model DifferentSpreadFloatDerived extends DifferentSpreadFloatRecord {
 }
 
 @route("/extendsDifferentSpreadFloat")
-@operationGroup
 interface ExtendsDifferentSpreadFloat
   extends ModelOperations<
       DifferentSpreadFloatDerived,
@@ -443,7 +409,6 @@ model DifferentSpreadModelDerived extends DifferentSpreadModelRecord {
 }
 
 @route("/extendsDifferentSpreadModel")
-@operationGroup
 interface ExtendsDifferentSpreadModel
   extends ModelOperations<
       DifferentSpreadModelDerived,
@@ -458,7 +423,6 @@ model DifferentSpreadModelArrayDerived extends DifferentSpreadModelArrayRecord {
 }
 
 @route("/extendsDifferentSpreadModelArray")
-@operationGroup
 interface ExtendsDifferentSpreadModelArray
   extends ModelOperations<
       DifferentSpreadModelArrayDerived,
@@ -476,7 +440,6 @@ model MultipleSpreadRecord {
 }
 
 @route("/multipleSpreadRecord")
-@operationGroup
 interface MultipleSpread
   extends ModelOperations<
       MultipleSpreadRecord,
@@ -493,7 +456,6 @@ model SpreadRecordForUnion {
 }
 
 @route("/spreadRecordUnion")
-@operationGroup
 interface SpreadRecordUnion
   extends ModelOperations<
       SpreadRecordForUnion,
@@ -532,7 +494,6 @@ model SpreadRecordForDiscriminatedUnion {
 }
 
 @route("/spreadRecordDiscriminatedUnion")
-@operationGroup
 interface SpreadRecordDiscriminatedUnion
   extends ModelOperations<
       SpreadRecordForDiscriminatedUnion,
@@ -549,7 +510,6 @@ model SpreadRecordForNonDiscriminatedUnion {
 }
 
 @route("/spreadRecordNonDiscriminatedUnion")
-@operationGroup
 interface SpreadRecordNonDiscriminatedUnion
   extends ModelOperations<
       SpreadRecordForNonDiscriminatedUnion,
@@ -566,7 +526,6 @@ model SpreadRecordForNonDiscriminatedUnion2 {
 }
 
 @route("/spreadRecordNonDiscriminatedUnion2")
-@operationGroup
 interface SpreadRecordNonDiscriminatedUnion2
   extends ModelOperations<
       SpreadRecordForNonDiscriminatedUnion2,
@@ -583,7 +542,6 @@ model SpreadRecordForNonDiscriminatedUnion3 {
 }
 
 @route("/spreadRecordNonDiscriminatedUnion3")
-@operationGroup
 interface SpreadRecordNonDiscriminatedUnion3
   extends ModelOperations<
       SpreadRecordForNonDiscriminatedUnion3,

package/specs/type/property/nullable/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 models with nullable properties.")
 @scenarioService("/type/property/nullable")
@@ -18,54 +18,43 @@ model ModelTemplate<TProperty> {
 }
 
 @doc("Operations associated with getting and putting models with nullable properties.")
-interface OperationsTemplate<TModel, TDoc extends string, TDefaultDoc extends string = "null"> {
+interface OperationsTemplate<
+  TModel,
+  TDoc extends valueof string,
+  TDefaultDoc extends valueof string = "null"
+> {
   @doc("Get models that will return all properties in the model")
   @scenario
-  @scenarioDoc(
-    """
-      Expected response body:
-      ```json
-      { "requiredProperty": "foo", "nullableProperty": {allDoc}}
-      ```
-      """,
-    {
-      allDoc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected response body:
+    ```json
+    { "requiredProperty": "foo", "nullableProperty": ${TDoc}}
+    ```
+    """)
   @route("/non-null")
   @get
   getNonNull(): TModel;
 
   @doc("Get models that will return the default object")
   @scenario
-  @scenarioDoc(
-    """
-      Expected response body:
-      ```json
-      { "requiredProperty": "foo", "nullableProperty": {defaultDoc}}
-      ```
-      """,
-    {
-      defaultDoc: TDefaultDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected response body:
+    ```json
+    { "requiredProperty": "foo", "nullableProperty": ${TDefaultDoc}}
+    ```
+    """)
   @route("/null")
   @get
   getNull(): TModel;
 
   @doc("Put a body with all properties present.")
   @scenario
-  @scenarioDoc(
-    """
-      Expected request body:
-      ```json
-      { "requiredProperty": "foo", "nullableProperty": {allDoc}}
-      ```
-      """,
-    {
-      allDoc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected request body:
+    ```json
+    { "requiredProperty": "foo", "nullableProperty": ${TDoc}}
+    ```
+    """)
   @route("/non-null")
   @patch
   patchNonNull(
@@ -78,17 +67,12 @@ interface OperationsTemplate<TModel, TDoc extends string, TDefaultDoc extends st
 
   @doc("Put a body with default properties.")
   @scenario
-  @scenarioDoc(
-    """
-      Expected request body:
-      ```json
-      { "requiredProperty": "foo", "nullableProperty": {defaultDoc}}
-      ```
-      """,
-    {
-      defaultDoc: TDefaultDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected request body:
+    ```json
+    { "requiredProperty": "foo", "nullableProperty": ${TDefaultDoc}}
+    ```
+    """)
   @route("/null")
   @patch
   patchNull(
@@ -103,34 +87,29 @@ interface OperationsTemplate<TModel, TDoc extends string, TDefaultDoc extends st
 // Model with nullable string property
 model StringProperty is ModelTemplate<string>;
 @route("/string")
-@operationGroup
 interface String extends OperationsTemplate<StringProperty, "hello"> {}
 
 // Model with nullable bytes property
 model BytesProperty is ModelTemplate<bytes>;
 @route("/bytes")
-@operationGroup
 interface Bytes extends OperationsTemplate<BytesProperty, "aGVsbG8sIHdvcmxkIQ=="> {}
 
 // Model with nullable datetime property
 @doc("Model with a datetime property")
 model DatetimeProperty is ModelTemplate<utcDateTime>;
 @route("/datetime")
-@operationGroup
 interface Datetime extends OperationsTemplate<DatetimeProperty, "2022-08-26T18:38:00Z"> {}
 
 // Model with nullable duration property
 @doc("Model with a duration property")
 model DurationProperty is ModelTemplate<duration>;
 @route("/duration")
-@operationGroup
 interface Duration extends OperationsTemplate<DurationProperty, "P123DT22H14M12.011S"> {}
 
 // Model with nullable collection bytes property
 @doc("Model with collection bytes properties")
 model CollectionsByteProperty is ModelTemplate<bytes[]>;
 @route("/collections/bytes")
-@operationGroup
 interface CollectionsByte
   extends OperationsTemplate<
       CollectionsByteProperty,
@@ -146,7 +125,6 @@ model InnerModel {
 @doc("Model with collection models properties")
 model CollectionsModelProperty is ModelTemplate<InnerModel[]>;
 @route("/collections/model")
-@operationGroup
 interface CollectionsModel
   extends OperationsTemplate<
       CollectionsModelProperty,
@@ -157,6 +135,5 @@ interface CollectionsModel
 @doc("Model with collection string properties")
 model CollectionsStringProperty is ModelTemplate<string[]>;
 @route("/collections/string")
-@operationGroup
 interface CollectionsString
   extends OperationsTemplate<CollectionsStringProperty, "['hello', 'world']"> {}

package/specs/type/property/optionality/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 models with optional properties.")
 @scenarioService("/type/property/optional")
@@ -15,71 +15,55 @@ model ModelTemplate<TProperty> {
 }
 
 @doc("Operations associated with getting and putting models with optional properties.")
-interface OperationsTemplate<TModel, TDoc extends string, TDefaultDoc extends string = "{}"> {
+interface OperationsTemplate<
+  TModel,
+  TDoc extends valueof string,
+  TDefaultDoc extends valueof string = "{}"
+> {
   @doc("Get models that will return all properties in the model")
   @scenario
-  @scenarioDoc(
-    """
-      Expected response body:
-      ```json
-      {"property": {allDoc}}
-      ```
-      """,
-    {
-      allDoc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected response body:
+    ```json
+    {"property": ${TDoc}}
+    ```
+    """)
   @route("/all")
   @get
   getAll(): TModel;
 
   @doc("Get models that will return the default object")
   @scenario
-  @scenarioDoc(
-    """
-      Expected response body:
-      ```json
-      {defaultDoc}
-      ```
-      """,
-    {
-      defaultDoc: TDefaultDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected response body:
+    ```json
+    ${TDefaultDoc}
+    ```
+    """)
   @route("/default")
   @get
   getDefault(): TModel;
 
   @doc("Put a body with all properties present.")
   @scenario
-  @scenarioDoc(
-    """
-      Expected request body:
-      ```json
-      {"property": {allDoc}}
-      ```
-      """,
-    {
-      allDoc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected request body:
+    ```json
+    {"property": ${TDoc}}
+    ```
+    """)
   @route("/all")
   @put
   putAll(@body body: TModel): void;
 
   @doc("Put a body with default properties.")
   @scenario
-  @scenarioDoc(
-    """
-      Expected request body:
-      ```json
-      {defaultDoc}
-      ```
-      """,
-    {
-      defaultDoc: TDefaultDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected request body:
+    ```json
+    ${TDefaultDoc}
+    ```
+    """)
   @route("/default")
   @put
   putDefault(@body body: TModel): void;
@@ -88,48 +72,41 @@ interface OperationsTemplate<TModel, TDoc extends string, TDefaultDoc extends st
 // Model with optional string property
 model StringProperty is ModelTemplate<string>;
 @route("/string")
-@operationGroup
 interface String extends OperationsTemplate<StringProperty, "\"hello\""> {}
 
 // Model with optional bytes property
 model BytesProperty is ModelTemplate<bytes>;
 @route("/bytes")
-@operationGroup
 interface Bytes extends OperationsTemplate<BytesProperty, "\"aGVsbG8sIHdvcmxkIQ==\""> {}
 
 // Model with optional datetime property
 @doc("Model with a datetime property")
 model DatetimeProperty is ModelTemplate<utcDateTime>;
 @route("/datetime")
-@operationGroup
 interface Datetime extends OperationsTemplate<DatetimeProperty, "\"2022-08-26T18:38:00Z\""> {}
 
 // Model with optional duration property
 @doc("Model with a duration property")
 model DurationProperty is ModelTemplate<duration>;
 @route("/duration")
-@operationGroup
 interface Duration extends OperationsTemplate<DurationProperty, "\"P123DT22H14M12.011S\""> {}
 
 // Model with optional plainDate property
 @doc("Model with a plainDate property")
 model PlainDateProperty is ModelTemplate<plainDate>;
 @route("/plainDate")
-@operationGroup
 interface PlainDate extends OperationsTemplate<PlainDateProperty, "\"2022-12-12\""> {}
 
 // Model with optional  property
 @doc("Model with a plainTime property")
 model PlainTimeProperty is ModelTemplate<plainTime>;
 @route("/plainTime")
-@operationGroup
 interface PlainTime extends OperationsTemplate<PlainTimeProperty, "\"13:06:12\""> {}
 
 // Model with optional collection bytes property
 @doc("Model with collection bytes properties")
 model CollectionsByteProperty is ModelTemplate<bytes[]>;
 @route("/collections/bytes")
-@operationGroup
 interface CollectionsByte
   extends OperationsTemplate<
       CollectionsByteProperty,
@@ -140,7 +117,6 @@ interface CollectionsByte
 @doc("Model with collection models properties")
 model CollectionsModelProperty is ModelTemplate<StringProperty[]>;
 @route("/collections/model")
-@operationGroup
 interface CollectionsModel
   extends OperationsTemplate<
       CollectionsModelProperty,
@@ -151,49 +127,42 @@ interface CollectionsModel
 @doc("Model with string literal property")
 model StringLiteralProperty is ModelTemplate<"hello">;
 @route("/string/literal")
-@operationGroup
 interface StringLiteral extends OperationsTemplate<StringLiteralProperty, "\"hello\""> {}
 
 // Model with optional int literal property
 @doc("Model with int literal property")
 model IntLiteralProperty is ModelTemplate<1>;
 @route("/int/literal")
-@operationGroup
 interface IntLiteral extends OperationsTemplate<IntLiteralProperty, "1"> {}
 
 // Model with optional float literal property
 @doc("Model with float literal property")
 model FloatLiteralProperty is ModelTemplate<1.25>;
 @route("/float/literal")
-@operationGroup
 interface FloatLiteral extends OperationsTemplate<FloatLiteralProperty, "1.25"> {}
 
 // Model with optional boolean literal property
 @doc("Model with boolean literal property")
 model BooleanLiteralProperty is ModelTemplate<true>;
 @route("/boolean/literal")
-@operationGroup
 interface BooleanLiteral extends OperationsTemplate<BooleanLiteralProperty, "true"> {}
 
 // Model with union of string literal property
 @doc("Model with union of string literal property")
 model UnionStringLiteralProperty is ModelTemplate<"hello" | "world">;
 @route("/union/string/literal")
-@operationGroup
 interface UnionStringLiteral extends OperationsTemplate<UnionStringLiteralProperty, "\"world\""> {}
 
 // Model with union of int literal property
 @doc("Model with union of int literal property")
 model UnionIntLiteralProperty is ModelTemplate<1 | 2>;
 @route("/union/int/literal")
-@operationGroup
 interface UnionIntLiteral extends OperationsTemplate<UnionIntLiteralProperty, "2"> {}
 
 // Model with union of float literal property
 @doc("Model with union of float literal property")
 model UnionFloatLiteralProperty is ModelTemplate<1.25 | 2.375>;
 @route("/union/float/literal")
-@operationGroup
 interface UnionFloatLiteral extends OperationsTemplate<UnionFloatLiteralProperty, "2.375"> {}
 
 @doc("Model with required and optional properties")
@@ -206,7 +175,6 @@ model RequiredAndOptionalProperty {
 }
 @doc("Test optional and required properties")
 @route("/requiredAndOptional")
-@operationGroup
 interface RequiredAndOptional {
   @doc("Get models that will return all properties in the model")
   @scenario