@typespec/rest 0.52.0-dev.1 → 0.52.0-dev.3

package/dist/src/lib.d.ts

@@ -20,7 +20,7 @@ declare const restLib: import("@typespec/compiler").TypeSpecLibrary<{
     "shared-route-unspecified-action-name": {
         readonly default: import("@typespec/compiler").CallableMessage<["decoratorName"]>;
     };
-}, Record<string, any>>;
+}, Record<string, any>, never>;
 declare const reportDiagnostic: <C extends "not-key-type" | "resource-missing-key" | "resource-missing-error" | "duplicate-key" | "duplicate-parent-key" | "invalid-action-name" | "shared-route-unspecified-action-name", M extends keyof {
     "not-key-type": {
         readonly default: "Cannot copy keys from a non-key type (KeysOf<T> or ParentKeysOf<T>)";

package/dist/src/lib.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAkDA,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;uBAAuC,CAAC;AACrD,QAAA,MAAQ,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAE,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sDAAE,iBAAiB,0BAAY,CAAC;AAE1E,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC"}
+{"version":3,"file":"lib.d.ts","sourceRoot":"","sources":["../../src/lib.ts"],"names":[],"mappings":"AAkDA,QAAA,MAAM,OAAO;;;;;;;;;;;;;;;;;;;;;;8BAAuC,CAAC;AACrD,QAAA,MAAQ,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mBAAE,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;sDAAE,iBAAiB,0BAAY,CAAC;AAE1E,OAAO,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,OAAO,EAAE,CAAC"}

package/dist/src/testing/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAqB,mBAAmB,EAAE,MAAM,4BAA4B,CAAC;AAGpF,eAAO,MAAM,eAAe,EAAE,mBAG5B,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,mBAAmB,EACpB,MAAM,4BAA4B,CAAC;AAEpC,eAAO,MAAM,eAAe,EAAE,mBAG5B,CAAC"}

package/dist/src/testing/index.js

@@ -1,8 +1,6 @@
-import { resolvePath } from "@typespec/compiler";
-import { createTestLibrary } from "@typespec/compiler/testing";
-import { fileURLToPath } from "url";
+import { createTestLibrary, findTestPackageRoot, } from "@typespec/compiler/testing";
 export const RestTestLibrary = createTestLibrary({
     name: "@typespec/rest",
-    packageRoot: resolvePath(fileURLToPath(import.meta.url), "../../../../"),
+    packageRoot: await findTestPackageRoot(import.meta.url),
 });
 //# sourceMappingURL=index.js.map

package/dist/src/testing/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,WAAW,EAAE,MAAM,oBAAoB,CAAC;AACjD,OAAO,EAAE,iBAAiB,EAAuB,MAAM,4BAA4B,CAAC;AACpF,OAAO,EAAE,aAAa,EAAE,MAAM,KAAK,CAAC;AAEpC,MAAM,CAAC,MAAM,eAAe,GAAwB,iBAAiB,CAAC;IACpE,IAAI,EAAE,gBAAgB;IACtB,WAAW,EAAE,WAAW,CAAC,aAAa,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,cAAc,CAAC;CACzE,CAAC,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/testing/index.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,iBAAiB,EACjB,mBAAmB,GAEpB,MAAM,4BAA4B,CAAC;AAEpC,MAAM,CAAC,MAAM,eAAe,GAAwB,iBAAiB,CAAC;IACpE,IAAI,EAAE,gBAAgB;IACtB,WAAW,EAAE,MAAM,mBAAmB,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC;CACxD,CAAC,CAAC"}

package/dist/vitest.config.d.ts

@@ -0,0 +1,3 @@
+declare const _default: import("vite").UserConfig;
+export default _default;
+//# sourceMappingURL=vitest.config.d.ts.map

package/dist/vitest.config.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"vitest.config.d.ts","sourceRoot":"","sources":["../vitest.config.ts"],"names":[],"mappings":";AAEA,wBAWG"}

package/dist/vitest.config.js

@@ -0,0 +1,14 @@
+import { defineConfig } from "vitest/config";
+export default defineConfig({
+    test: {
+        environment: "node",
+        isolate: false,
+        coverage: {
+            reporter: ["cobertura", "json", "text"],
+        },
+        outputFile: {
+            junit: "./test-results.xml",
+        },
+    },
+});
+//# sourceMappingURL=vitest.config.js.map

package/dist/vitest.config.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"vitest.config.js","sourceRoot":"","sources":["../vitest.config.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAE7C,eAAe,YAAY,CAAC;IAC1B,IAAI,EAAE;QACJ,WAAW,EAAE,MAAM;QACnB,OAAO,EAAE,KAAK;QACd,QAAQ,EAAE;YACR,QAAQ,EAAE,CAAC,WAAW,EAAE,MAAM,EAAE,MAAM,CAAC;SACxC;QACD,UAAU,EAAE;YACV,KAAK,EAAE,oBAAoB;SAC5B;KACF;CACF,CAAC,CAAC"}

package/lib/resource.tsp

@@ -16,165 +16,182 @@ model ResourceError {
 }
 
 /**
- * Dynamically gathers keys of the model type T.
- * @template T The target model.
+ * Dynamically gathers keys of the model type `Resource`.
+ *
+ * @template Resource The target resource model.
  */
-@doc("Dynamically gathers keys of the model type T.")
+@doc("Dynamically gathers keys of the model type Resource.")
 @copyResourceKeyParameters
-@friendlyName("{name}Key", T)
-model KeysOf<T> {}
+@friendlyName("{name}Key", Resource)
+model KeysOf<Resource> {}
 
 /**
- * Dynamically gathers parent keys of the model type T.
- * @template T The target model.
+ * Dynamically gathers parent keys of the model type `Resource`.
+ *
+ * @template Resource The target resource model.
  */
-@doc("Dynamically gathers parent keys of the model type T.")
+@doc("Dynamically gathers parent keys of the model type Resource.")
 @copyResourceKeyParameters("parent")
-@friendlyName("{name}ParentKey", T)
-model ParentKeysOf<T> {}
+@friendlyName("{name}ParentKey", Resource)
+model ParentKeysOf<Resource> {}
 
 /**
- * Represents operation parameters for resource TResource.
- * @template TResource The resource model.
+ * Represents operation parameters for the resource of type `Resource`.
+ *
+ * @template Resource The resource model.
  */
-@doc("Represents operation parameters for resource TResource.")
-model ResourceParameters<TResource extends {}> {
-  ...KeysOf<TResource>;
+@doc("Represents operation parameters for resource Resource.")
+model ResourceParameters<Resource extends {}> {
+  ...KeysOf<Resource>;
 }
 
 /**
- * Represents collection operation parameters for resource TResource.
- * @template TResource The resource model.
+ * Represents collection operation parameters for the resource of type `Resource`.
+ *
+ * @template Resource The resource model.
  */
-@doc("Represents collection operation parameters for resource TResource.")
-model ResourceCollectionParameters<TResource extends {}> {
-  ...ParentKeysOf<TResource>;
+@doc("Represents collection operation parameters for resource Resource.")
+model ResourceCollectionParameters<Resource extends {}> {
+  ...ParentKeysOf<Resource>;
 }
 
 /**
- * Represent the resource GET operation.
- * @template TResource The resource model.
- * @template TError The error response.
+ * Represents the resource GET operation.
+ *
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-@Private.validateHasKey(TResource)
-@Private.validateIsError(TError)
-interface ResourceRead<TResource extends {}, TError> {
+@Private.validateHasKey(Resource)
+@Private.validateIsError(Error)
+interface ResourceRead<Resource extends {}, Error> {
   /**
    * Gets an instance of the resource.
-   * @template TResource The resource model.
+   *
+   * @template Resource The resource model.
    */
   @autoRoute
   @doc("Gets an instance of the resource.")
-  @readsResource(TResource)
-  get(...ResourceParameters<TResource>): TResource | TError;
+  @readsResource(Resource)
+  get(...ResourceParameters<Resource>): Resource | Error;
 }
 
 /**
  * Resource create operation completed successfully.
- * @template T The resource model that was created.
+ *
+ * @template Resource The resource model that was created.
  */
 @doc("Resource create operation completed successfully.")
-model ResourceCreatedResponse<T> {
+model ResourceCreatedResponse<Resource> {
   ...CreatedResponse;
-  @body body: T;
+  @body body: Resource;
 }
 
 /**
  * Resource create or replace operation template.
- * @template TResource The resource model to create or replace.
- * @template TError The error response.
+ *
+ * @template Resource The resource model to create or replace.
+ * @template Error The error response.
  */
-interface ResourceCreateOrReplace<TResource extends {}, TError> {
+interface ResourceCreateOrReplace<Resource extends {}, Error> {
   /**
    * Creates or replaces a instance of the resource.
-   * @template TResource The resource model to create or replace.
-   * @template TError The error response.
+   *
+   * @template Resource The resource model to create or replace.
+   * @template Error The error response.
    */
   @autoRoute
   @doc("Creates or replaces an instance of the resource.")
-  @createsOrReplacesResource(TResource)
+  @createsOrReplacesResource(Resource)
   createOrReplace(
-    ...ResourceParameters<TResource>,
-    @body resource: ResourceCreateModel<TResource>,
-  ): TResource | ResourceCreatedResponse<TResource> | TError;
+    ...ResourceParameters<Resource>,
+    @body resource: ResourceCreateModel<Resource>,
+  ): Resource | ResourceCreatedResponse<Resource> | Error;
 }
 
 /**
  * Resource create or update operation model.
- * @template TResource The resource model to create or update.
+ *
+ * @template Resource The resource model to create or update.
  */
-@friendlyName("{name}Update", TResource)
-model ResourceCreateOrUpdateModel<TResource extends {}>
-  is OptionalProperties<UpdateableProperties<DefaultKeyVisibility<TResource, "read">>>;
+@friendlyName("{name}Update", Resource)
+model ResourceCreateOrUpdateModel<Resource extends {}>
+  is OptionalProperties<UpdateableProperties<DefaultKeyVisibility<Resource, "read">>>;
 
 /**
  * Resource create or update operation template.
- * @template TResource The resource model to create or update.
- * @template TError The error response.
+ *
+ * @template Resource The resource model to create or update.
+ * @template Error The error response.
  */
-interface ResourceCreateOrUpdate<TResource extends {}, TError> {
+interface ResourceCreateOrUpdate<Resource extends {}, Error> {
   /**
    * Creates or update an instance of the resource.
-   * @template TResource The resource model to create or update.
-   * @template TError The error response.
+   *
+   * @template Resource The resource model to create or update.
+   * @template Error The error response.
    */
   @autoRoute
   @doc("Creates or update an instance of the resource.")
-  @createsOrUpdatesResource(TResource)
+  @createsOrUpdatesResource(Resource)
   createOrUpdate(
-    ...ResourceParameters<TResource>,
-    @body resource: ResourceCreateOrUpdateModel<TResource>,
-  ): TResource | ResourceCreatedResponse<TResource> | TError;
+    ...ResourceParameters<Resource>,
+    @body resource: ResourceCreateOrUpdateModel<Resource>,
+  ): Resource | ResourceCreatedResponse<Resource> | Error;
 }
 
 /**
  * Resource create operation model.
- * @template TResource The resource model to create.
+ *
+ * @template Resource The resource model to create.
  */
-@friendlyName("{name}Create", TResource)
+@friendlyName("{name}Create", Resource)
 @withVisibility("create")
-model ResourceCreateModel<TResource extends {}> is DefaultKeyVisibility<TResource, "read">;
+model ResourceCreateModel<Resource extends {}> is DefaultKeyVisibility<Resource, "read">;
 
 /**
  * Resource create operation template.
- * @template TResource The resource model to create.
- * @template TError The error response.
+ *
+ * @template Resource The resource model to create.
+ * @template Error The error response.
  */
-interface ResourceCreate<TResource extends {}, TError> {
+interface ResourceCreate<Resource extends {}, Error> {
   /**
    * Creates a new instance of the resource.
-   * @template TResource The resource model to create.
-   * @template TError The error response.
+   *
+   * @template Resource The resource model to create.
+   * @template Error The error response.
    */
   @autoRoute
   @doc("Creates a new instance of the resource.")
-  @createsResource(TResource)
+  @createsResource(Resource)
   create(
-    ...ResourceCollectionParameters<TResource>,
-    @body resource: ResourceCreateModel<TResource>,
-  ): TResource | ResourceCreatedResponse<TResource> | TError;
+    ...ResourceCollectionParameters<Resource>,
+    @body resource: ResourceCreateModel<Resource>,
+  ): Resource | ResourceCreatedResponse<Resource> | Error;
 }
 
 /**
  * Resource update operation template.
- * @template TResource The resource model to update.
- * @template TError The error response.
+ *
+ * @template Resource The resource model to update.
+ * @template Error The error response.
  */
-@Private.validateHasKey(TResource)
-@Private.validateIsError(TError)
-interface ResourceUpdate<TResource extends {}, TError> {
+@Private.validateHasKey(Resource)
+@Private.validateIsError(Error)
+interface ResourceUpdate<Resource extends {}, Error> {
   /**
    * Updates an existing instance of the resource.
-   * @template TResource The resource model to update.
-   * @template TError The error response.
+   *
+   * @template Resource The resource model to update.
+   * @template Error The error response.
    */
   @autoRoute
   @doc("Updates an existing instance of the resource.")
-  @updatesResource(TResource)
+  @updatesResource(Resource)
   update(
-    ...ResourceParameters<TResource>,
-    @body properties: ResourceCreateOrUpdateModel<TResource>,
-  ): TResource | TError;
+    ...ResourceParameters<Resource>,
+    @body properties: ResourceCreateOrUpdateModel<Resource>,
+  ): Resource | Error;
 }
 
 @doc("Resource deleted successfully.")
@@ -186,303 +203,332 @@ model ResourceDeletedResponse {
 
 /**
  * Resource delete operation template.
- * @template TResource The resource model to delete.
- * @template TError The error response.
+ *
+ * @template Resource The resource model to delete.
+ * @template Error The error response.
  */
-@Private.validateHasKey(TResource)
-@Private.validateIsError(TError)
-interface ResourceDelete<TResource extends {}, TError> {
+@Private.validateHasKey(Resource)
+@Private.validateIsError(Error)
+interface ResourceDelete<Resource extends {}, Error> {
   /**
    * Deletes an existing instance of the resource.
-   * @template TResource The resource model to delete.
-   * @template TError The error response.
+   *
+   * @template Resource The resource model to delete.
+   * @template Error The error response.
    */
   @autoRoute
   @doc("Deletes an existing instance of the resource.")
-  @deletesResource(TResource)
-  delete(...ResourceParameters<TResource>): ResourceDeletedResponse | TError;
+  @deletesResource(Resource)
+  delete(...ResourceParameters<Resource>): ResourceDeletedResponse | Error;
 }
 
 /**
  * Structure for a paging response using `value` and `nextLink` to represent pagination.
- * This only provides the model structure and not actual pagination support.
- * See https://github.com/microsoft/typespec/issues/705 for general paging support.
- * @template T The resource type of the collection.
+ *
+ * This only provides the model structure and not actual pagination support. See
+ * https://github.com/microsoft/typespec/issues/705 for general paging support.
+ *
+ * @template Resource The resource type of the collection.
  */
-@doc("Paged response of {name} items", T)
-@friendlyName("{name}CollectionWithNextLink", T)
-model CollectionWithNextLink<T extends {}> {
+@doc("Paged response of {name} items", Resource)
+@friendlyName("{name}CollectionWithNextLink", Resource)
+model CollectionWithNextLink<Resource extends {}> {
   @doc("The items on this page")
-  value: T[];
+  value: Resource[];
 
   @doc("The link to the next page of items")
-  nextLink?: ResourceLocation<T>;
+  nextLink?: ResourceLocation<Resource>;
 }
 
 /**
  * Resource list operation template.
- * @template TResource The resource model to list.
- * @template TError The error response.
+ *
+ * @template Resource The resource model to list.
+ * @template Error The error response.
  */
-interface ResourceList<TResource extends {}, TError> {
+interface ResourceList<Resource extends {}, Error> {
   /**
    * Lists all instances of the resource.
-   * @template TResource The resource model to list.
-   * @template TError The error response.
+   *
+   * @template Resource The resource model to list.
+   * @template Error The error response.
    */
   @autoRoute
   @doc("Lists all instances of the resource.")
-  @listsResource(TResource)
-  list(...ResourceCollectionParameters<TResource>): CollectionWithNextLink<TResource> | TError;
+  @listsResource(Resource)
+  list(...ResourceCollectionParameters<Resource>): CollectionWithNextLink<Resource> | Error;
 }
 
 /**
  * Resource operation templates for resource instances.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-@Private.validateHasKey(TResource)
-@Private.validateIsError(TError)
-interface ResourceInstanceOperations<TResource extends {}, TError>
-  extends ResourceRead<TResource, TError>,
-    ResourceUpdate<TResource, TError>,
-    ResourceDelete<TResource, TError> {}
+@Private.validateHasKey(Resource)
+@Private.validateIsError(Error)
+interface ResourceInstanceOperations<Resource extends {}, Error>
+  extends ResourceRead<Resource, Error>,
+    ResourceUpdate<Resource, Error>,
+    ResourceDelete<Resource, Error> {}
 
 /**
  * Resource operation templates for resource collections.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-@Private.validateHasKey(TResource)
-@Private.validateIsError(TError)
-interface ResourceCollectionOperations<TResource extends {}, TError>
-  extends ResourceCreate<TResource, TError>,
-    ResourceList<TResource, TError> {}
+@Private.validateHasKey(Resource)
+@Private.validateIsError(Error)
+interface ResourceCollectionOperations<Resource extends {}, Error>
+  extends ResourceCreate<Resource, Error>,
+    ResourceList<Resource, Error> {}
 
 /**
  * Resource operation templates for resources.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-@Private.validateHasKey(TResource)
-@Private.validateIsError(TError)
-interface ResourceOperations<TResource extends {}, TError>
-  extends ResourceInstanceOperations<TResource, TError>,
-    ResourceCollectionOperations<TResource, TError> {}
+@Private.validateHasKey(Resource)
+@Private.validateIsError(Error)
+interface ResourceOperations<Resource extends {}, Error>
+  extends ResourceInstanceOperations<Resource, Error>,
+    ResourceCollectionOperations<Resource, Error> {}
 
 /**
  * Singleton resource read operation template.
- * @template TSingleton The singleton resource model.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Singleton The singleton resource model.
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-@Private.validateHasKey(TResource)
-@Private.validateIsError(TError)
-interface SingletonResourceRead<TSingleton extends {}, TResource extends {}, TError> {
+@Private.validateHasKey(Resource)
+@Private.validateIsError(Error)
+interface SingletonResourceRead<Singleton extends {}, Resource extends {}, Error> {
   /**
    * Gets the singleton resource.
-   * @template TSingleton The singleton resource model.
-   * @template TResource The resource model.
+   *
+   * @template Singleton The singleton resource model.
+   * @template Resource The resource model.
    */
   @autoRoute
   @doc("Gets the singleton resource.")
-  @segmentOf(TSingleton)
-  @readsResource(TSingleton)
-  get(...ResourceParameters<TResource>): TSingleton | TError;
+  @segmentOf(Singleton)
+  @readsResource(Singleton)
+  get(...ResourceParameters<Resource>): Singleton | Error;
 }
 
 /**
  * Singleton resource update operation template.
- * @template TSingleton The singleton resource model.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Singleton The singleton resource model.
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-@Private.validateHasKey(TResource)
-@Private.validateIsError(TError)
-interface SingletonResourceUpdate<TSingleton extends {}, TResource extends {}, TError> {
+@Private.validateHasKey(Resource)
+@Private.validateIsError(Error)
+interface SingletonResourceUpdate<Singleton extends {}, Resource extends {}, Error> {
   /**
    * Updates the singleton resource.
-   * @template TSingleton The singleton resource model.
-   * @template TResource The resource model.
+   *
+   * @template Singleton The singleton resource model.
+   * @template Resource The resource model.
    */
   @autoRoute
   @doc("Updates the singleton resource.")
-  @segmentOf(TSingleton)
-  @updatesResource(TSingleton)
+  @segmentOf(Singleton)
+  @updatesResource(Singleton)
   update(
-    ...ResourceParameters<TResource>,
+    ...ResourceParameters<Resource>,
 
     @body
-    properties: ResourceCreateOrUpdateModel<TSingleton>,
-  ): TSingleton | TError;
+    properties: ResourceCreateOrUpdateModel<Singleton>,
+  ): Singleton | Error;
 }
 
 /**
  * Singleton resource operation templates for singleton resource instances.
- * @template TSingleton The singleton resource model.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Singleton The singleton resource model.
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-interface SingletonResourceOperations<TSingleton extends {}, TResource extends {}, TError>
-  extends SingletonResourceRead<TSingleton, TResource, TError>,
-    SingletonResourceUpdate<TSingleton, TResource, TError> {}
+interface SingletonResourceOperations<Singleton extends {}, Resource extends {}, Error>
+  extends SingletonResourceRead<Singleton, Resource, Error>,
+    SingletonResourceUpdate<Singleton, Resource, Error> {}
 
 /**
  * Extension resource read operation template.
- * @template TExtension The extension resource model.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Extension The extension resource model.
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-@Private.validateHasKey(TResource)
-@Private.validateIsError(TError)
-interface ExtensionResourceRead<TExtension extends {}, TResource extends {}, TError> {
+@Private.validateHasKey(Resource)
+@Private.validateIsError(Error)
+interface ExtensionResourceRead<Extension extends {}, Resource extends {}, Error> {
   /**
    * Gets an instance of the extension resource.
-   * @template TExtension The extension resource model.
-   * @template TResource The resource model.
+   *
+   * @template Extension The extension resource model.
+   * @template Resource The resource model.
    */
   @autoRoute
   @doc("Gets an instance of the extension resource.")
-  @readsResource(TExtension)
-  get(...ResourceParameters<TResource>, ...ResourceParameters<TExtension>): TExtension | TError;
+  @readsResource(Extension)
+  get(...ResourceParameters<Resource>, ...ResourceParameters<Extension>): Extension | Error;
 }
 
 /**
  * Extension resource create or update operation template.
- * @template TExtension The extension resource model.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Extension The extension resource model.
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-interface ExtensionResourceCreateOrUpdate<TExtension extends {}, TResource extends {}, TError> {
+interface ExtensionResourceCreateOrUpdate<Extension extends {}, Resource extends {}, Error> {
   /**
    * Creates or update an instance of the extension resource.
-   * @template TExtension The extension resource model.
-   * @template TResource The resource model.
+   *
+   * @template Extension The extension resource model.
+   * @template Resource The resource model.
    */
   @autoRoute
   @doc("Creates or update an instance of the extension resource.")
-  @createsOrUpdatesResource(TExtension)
+  @createsOrUpdatesResource(Extension)
   createOrUpdate(
-    ...ResourceParameters<TResource>,
-    ...ResourceParameters<TExtension>,
-    @body resource: ResourceCreateOrUpdateModel<TExtension>,
-  ): TExtension | ResourceCreatedResponse<TExtension> | TError;
+    ...ResourceParameters<Resource>,
+    ...ResourceParameters<Extension>,
+    @body resource: ResourceCreateOrUpdateModel<Extension>,
+  ): Extension | ResourceCreatedResponse<Extension> | Error;
 }
 
 /**
  * Extension resource create operation template.
- * @template TExtension The extension resource model.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Extension The extension resource model.
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-interface ExtensionResourceCreate<TExtension extends {}, TResource extends {}, TError> {
+interface ExtensionResourceCreate<Extension extends {}, Resource extends {}, Error> {
   /**
    * Creates a new instance of the extension resource.
-   * @template TExtension The extension resource model.
-   * @template TResource The resource model.
+   *
+   * @template Extension The extension resource model.
+   * @template Resource The resource model.
    */
   @autoRoute
   @doc("Creates a new instance of the extension resource.")
-  @createsResource(TExtension)
+  @createsResource(Extension)
   create(
-    ...ResourceParameters<TResource>,
-    @body resource: ResourceCreateModel<TExtension>,
-  ): TExtension | ResourceCreatedResponse<TExtension> | TError;
+    ...ResourceParameters<Resource>,
+    @body resource: ResourceCreateModel<Extension>,
+  ): Extension | ResourceCreatedResponse<Extension> | Error;
 }
 
 /**
  * Extension resource update operation template.
- * @template TExtension The extension resource model.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Extension The extension resource model.
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-interface ExtensionResourceUpdate<TExtension extends {}, TResource extends {}, TError> {
+interface ExtensionResourceUpdate<Extension extends {}, Resource extends {}, Error> {
   /**
    * Updates an existing instance of the extension resource.
-   * @template TExtension The extension resource model.
-   * @template TResource The resource model.
+   *
+   * @template Extension The extension resource model.
+   * @template Resource The resource model.
    */
   @autoRoute
   @doc("Updates an existing instance of the extension resource.")
