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

package/specs/server/versions/versioned/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;
 
 /**
@@ -30,13 +31,11 @@ enum Versions {
   /**
    * The version 2022-12-01-preview.
    */
-  @useDependency(global.Azure.Core.Versions.v1_0_Preview_2)
   v2021_01_01_preview: "2021-01-01-preview",
 
   /**
    * The version 2022-12-01-preview.
    */
-  @useDependency(global.Azure.Core.Versions.v1_0_Preview_2)
   v2022_12_01_preview: "2022-12-01-preview",
 }
 

package/specs/special-headers/conditional-request/main.tsp

@@ -2,11 +2,11 @@ import "@typespec/http";
 import "@typespec/versioning";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 using TypeSpec.Versioning;
 
 @doc("Illustrates conditional request headers")
-@supportedBy("dpg")
 @scenarioService("/special-headers/conditional-request")
 namespace SpecialHeaders.ConditionalRequest;
 

package/specs/special-headers/repeatability/main.tsp

@@ -2,11 +2,11 @@ import "@typespec/http";
 import "@typespec/versioning";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
+using Http;
+using SpecLib;
 using TypeSpec.Versioning;
 
 @doc("Illustrates OASIS repeatability headers")
-@supportedBy("dpg")
 @scenarioService("/special-headers/repeatability")
 namespace SpecialHeaders.Repeatability;
 

package/specs/special-words/main.tsp

@@ -2,8 +2,8 @@ import "@typespec/http";
 import "@typespec/spec-lib";
 import "./dec.js";
 
-using TypeSpec.Http;
-using Azure.ClientGenerator.Core;
+using Http;
+using SpecLib;
 
 /**
  * Scenarios to verify that reserved words can be used in service and generators will handle it appropriately.
@@ -52,7 +52,6 @@ namespace SpecialWords;
  * Test reserved words as operation name.
  */
 @route("/operations")
-@operationGroup
 interface Operations {
   @opNameScenario("and") and(): void;
   @opNameScenario("as") as(): void;
@@ -93,7 +92,6 @@ interface Operations {
  * Verify reserved words as parameter name.
  */
 @route("/parameters")
-@operationGroup
 interface Parameters {
   @paramNameScenario("and") withAnd(@query and: string): void;
   @paramNameScenario("as") withAs(@query as: string): void;
@@ -139,7 +137,6 @@ interface Parameters {
  * Verify model names
  */
 @route("/models")
-@operationGroup
 namespace Models {
   model Base {
     name: string;
@@ -217,7 +214,6 @@ namespace Models {
  * Verify model names
  */
 @route("/model-properties")
-@operationGroup
 namespace ModelProperties {
   model SameAsModel {
     SameAsModel: string;

package/specs/special-words/mockapi.ts

@@ -2,7 +2,7 @@ import { MockRequest, passOnSuccess, ScenarioMockApi } from "@typespec/spec-api"
 
 export const Scenarios: Record<string, ScenarioMockApi> = {};
 
-Scenarios.Special_Words_Model_Properties_Same_As_Model = passOnSuccess({
+Scenarios.SpecialWords_ModelProperties_sameAsModel = passOnSuccess({
   uri: "/special-words/model-properties/same-as-model",
   method: "post",
   request: {

package/specs/type/array/main.tsp

@@ -1,85 +1,67 @@
 import "@typespec/http";
 import "@typespec/spec-lib";
 
-using TypeSpec.Http;
-using Azure.ClientGenerator.Core;
+using Http;
+using SpecLib;
 
 @doc("Illustrates various types of arrays.")
 @scenarioService("/type/array")
 namespace Type.Array;
 
 @doc("Template to have Array operations")
-interface ArrayOperations<TArr, TDoc extends string> {
+interface ArrayOperations<TArr, TDoc extends valueof string> {
   @scenario
-  @scenarioDoc(
-    """
-      Expected Array response body:
-      ```json
-      {doc}
-      ```
-      """,
-    {
-      doc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected Array response body:
+    ```json
+    ${TDoc}
+    ```
+    """)
   @get
   get(): TArr;
 
   @scenario
-  @scenarioDoc(
-    """
-      Expected Array input body:
-      ```json
-      {doc}
-      ```
-      """,
-    {
-      doc: TDoc,
-    }
-  )
+  @scenarioDoc("""
+    Expected Array input body:
+    ```json
+    ${TDoc}
+    ```
+    """)
   @put
   put(@body body: TArr): void;
 }
 
 @doc("Array of int32 values")
 @route("/int32")
-@operationGroup
 interface Int32Value extends ArrayOperations<int32[], "[1, 2]"> {}
 
 @doc("Array of int64 values")
 @route("/int64")
-@operationGroup
 interface Int64Value
   extends ArrayOperations<int64[], "[0x7FFFFFFFFFFFFFFF, -0x7FFFFFFFFFFFFFFF]"> {}
 
 @doc("Array of boolean values")
 @route("/boolean")
-@operationGroup
 interface BooleanValue extends ArrayOperations<boolean[], "[true, false]"> {}
 
 @doc("Array of string values")
 @route("/string")
-@operationGroup
 interface StringValue extends ArrayOperations<string[], "['hello', '']"> {}
 
 @doc("Array of float values")
 @route("/float32")
-@operationGroup
 interface Float32Value extends ArrayOperations<float32[], "[43.125]"> {}
 
 @doc("Array of datetime values")
 @route("/datetime")
-@operationGroup
 interface DatetimeValue extends ArrayOperations<utcDateTime[], "['2022-08-26T18:38:00Z']"> {}
 
 @doc("Array of duration values")
 @route("/duration")
-@operationGroup
 interface DurationValue extends ArrayOperations<duration[], "['P123DT22H14M12.011S']"> {}
 
 @doc("Array of unknown values")
 @route("/unknown")
-@operationGroup
 interface UnknownValue extends ArrayOperations<unknown[], "[1, 'hello', 'k3': null]"> {}
 
 @doc("Array inner model")
@@ -92,39 +74,33 @@ model InnerModel {
 
 @doc("Array of model values")
 @route("/model")
-@operationGroup
 interface ModelValue
   extends ArrayOperations<InnerModel[], "[{'property': 'hello'}, {'property': 'world'}]"> {}
 
 alias NullableFloat = float32 | null;
 @doc("Array of nullable float values")
 @route("/nullable-float")
-@operationGroup
 interface NullableFloatValue extends ArrayOperations<NullableFloat[], "[1.25, null, 3.0]"> {}
 
 alias NullableInt32 = int32 | null;
 @doc("Array of nullable int32 values")
 @route("/nullable-int32")
-@operationGroup
 interface NullableInt32Value extends ArrayOperations<NullableInt32[], "[1, null, 3]"> {}
 
 alias NullableBoolean = boolean | null;
 @doc("Array of nullable boolean values")
 @route("/nullable-boolean")
-@operationGroup
 interface NullableBooleanValue extends ArrayOperations<NullableBoolean[], "[true, null, false]"> {}
 
 alias NullableString = string | null;
 @doc("Array of nullable string values")
 @route("/nullable-string")
-@operationGroup
 interface NullableStringValue
   extends ArrayOperations<NullableString[], "['hello', null, 'world']"> {}
 
 alias NullableModel = InnerModel | null;
 @doc("Array of nullable model values")
 @route("/nullable-model")
-@operationGroup
 interface NullableModelValue
   extends ArrayOperations<
       NullableModel[],

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")