@typespec/emitter-framework 0.11.0-dev.4 → 0.11.0-dev.6

package/dist/src/csharp/components/property/property.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../../../src/csharp/components/property/property.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,EAAE,KAAK,aAAa,EAAiC,MAAM,oBAAoB,CAAC;AAKvF,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,aAAa,CAAC;IACpB,8FAA8F;IAC9F,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,QAAQ,CAiBvD;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,aAAa,CAAC;CACrB"}
+{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../../../src/csharp/components/property/property.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG/C,OAAO,EAAE,KAAK,aAAa,EAAiC,MAAM,oBAAoB,CAAC;AAMvF,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,aAAa,CAAC;IACpB,8FAA8F;IAC9F,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAED;;GAEG;AACH,wBAAgB,QAAQ,CAAC,KAAK,EAAE,aAAa,GAAG,QAAQ,CAiBvD;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,aAAa,CAAC;CACrB"}

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

@@ -5,6 +5,7 @@ import { resolveEncodedName } from "@typespec/compiler";
 import { useTsp } from "../../../core/index.js";
 import { TypeExpression } from "../type-expression.js";
 import { getDocComments } from "../utils/doc-comments.js";
+import { getNullableUnionInnerType } from "../utils/nullable-util.js";
 /**
  * Create a C# property declaration from a TypeSpec property type.
  */
@@ -59,34 +60,23 @@ function JsonNameAttribute(props) {
 }
 function preprocessPropertyType(prop) {
   const type = prop.type;
-  if (prop.optional) {
-    return {
-      type,
-      nullable: true
-    };
-  }
-  const {
-    $
-  } = useTsp();
   if (type.kind === "Union") {
-    const variants = type.variants;
-    const nonNullVariant = [...variants.values()].find(v => v.type !== $.intrinsic.null);
-    const nullVariant = [...variants.values()].find(v => v.type !== $.intrinsic.null);
-    if (nonNullVariant && nullVariant && variants.size === 2) {
+    const innerType = getNullableUnionInnerType(type);
+    if (innerType) {
       return {
-        type: nonNullVariant.type,
+        type: innerType,
         nullable: true
       };
     } else {
       return {
         type,
-        nullable: false
+        nullable: prop.optional
       };
     }
   } else {
     return {
       type,
-      nullable: false
+      nullable: prop.optional
     };
   }
 }

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

@@ -84,6 +84,30 @@ it("maps optional properties to nullable properties", async () => {
       }
   `);
 });
+it("maps optional and nullable properties to nullable properties", async () => {
+  const {
+    prop1
+  } = await tester.compile(t.code`
+    model TestModel {
+      ${t.modelProperty("prop1")}?: string | null;
+    }
+  `);
+  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/dist/src/csharp/components/type-expression.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-expression.d.ts","sourceRoot":"","sources":["../../../../src/csharp/components/type-expression.tsx"],"names":[],"mappings":"AACA,OAAO,EAAQ,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,EAIL,KAAK,aAAa,EAClB,KAAK,MAAM,EACX,KAAK,IAAI,EAEV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAK1D,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,IAAI,CAAC;CACZ;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,QAAQ,CAmCnE;AAwBD,QAAA,MAAM,yBAAyB,4BAqC7B,CAAC;AAEH,wBAAgB,4BAA4B,CAC1C,CAAC,EAAE,OAAO,EACV,IAAI,EAAE,MAAM,GAAG,aAAa,GAC3B,MAAM,GAAG,IAAI,CAoBf;AAyBD,OAAO,EAAE,yBAAyB,EAAE,CAAC"}
+{"version":3,"file":"type-expression.d.ts","sourceRoot":"","sources":["../../../../src/csharp/components/type-expression.tsx"],"names":[],"mappings":"AACA,OAAO,EAAQ,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAErD,OAAO,EAGL,KAAK,aAAa,EAClB,KAAK,MAAM,EACX,KAAK,IAAI,EACV,MAAM,oBAAoB,CAAC;AAC5B,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,4BAA4B,CAAC;AAM1D,MAAM,WAAW,mBAAmB;IAClC,IAAI,EAAE,IAAI,CAAC;CACZ;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,GAAG,QAAQ,CAmCnE;AAED,QAAA,MAAM,yBAAyB,4BAqC7B,CAAC;AAEH,wBAAgB,4BAA4B,CAC1C,CAAC,EAAE,OAAO,EACV,IAAI,EAAE,MAAM,GAAG,aAAa,GAC3B,MAAM,GAAG,IAAI,CAoBf;AAyBD,OAAO,EAAE,yBAAyB,EAAE,CAAC"}

package/dist/src/csharp/components/type-expression.js

@@ -2,9 +2,10 @@ import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime
 import { Experimental_OverridableComponent } from "#core/index.js";
 import { code } from "@alloy-js/core";
 import { Reference } from "@alloy-js/csharp";
-import { getTypeName, isNullType, isVoidType } from "@typespec/compiler";
+import { getTypeName, isVoidType } from "@typespec/compiler";
 import { useTsp } from "../../core/index.js";
 import { reportTypescriptDiagnostic } from "../../typescript/lib.js";
+import { getNullableUnionInnerType } from "./utils/nullable-util.js";
 import { efRefkey } from "./utils/refkey.js";
 export function TypeExpression(props) {
   if (props.type.kind === "Union") {
@@ -59,29 +60,6 @@ export function TypeExpression(props) {
   }
   throw new Error(`Unsupported type for TypeExpression: ${props.type.kind} (${getTypeName(props.type)})`);
 }
-
-/** Get the inner type if the union is a nullable, otherwise return undefined */
-function getNullableUnionInnerType(u) {
-  const isNull = type => isNullType(type) || isVoidType(type);
-  if (Array.from(u.variants.values()).some(v => isNull(v.type))) {
-    const {
-      $
-    } = useTsp();
-    const left = Array.from(u.variants.values()).filter(v => !isNull(v.type));
-    if (left.length === 0) {
-      // a union only has null or void?
-      return $.intrinsic.void;
-    } else if (left.length === 1) {
-      return left[0].type;
-    } else {
-      return $.union.create({
-        name: u.name,
-        variants: left
-      });
-    }
-  }
-  return undefined;
-}
 const intrinsicNameToCSharpType = new Map([
 // Core types
 ["unknown", "object"],

package/dist/src/csharp/components/utils/nullable-util.d.ts

@@ -0,0 +1,4 @@
+import type { Type, Union } from "@typespec/compiler";
+/** Get the inner type if the union is a nullable, otherwise return undefined */
+export declare function getNullableUnionInnerType(u: Union): Type | undefined;
+//# sourceMappingURL=nullable-util.d.ts.map

package/dist/src/csharp/components/utils/nullable-util.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nullable-util.d.ts","sourceRoot":"","sources":["../../../../../src/csharp/components/utils/nullable-util.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAEtD,gFAAgF;AAChF,wBAAgB,yBAAyB,CAAC,CAAC,EAAE,KAAK,GAAG,IAAI,GAAG,SAAS,CAoBpE"}

package/dist/src/csharp/components/utils/nullable-util.js

@@ -0,0 +1,26 @@
+import { useTsp } from "#core/index.js";
+/** Get the inner type if the union is a nullable, otherwise return undefined */
+export function getNullableUnionInnerType(u) {
+  const {
+    $
+  } = useTsp();
+  const isNull = type => type === $.intrinsic.null || type === $.intrinsic.void;
+  if (Array.from(u.variants.values()).some(v => isNull(v.type))) {
+    const {
+      $
+    } = useTsp();
+    const left = Array.from(u.variants.values()).filter(v => !isNull(v.type));
+    if (left.length === 0) {
+      // a union only has null or void?
+      return $.intrinsic.void;
+    } else if (left.length === 1) {
+      return left[0].type;
+    } else {
+      return $.union.create({
+        name: u.name,
+        variants: left
+      });
+    }
+  }
+  return undefined;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/emitter-framework",
-  "version": "0.11.0-dev.4",
+  "version": "0.11.0-dev.6",
   "type": "module",
   "main": "dist/index.js",
   "repository": {
@@ -60,7 +60,7 @@
     "tree-sitter-javascript": "^0.23.0",
     "tree-sitter-python": "^0.23.2",
     "tree-sitter-typescript": "^0.23.0",
-    "typescript": "~5.8.2",
+    "typescript": "~5.9.2",
     "vitest": "^3.1.2",
     "web-tree-sitter": "^0.25.4"
   },

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

@@ -69,6 +69,28 @@ it("maps optional properties to nullable properties", async () => {
   `);
 });
 