-  @updatesResource(TExtension)
+  @updatesResource(Extension)
   update(
-    ...ResourceParameters<TResource>,
-    ...ResourceParameters<TExtension>,
+    ...ResourceParameters<Resource>,
+    ...ResourceParameters<Extension>,
 
     @body
-    properties: ResourceCreateOrUpdateModel<TExtension>,
-  ): TExtension | TError;
+    properties: ResourceCreateOrUpdateModel<Extension>,
+  ): Extension | Error;
 }
 
 /**
  * Extension resource delete operation template.
- * @template TExtension The extension resource model.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Extension The extension resource model.
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-interface ExtensionResourceDelete<TExtension extends {}, TResource extends {}, TError> {
+interface ExtensionResourceDelete<Extension extends {}, Resource extends {}, Error> {
   /**
    * Deletes an existing instance of the extension resource.
-   * @template TExtension The extension resource model.
-   * @template TResource The resource model.
+   *
+   * @template Extension The extension resource model.
+   * @template Resource The resource model.
    */
   @autoRoute
   @doc("Deletes an existing instance of the extension resource.")
-  @deletesResource(TExtension)
+  @deletesResource(Extension)
   delete(
-    ...ResourceParameters<TResource>,
-    ...ResourceParameters<TExtension>,
-  ): ResourceDeletedResponse | TError;
+    ...ResourceParameters<Resource>,
+    ...ResourceParameters<Extension>,
+  ): ResourceDeletedResponse | Error;
 }
 
 /**
  * Extension resource list operation template.
- * @template TExtension The extension resource model.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Extension The extension resource model.
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-interface ExtensionResourceList<TExtension extends {}, TResource extends {}, TError> {
+interface ExtensionResourceList<Extension extends {}, Resource extends {}, Error> {
   /**
    * Lists all instances of the extension resource.
-   * @template TExtension The extension resource model.
-   * @template TResource The resource model.
+   *
+   * @template Extension The extension resource model.
+   * @template Resource The resource model.
    */
   @autoRoute
   @doc("Lists all instances of the extension resource.")
