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

package/specs/type/dictionary/main.tsp

@@ -1,54 +1,42 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
-using Azure.ClientGenerator.Core;
+using Http;
+using SpecLib;
 
 @doc("Illustrates various of dictionaries.")
 @scenarioService("/type/dictionary")
 namespace Type.Dictionary;
 
 @doc("Template to have dictionary operations")
-interface DictionaryOperations<TDict, TDoc extends string> {
+interface DictionaryOperations<TDict, TDoc extends valueof string> {
   @scenario
-  @scenarioDoc(
-    """
-      Expected dictionary response body:
-      ```json
-      {doc}
-      ```
-      """,
-    {
-      doc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected dictionary response body:
+    ```json
+    ${TDoc}
+    ```
+    """)
   @get
   get(): TDict;
 
   @scenario
-  @scenarioDoc(
-    """
-      Expected dictionary input body:
-      ```json
-      {doc}
-      ```
-      """,
-    {
-      doc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected dictionary input body:
+    ```json
+    ${TDoc}
+    ```
+    """)
   @put
   put(@body body: TDict): void;
 }
 
 @doc("Dictionary of int32 values")
 @route("/int32")
-@operationGroup
 interface Int32Value extends DictionaryOperations<Record<int32>, "{'k1': 1, 'k2': 2}"> {}
 
 @doc("Dictionary of int64 values")
 @route("/int64")
-@operationGroup
 interface Int64Value
   extends DictionaryOperations<
       Record<int64>,
@@ -57,34 +45,28 @@ interface Int64Value
 
 @doc("Dictionary of boolean values")
 @route("/boolean")
-@operationGroup
 interface BooleanValue extends DictionaryOperations<Record<boolean>, "{'k1': true, 'k2': false}"> {}
 
 @doc("Dictionary of string values")
 @route("/string")
-@operationGroup
 interface StringValue extends DictionaryOperations<Record<string>, "{'k1': 'hello', 'k2': ''}"> {}
 
 @doc("Dictionary of float values")
 @route("/float32")
-@operationGroup
 interface Float32Value extends DictionaryOperations<Record<float32>, "{'k1': 43.125}"> {}
 
 @doc("Dictionary of datetime values")
 @route("/datetime")
-@operationGroup
 interface DatetimeValue
   extends DictionaryOperations<Record<utcDateTime>, "{'k1': '2022-08-26T18:38:00Z'}"> {}
 
 @doc("Dictionary of duration values")
 @route("/duration")
-@operationGroup
 interface DurationValue
   extends DictionaryOperations<Record<duration>, "{'k1': 'P123DT22H14M12.011S'}"> {}
 
 @doc("Dictionary of unknown values")
 @route("/unknown")
-@operationGroup
 interface UnknownValue
   extends DictionaryOperations<Record<unknown>, "{'k1': 1, 'k2': 'hello', 'k3': null}"> {}
 
@@ -98,7 +80,6 @@ model InnerModel {
 
 @doc("Dictionary of model values")
 @route("/model")
-@operationGroup
 interface ModelValue
   extends DictionaryOperations<
       Record<InnerModel>,
@@ -107,7 +88,6 @@ interface ModelValue
 
 @doc("Dictionary of model values")
 @route("/model/recursive")
-@operationGroup
 interface RecursiveModelValue
   extends DictionaryOperations<
       Record<InnerModel>,
@@ -117,6 +97,5 @@ interface RecursiveModelValue
 alias NullableFloat = float32 | null;
 @doc("Dictionary of nullable float values")
 @route("/nullable-float")
-@operationGroup
 interface NullableFloatValue
   extends DictionaryOperations<Record<NullableFloat>, "{'k1': 1.25, 'k2': 0.5, 'k3': null}"> {}

package/specs/type/enum/extensible/main.tsp

@@ -1,7 +1,8 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 
 @scenarioService("/type/enum/extensible")
 namespace Type.Enum.Extensible;

package/specs/type/enum/fixed/main.tsp

@@ -1,8 +1,8 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using Azure.Core;
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 
 @scenarioService("/type/enum/fixed")
 namespace Type.Enum.Fixed;

package/specs/type/model/empty/main.tsp

@@ -1,7 +1,8 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 
 @doc("Illustrates usage of empty model used in operation's parameters and responses.")
 @scenarioService("/type/model/empty")

package/specs/type/model/inheritance/enum-discriminator/main.tsp

@@ -1,8 +1,8 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
-using Azure.Core;
+using Http;
+using SpecLib;
 
 @doc("Illustrates inheritance with enum discriminator.")
 @scenarioService("/type/model/inheritance/enum-discriminator")

package/specs/type/model/inheritance/nested-discriminator/main.tsp

@@ -1,7 +1,8 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 
 @doc("Illustrates multiple level inheritance with multiple discriminators.")
 @scenarioService("/type/model/inheritance/nested-discriminator")

package/specs/type/model/inheritance/not-discriminated/main.tsp

@@ -1,7 +1,8 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 
 @doc("Illustrates not-discriminated inheritance model.")
 @scenarioService("/type/model/inheritance/not-discriminated")

package/specs/type/model/inheritance/recursive/main.tsp

@@ -1,7 +1,8 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 
 @doc("Illustrates inheritance recursion")
 @scenarioService("/type/model/inheritance/recursive")

package/specs/type/model/inheritance/single-discriminator/main.tsp

@@ -1,7 +1,8 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 
 @doc("Illustrates inheritance with single discriminator.")
 @scenarioService("/type/model/inheritance/single-discriminator")

package/specs/type/model/templated/main.tsp

@@ -1,8 +1,8 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
-using Azure.ClientGenerator.Core;
+using Http;
+using SpecLib;
 
 /**
  * Illustrates the model templated cases. There is a base templated type and an instantiated type extending from it.

package/specs/type/model/usage/main.tsp

@@ -1,7 +1,8 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 
 /**
  * Those tests are meant to test different behavior of records if they are used as input, output or both.

package/specs/type/model/visibility/main.tsp

@@ -1,7 +1,8 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 
 @doc("Illustrates models with visibility properties.")
 @scenarioService("/type/model/visibility")

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,