upgrade typespec versions in dependencies of package.json

packages/typespec-test/package.json

@@ -4,15 +4,15 @@
   "type": "module",
   "dependencies": {
     "@azure-tools/typespec-ts": "workspace:^0.23.0",
-    "@typespec/openapi": ">=0.53.0 <1.0.0",
-    "@azure-tools/typespec-autorest": ">=0.39.0 <1.0.0",
-    "@typespec/openapi3": ">=0.53.0 <1.0.0",
-    "@azure-tools/typespec-azure-core": ">=0.39.1 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": "0.40.0-dev.17",
-    "@typespec/compiler": ">=0.53.1 <1.0.0",
-    "@typespec/http": ">=0.53.0 <1.0.0",
-    "@typespec/rest": ">=0.53.0 <1.0.0",
-    "@typespec/versioning": ">=0.53.0 <1.0.0",
+    "@typespec/openapi": ">=0.54.0 <1.0.0",
+    "@azure-tools/typespec-autorest": ">=0.40.0 <1.0.0",
+    "@typespec/openapi3": ">=0.54.0 <1.0.0",
+    "@azure-tools/typespec-azure-core": ">=0.40.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": "0.40.0",
+    "@typespec/compiler": ">=0.54.0 <1.0.0",
+    "@typespec/http": ">=0.54.0 <1.0.0",
+    "@typespec/rest": ">=0.54.0 <1.0.0",
+    "@typespec/versioning": ">=0.54.0 <1.0.0",
     "prettier": "^3.1.0"
   },
   "devDependencies": {

packages/typespec-ts/package.json

@@ -75,20 +75,20 @@
     "@azure/core-util": "^1.4.0",
     "eslint-plugin-require-extensions": "0.1.3",
     "@typespec/ts-http-runtime": "1.0.0-alpha.20240226.9",
-    "@azure-tools/typespec-azure-core": ">=0.39.1 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": "0.40.0-dev.17",
-    "@typespec/compiler": ">=0.53.1 <1.0.0",
-    "@typespec/http": ">=0.53.0 <1.0.0",
-    "@typespec/rest": ">=0.53.0 <1.0.0",
-    "@typespec/versioning": ">=0.53.0 <1.0.0"
+    "@azure-tools/typespec-azure-core": ">=0.40.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": "0.40.0",
+    "@typespec/compiler": ">=0.54.0 <1.0.0",
+    "@typespec/http": ">=0.54.0 <1.0.0",
+    "@typespec/rest": ">=0.54.0 <1.0.0",
+    "@typespec/versioning": ">=0.54.0 <1.0.0"
   },
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.39.1 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": "0.40.0-dev.17",
-    "@typespec/compiler": ">=0.53.1 <1.0.0",
-    "@typespec/http": ">=0.53.0 <1.0.0",
-    "@typespec/rest": ">=0.53.0 <1.0.0",
-    "@typespec/versioning": ">=0.53.0 <1.0.0"
+    "@azure-tools/typespec-azure-core": ">=0.40.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": "0.40.0",
+    "@typespec/compiler": ">=0.54.0 <1.0.0",
+    "@typespec/http": ">=0.54.0 <1.0.0",
+    "@typespec/rest": ">=0.54.0 <1.0.0",
+    "@typespec/versioning": ">=0.54.0 <1.0.0"
   },
   "dependencies": {
     "prettier": "^3.1.0",

packages/typespec-ts/src/modular/buildCodeModel.ts

@@ -1113,7 +1113,9 @@ function emitEnum(context: SdkContext, type: Enum): Record<string, any> {
 
   return {
     type: "enum",
-    name: getLibraryName(context, type),
+    name: getLibraryName(context, type)
+      ? getLibraryName(context, type)
+      : type.name,
     description: getDocStr(program, type),
     valueType: { type: enumMemberType(type.members.values().next().value) },
     values: enumValues,
@@ -1421,7 +1423,9 @@ function emitUnion(
     };
   } else if (sdkType.kind === "enum") {
     return {
-      name: sdkType.name,
+      name: getLibraryName(context, type)
+        ? getLibraryName(context, type)
+        : type.name,
       nullable: sdkType.nullable,
       description: sdkType.description || `Type of ${sdkType.name}`,
       internal: true,

packages/typespec-ts/src/modular/helpers/typeHelpers.ts

@@ -128,12 +128,18 @@ function handleConstantType(type: Type): TypeMetadata {
  * Handles the conversion of enum types to TypeScript representation metadata.
  */
 function handleEnumType(type: Type): TypeMetadata {
-  if (
-    !type.name &&
-    (!type?.valueType?.type ||
-      !["string", "number"].includes(type?.valueType?.type))
-  ) {
-    throw new Error("Unable to process enum without name");
+  if (!type.name) {
+    const valueType = !type.isFixed
+      ? ((type.values?.[0] as Type).valueType?.type ?? "string") + " | "
+      : "";
+    return {
+      name: `${valueType}${type.values
+        ?.map((e) => {
+          return getType(e as Type).name;
+        })
+        .join(" | ")}`,
+      nullable: type.nullable
+    };
   }
   const name = handleNullableTypeName({
     name: type.name,

packages/typespec-ts/test/modularIntegration/generated/azure/core-traits/src/models/models.ts

@@ -21,5 +21,6 @@ export interface UserActionResponse {
   userActionResult: string;
 }
 
-/** Alias for RepeatabilityResult */
+/** Repeatability Result header options */
+/** */
 export type RepeatabilityResult = "accepted" | "rejected";

packages/typespec-ts/test/modularIntegration/generated/azure/core/src/index.ts

@@ -8,11 +8,11 @@ export {
   ListItemInputBody,
   UserListResults,
   PagedUser,
+  ListItemInputExtensibleEnum,
   PagedFirstItem,
   FirstItem,
   PagedSecondItem,
   SecondItem,
-  ListItemInputExtensibleEnum,
   CreateOrUpdateOptions,
   CreateOrReplaceOptions,
   GetOptions,

packages/typespec-ts/test/modularIntegration/generated/azure/core/src/models/index.ts

@@ -7,11 +7,11 @@ export {
   ListItemInputBody,
   UserListResults,
   PagedUser,
+  ListItemInputExtensibleEnum,
   PagedFirstItem,
   FirstItem,
   PagedSecondItem,
   SecondItem,
-  ListItemInputExtensibleEnum,
 } from "./models.js";
 export {
   CreateOrUpdateOptions,

packages/typespec-ts/test/modularIntegration/generated/azure/core/src/models/models.ts

@@ -41,23 +41,27 @@ export interface PagedUser {
   /** The User items on this page */
   value: User[];
   /** The link to the next page of items */
-  nextLink?: string;
+  readonly nextLink?: string;
 }
 
 /** Paged collection of User items */
 export interface PagedUser {
   /** The User items on this page */
   value: User[];
   /** The link to the next page of items */
-  nextLink?: string;
+  readonly nextLink?: string;
 }
 
+/** An extensible enum input parameter. */
+/** "First", "Second" */
+export type ListItemInputExtensibleEnum = string;
+
 /** Paged collection of FirstItem items */
 export interface PagedFirstItem {
   /** The FirstItem items on this page */
   value: FirstItem[];
   /** The link to the next page of items */
-  nextLink?: string;
+  readonly nextLink?: string;
 }
 
 /** First item. */
@@ -71,14 +75,11 @@ export interface PagedSecondItem {
   /** The SecondItem items on this page */
   value: SecondItem[];
   /** The link to the next page of items */
-  nextLink?: string;
+  readonly nextLink?: string;
 }
 
 /** Second item. */
 export interface SecondItem {
   /** The name of the item. */
   readonly name: string;
 }
-
-/** Alias for ListItemInputExtensibleEnum */
-export type ListItemInputExtensibleEnum = string | "First" | "Second";

packages/typespec-ts/test/modularIntegration/generated/headers/repeatability/generated/src/RepeatabilityClient.ts

@@ -2,13 +2,13 @@
 // Licensed under the MIT license.
 
 import { Pipeline } from "@azure/core-rest-pipeline";
+import { ImmediateSuccessOptions } from "./models/options.js";
 import {
   immediateSuccess,
   createRepeatability,
   RepeatabilityClientOptions,
   RepeatabilityContext,
 } from "./api/index.js";
-import { ImmediateSuccessOptions } from "./models/options.js";
 
 export { RepeatabilityClientOptions } from "./api/RepeatabilityContext.js";
 

packages/typespec-ts/test/modularIntegration/generated/headers/repeatability/generated/src/models/index.ts

@@ -1,4 +1,5 @@
 // Copyright (c) Microsoft Corporation.
 // Licensed under the MIT license.
 
+export * from "./models.js";
 export { ImmediateSuccessOptions } from "./options.js";

packages/typespec-ts/test/modularIntegration/generated/headers/repeatability/generated/src/models/models.ts

@@ -0,0 +1,2 @@
+// Copyright (c) Microsoft Corporation.
+// Licensed under the MIT license.

packages/typespec-ts/test/modularIntegration/generated/models/inheritance/enum-discriminator/src/index.ts

@@ -8,11 +8,11 @@ export {
 export {
   Dog,
   Golden,
+  DogKind,
   Snake,
   Cobra,
   SnakeKind,
   DogUnion,
-  DogKind,
   SnakeUnion,
   GetExtensibleModelOptions,
   PutExtensibleModelOptions,

packages/typespec-ts/test/modularIntegration/generated/models/inheritance/enum-discriminator/src/models/index.ts

@@ -4,11 +4,11 @@
 export {
   Dog,
   Golden,
+  DogKind,
   Snake,
   Cobra,
   SnakeKind,
   DogUnion,
-  DogKind,
   SnakeUnion,
 } from "./models.js";
 export {

packages/typespec-ts/test/modularIntegration/generated/models/inheritance/enum-discriminator/src/models/models.ts

@@ -15,6 +15,10 @@ export interface Golden extends Dog {
   kind: "golden";
 }
 
+/** extensible enum type for discriminator */
+/** "golden" */
+export type DogKind = string;
+
 /** Test fixed enum type for discriminator */
 export interface Snake {
   /** the discriminator possible values: cobra */
@@ -34,7 +38,5 @@ export interface Cobra extends Snake {
 export type SnakeKind = "cobra";
 /** Alias for DogUnion */
 export type DogUnion = Golden | Dog;
-/** Alias for DogKind */
-export type DogKind = string | "golden";
 /** Alias for SnakeUnion */
 export type SnakeUnion = Cobra | Snake;

packages/typespec-ts/test/modularIntegration/generated/models/propertyTypes/generated/src/index.ts

@@ -25,6 +25,7 @@ export {
   CollectionsStringProperty,
   ModelProperty,
   ExtensibleEnumProperty,
+  InnerEnum,
   EnumProperty,
   FixedInnerEnum,
   DurationProperty,
@@ -36,7 +37,6 @@ export {
   BytesProperty,
   StringProperty,
   BooleanProperty,
-  InnerEnum,
   BooleanGetOptions,
   BooleanPutOptions,
   StringGetOptions,

packages/typespec-ts/test/modularIntegration/generated/models/propertyTypes/generated/src/models/index.ts

@@ -21,6 +21,7 @@ export {
   CollectionsStringProperty,
   ModelProperty,
   ExtensibleEnumProperty,
+  InnerEnum,
   EnumProperty,
   FixedInnerEnum,
   DurationProperty,
@@ -32,7 +33,6 @@ export {
   BytesProperty,
   StringProperty,
   BooleanProperty,
-  InnerEnum,
 } from "./models.js";
 export {
   BooleanGetOptions,

packages/typespec-ts/test/modularIntegration/generated/models/propertyTypes/generated/src/models/models.ts

@@ -112,6 +112,10 @@ export interface ExtensibleEnumProperty {
   property: InnerEnum;
 }
 
+/** Enum that will be used as a property for model EnumProperty. Extensible. */
+/** "ValueOne", "ValueTwo" */
+export type InnerEnum = string;
+
 /** Model with enum properties */
 export interface EnumProperty {
   /** Property */
@@ -175,6 +179,3 @@ export interface BooleanProperty {
   /** Property */
   property: boolean;
 }
-
-/** Alias for InnerEnum */
-export type InnerEnum = string | "ValueOne" | "ValueTwo";

packages/typespec-ts/test/modularIntegration/generated/payload/pageable/src/models/models.ts

@@ -6,7 +6,7 @@ export interface PagedUser {
   /** The User items on this page */
   value: User[];
   /** The link to the next page of items */
-  nextLink?: string;
+  readonly nextLink?: string;
 }
 
 /** User model */

packages/typespec-ts/test/modularIntegration/generated/unions/src/index.ts

@@ -8,8 +8,6 @@ export {
   MixedLiteralsCases,
   StringAndArrayCases,
   EnumsOnlyCases,
-  LR,
-  UD,
   Dog,
   StringExtensibleNamedUnion,
   StringsOnlyGetOptions,

packages/typespec-ts/test/modularIntegration/generated/unions/src/models/index.ts

@@ -7,8 +7,6 @@ export {
   MixedLiteralsCases,
   StringAndArrayCases,
   EnumsOnlyCases,
-  LR,
-  UD,
   Dog,
   StringExtensibleNamedUnion,
 } from "./models.js";

packages/typespec-ts/test/modularIntegration/generated/unions/src/models/models.ts

@@ -36,19 +36,15 @@ export interface StringAndArrayCases {
 
 export interface EnumsOnlyCases {
   /** This should be receive/send the left variant */
-  lr: LR | UD;
+  lr: "left" | "right" | "up" | "down";
   /** This should be receive/send the up variant */
-  ud: UD | UD;
+  ud: "up" | "down";
 }
 
-/** "left", "right" */
-export type LR = string;
-/** "up", "down" */
-export type UD = string;
-
 export interface Dog {
   bark: string;
 }
 
-/** Alias for StringExtensibleNamedUnion */
-export type StringExtensibleNamedUnion = string | "b" | "c";
+/** Type of StringExtensibleNamedUnion */
+/** "b", "c" */
+export type StringExtensibleNamedUnion = string;