-  @listsResource(TExtension)
+  @listsResource(Extension)
   list(
-    ...ResourceParameters<TResource>,
-    ...ResourceCollectionParameters<TExtension>,
-  ): CollectionWithNextLink<TExtension> | TError;
+    ...ResourceParameters<Resource>,
+    ...ResourceCollectionParameters<Extension>,
+  ): CollectionWithNextLink<Extension> | Error;
 }
 
 /**
  * Extension resource operation templates for extension resource instances.
- * @template TExtension The extension resource model.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Extension The extension resource model.
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-interface ExtensionResourceInstanceOperations<TExtension extends {}, TResource extends {}, TError>
-  extends ExtensionResourceRead<TExtension, TResource, TError>,
-    ExtensionResourceUpdate<TExtension, TResource, TError>,
-    ExtensionResourceDelete<TExtension, TResource, TError> {}
+interface ExtensionResourceInstanceOperations<Extension extends {}, Resource extends {}, Error>
+  extends ExtensionResourceRead<Extension, Resource, Error>,
+    ExtensionResourceUpdate<Extension, Resource, Error>,
+    ExtensionResourceDelete<Extension, Resource, Error> {}
 
 /**
  * Extension resource operation templates for extension resource collections.
- * @template TExtension The extension resource model.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Extension The extension resource model.
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-interface ExtensionResourceCollectionOperations<TExtension extends {}, TResource extends {}, TError>
-  extends ExtensionResourceCreate<TExtension, TResource, TError>,
-    ExtensionResourceList<TExtension, TResource, TError> {}
+interface ExtensionResourceCollectionOperations<Extension extends {}, Resource extends {}, Error>
+  extends ExtensionResourceCreate<Extension, Resource, Error>,
+    ExtensionResourceList<Extension, Resource, Error> {}
 
 /**
  * Extension resource operation templates for extension resource instances and collections.
- * @template TExtension The extension resource model.
- * @template TResource The resource model.
- * @template TError The error response.
+ *
+ * @template Extension The extension resource model.
+ * @template Resource The resource model.
+ * @template Error The error response.
  */
