Support special words

packages/rlc-common/src/helpers/nameUtils.ts

@@ -22,6 +22,9 @@ const Newable = [NameType.Class, NameType.Interface, NameType.OperationGroup];
 export const ReservedModelNames: ReservedName[] = [
   { name: "any", reservedFor: [NameType.Parameter] },
   { name: "as", reservedFor: [NameType.Parameter] },
+  { name: "assert", reservedFor: [NameType.Parameter] },
+  { name: "async", reservedFor: [NameType.Parameter] },
+  { name: "await", reservedFor: [NameType.Parameter] },
   { name: "boolean", reservedFor: [NameType.Parameter, ...Newable] },
   { name: "break", reservedFor: [NameType.Parameter] },
   { name: "case", reservedFor: [NameType.Parameter] },
@@ -110,10 +113,10 @@ export function guardReservedNames(
 function getSuffix(nameType?: NameType) {
   switch (nameType) {
     case NameType.File:
-    case NameType.Property:
-      return "";
     case NameType.Operation:
-      return "Operation";
+      return "";
+    case NameType.Property:
+      return "Property";
     case NameType.OperationGroup:
       return "Operations";
     case NameType.Parameter:

packages/rlc-common/test/helpers/nameUtils.spec.ts

@@ -23,7 +23,7 @@ describe("#normalizeName", () => {
   describe("for operation", () => {
     it("should return the name with the suffix 'Operation' if the name is a reserved name", () => {
       expect(normalizeName("export", NameType.Operation, true)).to.equal(
-        "exportOperation"
+        "export"
       );
     });
 

packages/typespec-test/test/authoring/generated/typespec-ts/review/authoring.api.md

@@ -31,7 +31,7 @@ export default createClient;
 
 // @public (undocumented)
 export interface CreateOrUpdate {
-    delete(options?: DeleteParameters): StreamableMethod<DeleteOperation202Response | DeleteOperationDefaultResponse>;
+    delete(options?: DeleteParameters): StreamableMethod<Delete202Response | DeleteDefaultResponse>;
     get(options?: GetParameters): StreamableMethod<Get200Response | GetDefaultResponse>;
     patch(options: CreateOrUpdateParameters): StreamableMethod<CreateOrUpdate200Response | CreateOrUpdate201Response | CreateOrUpdateDefaultResponse>;
 }
@@ -102,6 +102,36 @@ export interface CreateOrUpdateMediaTypesParam {
 // @public (undocumented)
 export type CreateOrUpdateParameters = CreateOrUpdateMediaTypesParam & CreateOrUpdateBodyParam & RequestParameters;
 
+// @public (undocumented)
+export interface Delete202Headers {
+    "operation-location": string;
+}
+
+// @public
+export interface Delete202Response extends HttpResponse {
+    // (undocumented)
+    body: OperationStatusOutput;
+    // (undocumented)
+    headers: RawHttpHeaders & Delete202Headers;
+    // (undocumented)
+    status: "202";
+}
+
+// @public (undocumented)
+export interface DeleteDefaultHeaders {
+    "x-ms-error-code"?: string;
+}
+
+// @public (undocumented)
+export interface DeleteDefaultResponse extends HttpResponse {
+    // (undocumented)
+    body: ErrorResponse;
+    // (undocumented)
+    headers: RawHttpHeaders & DeleteDefaultHeaders;
+    // (undocumented)
+    status: string;
+}
+
 // @public (undocumented)
 export interface DeleteDeployment202Headers {
     "operation-location": string;
@@ -151,36 +181,6 @@ export interface DeleteLogicalResponse extends HttpResponse {
     status: "200";
 }
 
-// @public (undocumented)
-export interface DeleteOperation202Headers {
-    "operation-location": string;
-}
-
-// @public
-export interface DeleteOperation202Response extends HttpResponse {
-    // (undocumented)
-    body: OperationStatusOutput;
-    // (undocumented)
-    headers: RawHttpHeaders & DeleteOperation202Headers;
-    // (undocumented)
-    status: "202";
-}
-
-// @public (undocumented)
-export interface DeleteOperationDefaultHeaders {
-    "x-ms-error-code"?: string;
-}
-
-// @public (undocumented)
-export interface DeleteOperationDefaultResponse extends HttpResponse {
-    // (undocumented)
-    body: ErrorResponse;
-    // (undocumented)
-    headers: RawHttpHeaders & DeleteOperationDefaultHeaders;
-    // (undocumented)
-    status: string;
-}
-
 // @public (undocumented)
 export type DeleteParameters = RequestParameters;
 
@@ -268,43 +268,43 @@ export type DeployProjectParameters = DeployProjectBodyParam & RequestParameters
 
 // @public (undocumented)
 export interface Export {
-    post(options: ExportParameters): StreamableMethod<ExportOperation202Response | ExportOperationDefaultResponse>;
-}
-
-// @public
-export interface ExportLogicalResponse extends HttpResponse {
-    // (undocumented)
-    status: "200";
+    post(options: ExportParameters): StreamableMethod<Export202Response | ExportDefaultResponse>;
 }
 
 // @public (undocumented)
-export interface ExportOperation202Headers {
+export interface Export202Headers {
     "operation-location": string;
 }
 
 // @public
-export interface ExportOperation202Response extends HttpResponse {
+export interface Export202Response extends HttpResponse {
     // (undocumented)
-    headers: RawHttpHeaders & ExportOperation202Headers;
+    headers: RawHttpHeaders & Export202Headers;
     // (undocumented)
     status: "202";
 }
 
 // @public (undocumented)
-export interface ExportOperationDefaultHeaders {
+export interface ExportDefaultHeaders {
     "x-ms-error-code"?: string;
 }
 
 // @public (undocumented)
-export interface ExportOperationDefaultResponse extends HttpResponse {
+export interface ExportDefaultResponse extends HttpResponse {
     // (undocumented)
     body: ErrorResponse;
     // (undocumented)
-    headers: RawHttpHeaders & ExportOperationDefaultHeaders;
+    headers: RawHttpHeaders & ExportDefaultHeaders;
     // (undocumented)
     status: string;
 }
 
+// @public
+export interface ExportLogicalResponse extends HttpResponse {
+    // (undocumented)
+    status: "200";
+}
+
 // @public (undocumented)
 export type ExportParameters = ExportQueryParam & RequestParameters;
 
@@ -413,10 +413,10 @@ export type GetDeploymentStatusParameters = RequestParameters;
 export function getLongRunningPoller<TResult extends CreateOrUpdateLogicalResponse | CreateOrUpdateDefaultResponse>(client: Client, initialResponse: CreateOrUpdate200Response | CreateOrUpdate201Response | CreateOrUpdateDefaultResponse, options?: CreateHttpPollerOptions<TResult, OperationState<TResult>>): Promise<SimplePollerLike<OperationState<TResult>, TResult>>;
 
 // @public (undocumented)
-export function getLongRunningPoller<TResult extends DeleteLogicalResponse | DeleteOperationDefaultResponse>(client: Client, initialResponse: DeleteOperation202Response | DeleteOperationDefaultResponse, options?: CreateHttpPollerOptions<TResult, OperationState<TResult>>): Promise<SimplePollerLike<OperationState<TResult>, TResult>>;
+export function getLongRunningPoller<TResult extends DeleteLogicalResponse | DeleteDefaultResponse>(client: Client, initialResponse: Delete202Response | DeleteDefaultResponse, options?: CreateHttpPollerOptions<TResult, OperationState<TResult>>): Promise<SimplePollerLike<OperationState<TResult>, TResult>>;
 
 // @public (undocumented)
-export function getLongRunningPoller<TResult extends ExportLogicalResponse | ExportOperationDefaultResponse>(client: Client, initialResponse: ExportOperation202Response | ExportOperationDefaultResponse, options?: CreateHttpPollerOptions<TResult, OperationState<TResult>>): Promise<SimplePollerLike<OperationState<TResult>, TResult>>;
+export function getLongRunningPoller<TResult extends ExportLogicalResponse | ExportDefaultResponse>(client: Client, initialResponse: Export202Response | ExportDefaultResponse, options?: CreateHttpPollerOptions<TResult, OperationState<TResult>>): Promise<SimplePollerLike<OperationState<TResult>, TResult>>;
 
 // @public (undocumented)
 export function getLongRunningPoller<TResult extends ImportxLogicalResponse | ImportxDefaultResponse>(client: Client, initialResponse: Importx202Response | ImportxDefaultResponse, options?: CreateHttpPollerOptions<TResult, OperationState<TResult>>): Promise<SimplePollerLike<OperationState<TResult>, TResult>>;
@@ -566,13 +566,13 @@ export function isUnexpected(response: CreateOrUpdate200Response | CreateOrUpdat
 export function isUnexpected(response: Get200Response | GetDefaultResponse): response is GetDefaultResponse;
 
 // @public (undocumented)
-export function isUnexpected(response: DeleteOperation202Response | DeleteLogicalResponse | DeleteOperationDefaultResponse): response is DeleteOperationDefaultResponse;
+export function isUnexpected(response: Delete202Response | DeleteLogicalResponse | DeleteDefaultResponse): response is DeleteDefaultResponse;
 
 // @public (undocumented)
 export function isUnexpected(response: ListProjects200Response | ListProjectsDefaultResponse): response is ListProjectsDefaultResponse;
 
 // @public (undocumented)
-export function isUnexpected(response: ExportOperation202Response | ExportLogicalResponse | ExportOperationDefaultResponse): response is ExportOperationDefaultResponse;
+export function isUnexpected(response: Export202Response | ExportLogicalResponse | ExportDefaultResponse): response is ExportDefaultResponse;
 
 // @public (undocumented)
 export function isUnexpected(response: Importx202Response | ImportxLogicalResponse | ImportxDefaultResponse): response is ImportxDefaultResponse;

packages/typespec-test/test/authoring/generated/typespec-ts/src/clientDefinitions.ts

@@ -25,12 +25,12 @@ import {
   CreateOrUpdateDefaultResponse,
   Get200Response,
   GetDefaultResponse,
-  DeleteOperation202Response,
-  DeleteOperationDefaultResponse,
+  Delete202Response,
+  DeleteDefaultResponse,
   ListProjects200Response,
   ListProjectsDefaultResponse,
-  ExportOperation202Response,
-  ExportOperationDefaultResponse,
+  Export202Response,
+  ExportDefaultResponse,
   Importx202Response,
   ImportxDefaultResponse,
   Train202Response,
@@ -73,9 +73,7 @@ export interface CreateOrUpdate {
   /** Deletes a project. */
   delete(
     options?: DeleteParameters,
-  ): StreamableMethod<
-    DeleteOperation202Response | DeleteOperationDefaultResponse
-  >;
+  ): StreamableMethod<Delete202Response | DeleteDefaultResponse>;
 }
 
 export interface ListProjects {
@@ -89,9 +87,7 @@ export interface Export {
   /** Triggers a job to export a project's data. */
   post(
     options: ExportParameters,
-  ): StreamableMethod<
-    ExportOperation202Response | ExportOperationDefaultResponse
-  >;
+  ): StreamableMethod<Export202Response | ExportDefaultResponse>;
 }
 
 export interface Importx {

packages/typespec-test/test/authoring/generated/typespec-ts/src/isUnexpected.ts

@@ -8,14 +8,14 @@ import {
   CreateOrUpdateDefaultResponse,
   Get200Response,
   GetDefaultResponse,
-  DeleteOperation202Response,
+  Delete202Response,
   DeleteLogicalResponse,
-  DeleteOperationDefaultResponse,
+  DeleteDefaultResponse,
   ListProjects200Response,
   ListProjectsDefaultResponse,
-  ExportOperation202Response,
+  Export202Response,
   ExportLogicalResponse,
-  ExportOperationDefaultResponse,
+  ExportDefaultResponse,
   Importx202Response,
   ImportxLogicalResponse,
   ImportxDefaultResponse,
@@ -92,20 +92,14 @@ export function isUnexpected(
   response: Get200Response | GetDefaultResponse,
 ): response is GetDefaultResponse;
 export function isUnexpected(
-  response:
-    | DeleteOperation202Response
-    | DeleteLogicalResponse
-    | DeleteOperationDefaultResponse,
-): response is DeleteOperationDefaultResponse;
+  response: Delete202Response | DeleteLogicalResponse | DeleteDefaultResponse,
+): response is DeleteDefaultResponse;
 export function isUnexpected(
   response: ListProjects200Response | ListProjectsDefaultResponse,
 ): response is ListProjectsDefaultResponse;
 export function isUnexpected(
-  response:
-    | ExportOperation202Response
-    | ExportLogicalResponse
-    | ExportOperationDefaultResponse,
-): response is ExportOperationDefaultResponse;
+  response: Export202Response | ExportLogicalResponse | ExportDefaultResponse,
+): response is ExportDefaultResponse;
 export function isUnexpected(
   response:
     | Importx202Response
@@ -166,14 +160,14 @@ export function isUnexpected(
     | CreateOrUpdateDefaultResponse
     | Get200Response
     | GetDefaultResponse
-    | DeleteOperation202Response
+    | Delete202Response
     | DeleteLogicalResponse
-    | DeleteOperationDefaultResponse
+    | DeleteDefaultResponse
     | ListProjects200Response
     | ListProjectsDefaultResponse
-    | ExportOperation202Response
+    | Export202Response
     | ExportLogicalResponse
-    | ExportOperationDefaultResponse
+    | ExportDefaultResponse
     | Importx202Response
     | ImportxLogicalResponse
     | ImportxDefaultResponse
@@ -205,9 +199,9 @@ export function isUnexpected(
 ): response is
   | CreateOrUpdateDefaultResponse
   | GetDefaultResponse
-  | DeleteOperationDefaultResponse
+  | DeleteDefaultResponse
   | ListProjectsDefaultResponse
-  | ExportOperationDefaultResponse
+  | ExportDefaultResponse
   | ImportxDefaultResponse
   | TrainDefaultResponse
   | GetDeploymentDefaultResponse

packages/typespec-test/test/authoring/generated/typespec-ts/src/pollingHelper.ts

@@ -15,11 +15,11 @@ import {
   CreateOrUpdate201Response,
   CreateOrUpdateDefaultResponse,
   CreateOrUpdateLogicalResponse,
-  DeleteOperation202Response,
-  DeleteOperationDefaultResponse,
+  Delete202Response,
+  DeleteDefaultResponse,
   DeleteLogicalResponse,
-  ExportOperation202Response,
-  ExportOperationDefaultResponse,
+  Export202Response,
+  ExportDefaultResponse,
   ExportLogicalResponse,
   Importx202Response,
   ImportxDefaultResponse,
@@ -56,17 +56,17 @@ export async function getLongRunningPoller<
   options?: CreateHttpPollerOptions<TResult, OperationState<TResult>>,
 ): Promise<SimplePollerLike<OperationState<TResult>, TResult>>;
 export async function getLongRunningPoller<
-  TResult extends DeleteLogicalResponse | DeleteOperationDefaultResponse,
+  TResult extends DeleteLogicalResponse | DeleteDefaultResponse,
 >(
   client: Client,
-  initialResponse: DeleteOperation202Response | DeleteOperationDefaultResponse,
+  initialResponse: Delete202Response | DeleteDefaultResponse,
   options?: CreateHttpPollerOptions<TResult, OperationState<TResult>>,
 ): Promise<SimplePollerLike<OperationState<TResult>, TResult>>;
 export async function getLongRunningPoller<
-  TResult extends ExportLogicalResponse | ExportOperationDefaultResponse,
+  TResult extends ExportLogicalResponse | ExportDefaultResponse,
 >(
   client: Client,
-  initialResponse: ExportOperation202Response | ExportOperationDefaultResponse,
+  initialResponse: Export202Response | ExportDefaultResponse,
   options?: CreateHttpPollerOptions<TResult, OperationState<TResult>>,
 ): Promise<SimplePollerLike<OperationState<TResult>, TResult>>;
 export async function getLongRunningPoller<