Migrate @service and @info to use valueof for the option bag

README.md

@@ -53,9 +53,7 @@ using TypeSpec.Http;
 using TypeSpec.Rest;
 
 /** This is a pet store service. */
-@service({
-  title: "Pet Store Service",
-})
+@service(#{ title: "Pet Store Service" })
 @server("https://example.com", "The service endpoint")
 namespace PetStore;
 

packages/compiler/generated-defs/TypeSpec.ts

@@ -14,6 +14,11 @@ import type {
   UnionVariant,
 } from "../src/core/index.js";
 
+export interface ServiceOptions {
+  readonly title?: string;
+  readonly version?: string;
+}
+
 export interface ExampleOptions {
   readonly title?: string;
   readonly description?: string;
@@ -216,19 +221,19 @@ export type DeprecatedDecorator = (
  * ```
  * @example Setting service title
  * ```typespec
- * @service({title: "Pet store"})
+ * @service(#{title: "Pet store"})
  * namespace PetStore;
  * ```
  * @example Setting service version
  * ```typespec
- * @service({version: "1.0"})
+ * @service(#{version: "1.0"})
  * namespace PetStore;
  * ```
  */
 export type ServiceDecorator = (
   context: DecoratorContext,
   target: Namespace,
-  options?: Type,
+  options?: ServiceOptions,
 ) => void;
 
 /**

packages/compiler/lib/std/decorators.tsp

@@ -102,17 +102,17 @@ model ServiceOptions {
  *
  * @example Setting service title
  * ```typespec
- * @service({title: "Pet store"})
+ * @service(#{title: "Pet store"})
  * namespace PetStore;
  * ```
  *
  * @example Setting service version
  * ```typespec
- * @service({version: "1.0"})
+ * @service(#{version: "1.0"})
  * namespace PetStore;
  * ```
  */
-extern dec service(target: Namespace, options?: ServiceOptions);
+extern dec service(target: Namespace, options?: valueof ServiceOptions);
 
 /**
  * Specify that this model is an error type. Operations return error types when the operation has failed.

packages/compiler/src/lib/service.ts

@@ -1,7 +1,6 @@
-import { ServiceDecorator } from "../../generated-defs/TypeSpec.js";
+import type { ServiceDecorator, ServiceOptions } from "../../generated-defs/TypeSpec.js";
 import { validateDecoratorUniqueOnNode } from "../core/decorator-utils.js";
-import { Type, getTypeName, reportDeprecated } from "../core/index.js";
-import { reportDiagnostic } from "../core/messages.js";
+import { reportDeprecated } from "../core/index.js";
 import type { Program } from "../core/program.js";
 import { DecoratorContext, Namespace } from "../core/types.js";
 import { Realm } from "../experimental/realm.js";
@@ -69,50 +68,17 @@ export function addService(
 export const $service: ServiceDecorator = (
   context: DecoratorContext,
   target: Namespace,
-  options?: Type,
+  options?: ServiceOptions,
 ) => {
   validateDecoratorUniqueOnNode(context, target, $service);
 
-  if (options && options.kind !== "Model") {
-    reportDiagnostic(context.program, {
-      code: "invalid-argument",
-      format: { value: options.kind, expected: "Model" },
-      target: context.getArgumentTarget(0)!,
-    });
-    return;
-  }
-  const serviceDetails: ServiceDetails = {};
-  const title = options?.properties.get("title")?.type;
-  const versionProp = options?.properties.get("version");
-  if (title) {
-    if (title.kind === "String") {
-      serviceDetails.title = title.value;
-    } else {
-      reportDiagnostic(context.program, {
-        code: "unassignable",
-        format: { sourceType: getTypeName(title), targetType: "String" },
-        target: context.getArgumentTarget(0)!,
-      });
-    }
-  }
-  if (versionProp) {
-    const version = versionProp.type;
+  if (options?.version) {
     reportDeprecated(
       context.program,
       "version: property is deprecated in @service. If wanting to describe a service versioning you can use the `@typespec/versioning` library. If wanting to describe the project version you can use the package.json version.",
-      versionProp,
+      context.getArgumentTarget(0)!,
     );
-    if (version.kind === "String") {
-      // eslint-disable-next-line @typescript-eslint/no-deprecated
-      serviceDetails.version = version.value;
-    } else {
-      reportDiagnostic(context.program, {
-        code: "unassignable",
-        format: { sourceType: getTypeName(version), targetType: "String" },
-        target: context.getArgumentTarget(0)!,
-      });
-    }
   }
 
-  addService(context.program, target, serviceDetails);
+  addService(context.program, target, options);
 };

packages/compiler/templates/rest/main.tsp

@@ -1,9 +1,7 @@
 import "@typespec/http";
 
 using TypeSpec.Http;
-@service({
-  title: "Widget Service",
-})
+@service(#{ title: "Widget Service" })
 namespace DemoService;
 
 model Widget {

packages/compiler/test/decorators/service.test.ts

@@ -50,7 +50,7 @@ describe("compiler: service", () => {
 
   it("customize service title", async () => {
     const { S } = await runner.compile(`
-      @test @service({title: "My Service"}) namespace S {}
+      @test @service(#{title: "My Service"}) namespace S {}
 
     `);
 
@@ -59,7 +59,7 @@ describe("compiler: service", () => {
 
   it("emit diagnostic if service title is not a string", async () => {
     const diagnostics = await runner.diagnose(`
-      @test @service({title: 123}) namespace S {}
+      @test @service(#{title: 123}) namespace S {}
     `);
 
     expectDiagnostics(diagnostics, {
@@ -71,7 +71,7 @@ describe("compiler: service", () => {
 
   it("customize service version", async () => {
     const { S } = await runner.compile(`
-      @test @service({
+      @test @service(#{
         #suppress "deprecated" "test"
         version: "1.2.3"
       }) namespace S {}
@@ -94,7 +94,7 @@ describe("compiler: service", () => {
 
   it("emit diagnostic if service version is not a string", async () => {
     const diagnostics = await runner.diagnose(`
-      @test @service({
+      @test @service(#{
         #suppress "deprecated" "test"
         version: 123
       }) namespace S {}

packages/compiler/test/server/get-hover.test.ts

@@ -335,7 +335,7 @@ describe("compiler: server: on hover", () => {
     it("model in namespace", async () => {
       const hover = await getHoverAtCursor(
         `
-          @service({title: "RT"})
+          @service(#{title: "RT"})
           namespace TestNs;
 
           model Ani┆mal{
@@ -355,7 +355,7 @@ describe("compiler: server: on hover", () => {
     it("model with one template arg", async () => {
       const hover = await getHoverAtCursor(
         `
-          @service({title: "RT"})
+          @service(#{title: "RT"})
           namespace TestNs;
 
           model Ani┆mal<T>{
@@ -376,7 +376,7 @@ describe("compiler: server: on hover", () => {
     it("model with two template args", async () => {
       const hover = await getHoverAtCursor(
         `
-          @service({title: "RT"})
+          @service(#{title: "RT"})
           namespace TestNs;
 
           model Ani┆mal<T, P>{
@@ -433,7 +433,7 @@ describe("compiler: server: on hover", () => {
     it("interface in namespace", async () => {
       const hover = await getHoverAtCursor(
         `
-          @service({title: "RT"})
+          @service(#{title: "RT"})
           namespace TestNs;
 
           interface IAct┆ions{
@@ -483,7 +483,7 @@ describe("compiler: server: on hover", () => {
     it("operation in namespace", async () => {
       const hover = await getHoverAtCursor(
         `
-          @service({title: "RT"})
+          @service(#{title: "RT"})
           namespace TestNs;
 
           op Ea┆t(food: string): void;
@@ -500,7 +500,7 @@ describe("compiler: server: on hover", () => {
     it("operation with one template arg", async () => {
       const hover = await getHoverAtCursor(
         `
-          @service({title: "RT"})
+          @service(#{title: "RT"})
           namespace TestNs;
 
           op Ea┆t<T>(food: string): void;
@@ -517,7 +517,7 @@ describe("compiler: server: on hover", () => {
     it("operation with two template args", async () => {
       const hover = await getHoverAtCursor(
         `
-          @service({title: "RT"})
+          @service(#{title: "RT"})
           namespace TestNs;
 
           op Ea┆t<T, P>(food: string): void;
@@ -534,7 +534,7 @@ describe("compiler: server: on hover", () => {
     it("operation in interface", async () => {
       const hover = await getHoverAtCursor(
         `
-          @service({title: "RT"})
+          @service(#{title: "RT"})
           namespace TestNs;
 
           interface IActions {
@@ -553,7 +553,7 @@ describe("compiler: server: on hover", () => {
     it("operation in interface with template", async () => {
       const hover = await getHoverAtCursor(
         `
-          @service({title: "RT"})
+          @service(#{title: "RT"})
           namespace TestNs;
 
           interface IActions<Q> {

packages/http-client-csharp/emitter/test/Unit/input-parameter.test.ts

@@ -631,7 +631,7 @@ describe("Test Parameter Explode", () => {
       it("cookie parameter is not supported", async () => {
         const program = await typeSpecCompile(
           `
-                @service({
+                @service(#{
                   title: "Azure Csharp emitter Testing",
                 })
                 @server(

packages/http-client-csharp/emitter/test/Unit/utils/test-util.ts

@@ -50,7 +50,7 @@ export async function typeSpecCompile(
   const namespace = `
     @versioned(Versions)
     ${authDecorator}
-    @service({
+    @service(#{
       title: "Azure Csharp emitter Testing",
     })
 

packages/http-client-csharp/generator/TestProjects/Local/Unbranded-TypeSpec/Unbranded-TypeSpec.tsp

@@ -4,9 +4,7 @@ import "@azure-tools/typespec-client-generator-core";
 import "@azure-tools/typespec-azure-core";
 
 @versioned(Versions)
-@service({
-  title: "hello world",
-})
+@service(#{ title: "hello world" })
 @doc("This is a sample typespec project.")
 @server(
   "{unbrandedTypeSpecUrl}",

packages/http-client-csharp/generator/TestProjects/Plugin/Unbranded-TypeSpec/Unbranded-TypeSpec.tsp

@@ -3,10 +3,7 @@ import "@typespec/http";
 import "@azure-tools/typespec-client-generator-core";
 import "@azure-tools/typespec-azure-core";
 
-@service({
-  title: "hello world",
-  version: "0.1.0",
-})
+@service(#{ title: "hello world", version: "0.1.0" })
 @doc("This is a sample typespec project.")
 @server(
   "{unbrandedTypeSpecUrl}",

packages/http-client-java/generator/http-client-generator-test/tsp/arm-stream-style-serialization.tsp

@@ -14,9 +14,7 @@ using TypeSpec.OpenAPI;
 using Azure.ClientGenerator.Core;
 
 @armProviderNamespace
-@service({
-  title: "ArmStreamStyleSerialization",
-})
+@service(#{ title: "ArmStreamStyleSerialization" })
 @versioned(Versions)
 @doc("Arm Resource Provider management API.")
 namespace TspTest.ArmStreamStyleSerialization;

packages/http-client-java/generator/http-client-generator-test/tsp/arm.tsp

@@ -14,9 +14,7 @@ using TypeSpec.OpenAPI;
 using Azure.ClientGenerator.Core;
 
 @armProviderNamespace
-@service({
-  title: "ArmResource",
-})
+@service(#{ title: "ArmResource" })
 @versioned(Versions)
 @doc("Arm Resource Provider management API.")
 namespace TspTest.ArmResourceProvider;

packages/http-client-java/generator/http-client-generator-test/tsp/builtin.tsp

@@ -4,9 +4,7 @@ import "@azure-tools/typespec-client-generator-core";
 using TypeSpec.Http;
 using Azure.ClientGenerator.Core;
 
-@service({
-  title: "Builtin",
-})
+@service(#{ title: "Builtin" })
 namespace TspTest.Builtin;
 
 model Builtin {

packages/http-client-java/generator/http-client-generator-test/tsp/discriminator-edge-cases.tsp

@@ -6,9 +6,7 @@ using TypeSpec.Http;
 using Azure.Core;
 using Azure.ClientGenerator.Core;
 
-@service({
-  title: "DiscriminatorEdgeCases",
-})
+@service(#{ title: "DiscriminatorEdgeCases" })
 namespace TspTest.DiscriminatorEdgeCases;
 
 model ParentWithRequiredProperty {

packages/http-client-java/generator/http-client-generator-test/tsp/enum.tsp

@@ -6,9 +6,7 @@ using TypeSpec.Http;
 using Azure.Core;
 using Azure.ClientGenerator.Core;
 
-@service({
-  title: "EnumService",
-})
+@service(#{ title: "EnumService" })
 namespace TspTest.EnumService;
 
 #suppress "@azure-tools/typespec-azure-core/use-extensible-enum" "For testing"

packages/http-client-java/generator/http-client-generator-test/tsp/error.tsp

@@ -5,9 +5,7 @@ using TypeSpec.Http;
 using TypeSpec.Versioning;
 using Azure.Core.Foundations;
 
-@service({
-  title: "ErrorModel",
-})
+@service(#{ title: "ErrorModel" })
 @useDependency(Azure.Core.Versions.v1_0_Preview_2)
 namespace TspTest.ErrorModel;
 

packages/http-client-java/generator/http-client-generator-test/tsp/flatten.tsp

@@ -6,9 +6,7 @@ using TypeSpec.Http;
 using TypeSpec.Versioning;
 using Azure.ClientGenerator.Core;
 
-@service({
-  title: "Flatten",
-})
+@service(#{ title: "Flatten" })
 @server(
   "{endpoint}/openai",
   "Flatten",

packages/http-client-java/generator/http-client-generator-test/tsp/internal.tsp

@@ -7,9 +7,7 @@ using TypeSpec.Http;
 using Azure.Core;
 using Azure.ClientGenerator.Core;
 
-@service({
-  title: "Internal",
-})
+@service(#{ title: "Internal" })
 namespace TspTest.Internal;
 
 // ApiRequest and RequestInner will be generated

packages/http-client-java/generator/http-client-generator-test/tsp/literal.tsp

@@ -4,9 +4,7 @@ import "@azure-tools/typespec-azure-core";
 using TypeSpec.Http;
 using Azure.Core;
 
-@service({
-  title: "LiteralService",
-})
+@service(#{ title: "LiteralService" })
 namespace TspTest.LiteralService;
 
 model Model {