-interface ExtensionResourceOperations<TExtension extends {}, TResource extends {}, TError>
-  extends ExtensionResourceInstanceOperations<TExtension, TResource, TError>,
-    ExtensionResourceCollectionOperations<TExtension, TResource, TError> {}
+interface ExtensionResourceOperations<Extension extends {}, Resource extends {}, Error>
+  extends ExtensionResourceInstanceOperations<Extension, Resource, Error>,
+    ExtensionResourceCollectionOperations<Extension, Resource, Error> {}

package/lib/rest.tsp

@@ -6,8 +6,8 @@ namespace TypeSpec.Rest;
 
 /**
  * A URL that points to a resource.
- * @template TResource The type of resource that the URL points to.
+ * @template Resource The type of resource that the URL points to.
  */
-@doc("The location of an instance of {name}", TResource)
-@Private.resourceLocation(TResource)
-scalar ResourceLocation<TResource extends {}> extends url;
+@doc("The location of an instance of {name}", Resource)
+@Private.resourceLocation(Resource)
+scalar ResourceLocation<Resource extends {}> extends url;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/rest",
-  "version": "0.52.0-dev.1",
+  "version": "0.52.0-dev.3",
   "author": "Microsoft Corporation",
   "description": "TypeSpec REST protocol binding",
   "homepage": "https://microsoft.github.io/typespec",
