@typespec/emitter-framework 0.11.0-dev.2 → 0.11.0-dev.3

package/dist/src/csharp/components/class/declaration.test.js

@@ -130,7 +130,7 @@ it("renders a class declaration with properties using component override", async
         {
             public required string Prop1 { get; set; }
             public required int Prop2 { get; set; }
-            public Bar Prop3 { get; set; }
+            public Bar? Prop3 { get; set; }
         }
     }
   `);

package/dist/src/csharp/components/property/property.js

@@ -9,7 +9,7 @@ import { getDocComments } from "../utils/doc-comments.js";
  * Create a C# property declaration from a TypeSpec property type.
  */
 export function Property(props) {
-  const result = preprocessPropertyType(props.type.type);
+  const result = preprocessPropertyType(props.type);
   const {
     $
   } = useTsp();
@@ -57,7 +57,14 @@ function JsonNameAttribute(props) {
     }
   });
 }
-function preprocessPropertyType(type) {
+function preprocessPropertyType(prop) {
+  const type = prop.type;
+  if (prop.optional) {
+    return {
+      type,
+      nullable: true
+    };
+  }
   const {
     $
   } = useTsp();

package/dist/src/csharp/components/property/property.test.js

@@ -60,6 +60,30 @@ it("maps prop: string | null to nullable property", async () => {
       }
   `);
 });
+it("maps optional properties to nullable properties", async () => {
+  const {
+    prop1
+  } = await tester.compile(t.code`
+    model TestModel {
+      ${t.modelProperty("prop1")}?: string;
+    }
+  `);
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(Property, {
+        type: prop1
+      });
+    }
+  })).toRenderTo(`
+      namespace TestNamespace
+      {
+          class Test
+          {
+              public string? Prop1 { get; set; }
+          }
+      }
+  `);
+});
 describe("jsonAttributes", () => {
   it("adds [JsonNameAttribute]", async () => {
     const {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/emitter-framework",
-  "version": "0.11.0-dev.2",
+  "version": "0.11.0-dev.3",
   "type": "module",
   "main": "dist/index.js",
   "repository": {

package/src/csharp/components/class/declaration.test.tsx

@@ -108,7 +108,7 @@ it("renders a class declaration with properties using component override", async
         {
             public required string Prop1 { get; set; }
             public required int Prop2 { get; set; }
-            public Bar Prop3 { get; set; }
+            public Bar? Prop3 { get; set; }
         }
     }
   `);

package/src/csharp/components/property/property.test.tsx

@@ -47,6 +47,28 @@ it("maps prop: string | null to nullable property", async () => {
   `);
 });
 
+it("maps optional properties to nullable properties", async () => {
+  const { prop1 } = await tester.compile(t.code`
+    model TestModel {
+      ${t.modelProperty("prop1")}?: string;
+    }
+  `);
+
+  expect(
+    <Wrapper>
+      <Property type={prop1} />
+    </Wrapper>,
+  ).toRenderTo(`
+      namespace TestNamespace
+      {
+          class Test
+          {
+              public string? Prop1 { get; set; }
+          }
+      }
+  `);
+});
+
 describe("jsonAttributes", () => {
   it("adds [JsonNameAttribute]", async () => {
     const { prop1 } = await tester.compile(t.code`

package/src/csharp/components/property/property.tsx

@@ -16,7 +16,7 @@ export interface PropertyProps {
  * Create a C# property declaration from a TypeSpec property type.
  */
 export function Property(props: PropertyProps): Children {
-  const result = preprocessPropertyType(props.type.type);
+  const result = preprocessPropertyType(props.type);
   const { $ } = useTsp();
 
   return (
@@ -44,7 +44,13 @@ function JsonNameAttribute(props: JsonNameAttributeProps): Children {
   return <Attribute name="System.Text.Json.JsonPropertyName" args={[JSON.stringify(jsonName)]} />;
 }
 
-function preprocessPropertyType(type: Type): { type: Type; nullable: boolean } {
+function preprocessPropertyType(prop: ModelProperty): { type: Type; nullable: boolean } {
+  const type = prop.type;
+
+  if (prop.optional) {
+    return { type, nullable: true };
+  }
+
   const { $ } = useTsp();
 
   if (type.kind === "Union") {