+it("maps optional and nullable properties to nullable properties", async () => {
+  const { prop1 } = await tester.compile(t.code`
+    model TestModel {
+      ${t.modelProperty("prop1")}?: string | null;
+    }
+  `);
+
+  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

@@ -5,6 +5,7 @@ import { type ModelProperty, resolveEncodedName, type Type } from "@typespec/com
 import { useTsp } from "../../../core/index.js";
 import { TypeExpression } from "../type-expression.jsx";
 import { getDocComments } from "../utils/doc-comments.jsx";
+import { getNullableUnionInnerType } from "../utils/nullable-util.js";
 
 export interface PropertyProps {
   type: ModelProperty;
@@ -47,22 +48,14 @@ function JsonNameAttribute(props: JsonNameAttributeProps): Children {
 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") {
-    const variants = type.variants;
-    const nonNullVariant = [...variants.values()].find((v) => v.type !== $.intrinsic.null);
-    const nullVariant = [...variants.values()].find((v) => v.type !== $.intrinsic.null);
-    if (nonNullVariant && nullVariant && variants.size === 2) {
-      return { type: nonNullVariant.type, nullable: true };
+    const innerType = getNullableUnionInnerType(type);
+    if (innerType) {
+      return { type: innerType, nullable: true };
     } else {
-      return { type, nullable: false };
+      return { type, nullable: prop.optional };
     }
   } else {
-    return { type, nullable: false };
+    return { type, nullable: prop.optional };
   }
 }

package/src/csharp/components/type-expression.tsx

@@ -3,16 +3,15 @@ import { code, type Children } from "@alloy-js/core";
 import { Reference } from "@alloy-js/csharp";
 import {
   getTypeName,
-  isNullType,
   isVoidType,
   type IntrinsicType,
   type Scalar,
   type Type,
-  type Union,
 } from "@typespec/compiler";
 import type { Typekit } from "@typespec/compiler/typekit";
 import { useTsp } from "../../core/index.js";
 import { reportTypescriptDiagnostic } from "../../typescript/lib.js";
+import { getNullableUnionInnerType } from "./utils/nullable-util.js";
 import { efRefkey } from "./utils/refkey.js";
 
 export interface TypeExpressionProps {
@@ -56,28 +55,6 @@ export function TypeExpression(props: TypeExpressionProps): Children {
   );
 }
 
-/** Get the inner type if the union is a nullable, otherwise return undefined */
-function getNullableUnionInnerType(u: Union): Type | undefined {
-  const isNull = (type: Type) => isNullType(type) || isVoidType(type);
-
-  if (Array.from(u.variants.values()).some((v) => isNull(v.type))) {
-    const { $ } = useTsp();
-    const left = Array.from(u.variants.values()).filter((v) => !isNull(v.type));
-    if (left.length === 0) {
-      // a union only has null or void?
-      return $.intrinsic.void;
-    } else if (left.length === 1) {
-      return left[0].type;
-    } else {
-      return $.union.create({
-        name: u.name,
-        variants: left,
-      });
-    }
-  }
-  return undefined;
-}
-
 const intrinsicNameToCSharpType = new Map<string, string | null>([
   // Core types
   ["unknown", "object"], // Matches C#'s `object`

package/src/csharp/components/utils/nullable-util.ts

@@ -0,0 +1,25 @@
+import { useTsp } from "#core/index.js";
+import type { Type, Union } from "@typespec/compiler";
+
+/** Get the inner type if the union is a nullable, otherwise return undefined */
+export function getNullableUnionInnerType(u: Union): Type | undefined {
+  const { $ } = useTsp();
+  const isNull = (type: Type) => type === $.intrinsic.null || type === $.intrinsic.void;
+
+  if (Array.from(u.variants.values()).some((v) => isNull(v.type))) {
+    const { $ } = useTsp();
+    const left = Array.from(u.variants.values()).filter((v) => !isNull(v.type));
+    if (left.length === 0) {
+      // a union only has null or void?
+      return $.intrinsic.void;
+    } else if (left.length === 1) {
+      return left[0].type;
+    } else {
+      return $.union.create({
+        name: u.name,
+        variants: left,
+      });
+    }
+  }
+  return undefined;
+}