@@ -42,7 +42,6 @@
     "@typespec/http": "~0.51.0 || >=0.52.0-dev <0.52.0"
   },
   "devDependencies": {
-    "@types/mocha": "~10.0.6",
     "@types/node": "~18.11.9",
     "@typespec/compiler": "~0.51.0 || >=0.52.0-dev <0.52.0",
     "@typespec/http": "~0.51.0 || >=0.52.0-dev <0.52.0",
@@ -51,9 +50,8 @@
     "@typespec/eslint-plugin": "~0.51.0 || >=0.52.0-dev <0.52.0",
     "@typespec/tspd": "~0.46.0 || >=0.47.0-dev <0.47.0",
     "eslint": "^8.55.0",
-    "mocha": "~10.2.0",
-    "mocha-junit-reporter": "~2.2.1",
-    "mocha-multi-reporters": "~1.5.1",
+    "vitest": "^1.1.0",
+    "@vitest/coverage-v8": "^1.1.0",
     "c8": "~8.0.1",
     "rimraf": "~5.0.1",
     "typescript": "~5.3.3"
@@ -64,8 +62,9 @@
     "build": "tsc -p . && npm run lint-typespec-library",
     "watch": "tsc -p . --watch",
     "lint-typespec-library": "tsp compile . --warn-as-error --import @typespec/library-linter --no-emit",
-    "test": "mocha",
-    "test-official": "c8 mocha --forbid-only --reporter mocha-multi-reporters",
+    "test": "vitest run",
+    "test:watch": "vitest -w",
+    "test-official": "vitest run --coverage --reporter=junit --reporter=default --no-file-parallelism",
     "lint": "eslint . --ext .ts --max-warnings=0",
     "lint:fix": "eslint . --fix --ext .ts",
     "regen-docs": "tspd doc .  --enable-experimental  --output-dir ../../docs/libraries/rest/reference"