@typespec/emitter-framework 0.11.0-dev.1 → 0.11.0-dev.10

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

@@ -1,6 +1,6 @@
 import { createComponent as _$createComponent, createIntrinsic as _$createIntrinsic } from "@alloy-js/core/jsx-runtime";
 import { Tester } from "#test/test-host.js";
-import { createCSharpNamePolicy, Namespace, SourceFile } from "@alloy-js/csharp";
+import { createCSharpNamePolicy, SourceFile } from "@alloy-js/csharp";
 import { t } from "@typespec/compiler/testing";
 import { beforeEach, expect, it } from "vitest";
 import { Output } from "../../../core/index.js";
@@ -17,15 +17,10 @@ function Wrapper(props) {
     },
     namePolicy: policy,
     get children() {
-      return _$createComponent(Namespace, {
-        name: "TestNamespace",
+      return _$createComponent(SourceFile, {
+        path: "test.cs",
         get children() {
-          return _$createComponent(SourceFile, {
-            path: "test.cs",
-            get children() {
-              return props.children;
-            }
-          });
+          return props.children;
         }
       });
     }
@@ -48,14 +43,11 @@ it("renders a basic enum declaration", async () => {
       });
     }
   })).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum
     {
-        enum TestEnum
-        {
-            Value1,
-            Value2,
-            Value3
-        }
+        Value1,
+        Value2,
+        Value3
     }
   `);
 });
@@ -72,12 +64,9 @@ it("renders an empty enum declaration", async () => {
       });
     }
   })).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum
     {
-        enum TestEnum
-        {
 
-        }
     }
   `);
 });
@@ -98,13 +87,10 @@ it("can override enum name", async () => {
       });
     }
   })).toRenderTo(`
-    namespace TestNamespace
+    enum CustomEnumName
     {
-        enum CustomEnumName
-        {
-            Value1,
-            Value2
-        }
+        Value1,
+        Value2
     }
   `);
 });
@@ -125,13 +111,10 @@ it("renders an enum with access modifiers", async () => {
       });
     }
   })).toRenderTo(`
-    namespace TestNamespace
+    internal enum TestEnum
     {
-        internal enum TestEnum
-        {
-            Value1,
-            Value2
-        }
+        Value1,
+        Value2
     }
   `);
 });
@@ -153,29 +136,21 @@ it("renders enum with C# naming conventions", async () => {
       return createCSharpNamePolicy();
     },
     get children() {
-      return _$createComponent(Namespace, {
-        name: "TestNamespace",
+      return _$createComponent(SourceFile, {
+        path: "test.cs",
         get children() {
-          return _$createComponent(SourceFile, {
-            path: "test.cs",
-            get children() {
-              return _$createComponent(EnumDeclaration, {
-                type: TestEnum
-              });
-            }
+          return _$createComponent(EnumDeclaration, {
+            type: TestEnum
           });
         }
       });
     }
   })).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum
     {
-        enum TestEnum
-        {
-            ValueOne,
-            ValueTwo,
-            ValueThree
-        }
+        ValueOne,
+        ValueTwo,
+        ValueThree
     }
   `);
 });
@@ -194,13 +169,10 @@ it("renders enum with single value", async () => {
       });
     }
   })).toRenderTo(`
-    namespace TestNamespace
-    {
-        enum TestEnum
-        {
-            OnlyValue
-        }
-    }
+      enum TestEnum
+      {
+          OnlyValue
+      }
   `);
 });
 it("renders enum with numeric-like member names", async () => {
@@ -221,15 +193,12 @@ it("renders enum with numeric-like member names", async () => {
       });
     }
   })).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum
     {
-        enum TestEnum
-        {
-            Value0,
-            Value1,
-            Value10,
-            Value100
-        }
+        Value0,
+        Value1,
+        Value10,
+        Value100
     }
   `);
 });
@@ -257,19 +226,16 @@ it("renders multiple enums in the same namespace", async () => {
       })];
     }
   })).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum1
     {
-        enum TestEnum1
-        {
-            Value1,
-            Value2
-        }
-        enum TestEnum2
-        {
-            OptionA,
-            OptionB,
-            OptionC
-        }
+        Value1,
+        Value2
+    }
+    enum TestEnum2
+    {
+        OptionA,
+        OptionB,
+        OptionC
     }
   `);
 });
@@ -291,19 +257,17 @@ it("renders an enum with doc comments", async () => {
       });
     }
   })).toRenderTo(`
-    namespace TestNamespace
+    enum TestEnum
     {
-        enum TestEnum
-        {
-            /// <summary>
-            /// This is value one
-            /// </summary>
-            Value1,
-            /// <summary>
-            /// This is value two
-            /// </summary>
-            Value2
-        }
+        /// <summary>
+        /// This is value one
+        /// </summary>
+        Value1,
+        /// <summary>
+        /// This is value two
+        /// </summary>
+        Value2
     }
   `);
-});
+});
+//# sourceMappingURL=declaration.test.js.map

package/dist/src/csharp/components/enum/declaration.test.js.map

@@ -0,0 +1 @@
+{"version":3,"names":["Tester","createCSharpNamePolicy","SourceFile","t","beforeEach","expect","it","Output","EnumDeclaration","runner","createInstance","Wrapper","props","policy","_$createComponent","program","namePolicy","children","path","TestEnum","compile","code","enum","type","toRenderTo","name","internal","TestEnum1","TestEnum2","_$createIntrinsic"],"sources":["../../../../../src/csharp/components/enum/declaration.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

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

@@ -1,4 +1,5 @@
 export * from "./class/declaration.js";
 export * from "./enum/declaration.js";
 export * from "./property/property.js";
-export * from "./type-expression.js";
+export * from "./type-expression.js";
+//# sourceMappingURL=index.js.map

package/dist/src/csharp/components/index.js.map

@@ -0,0 +1 @@
+{"version":3,"names":[],"sources":["../../../../src/csharp/components/index.ts"],"sourcesContent":[null],"mappings":"AAAA,cAAc,wBAAwB;AACtC;AACA;AACA","ignoreList":[]}

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;AAMpG,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,CAkDvD;AAED,MAAM,WAAW,sBAAsB;IACrC,IAAI,EAAE,aAAa,CAAC;CACrB"}

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

@@ -1,18 +1,44 @@
 import { memo as _$memo, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
 import * as cs from "@alloy-js/csharp";
 import { Attribute } from "@alloy-js/csharp";
-import { resolveEncodedName } from "@typespec/compiler";
+import { getProperty, 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.
  */
 export function Property(props) {
-  const result = preprocessPropertyType(props.type.type);
+  const result = preprocessPropertyType(props.type);
   const {
     $
   } = useTsp();
+  let overrideType = "";
+  let isVirtual = false;
+  if (props.type.model) {
+    if (props.type.model.baseModel) {
+      const base = props.type.model.baseModel;
+      const baseProperty = getProperty(base, props.type.name);
+      if (baseProperty) {
+        const baseResult = preprocessPropertyType(baseProperty);
+        if (baseResult.nullable === result.nullable && baseResult.type === result.type) {
+          overrideType = "override";
+        } else {
+          overrideType = "new";
+        }
+      }
+    }
+    if (overrideType === "" && props.type.model.derivedModels && props.type.model.derivedModels.length > 0) {
+      isVirtual = props.type.model.derivedModels.some(derived => {
+        const derivedProperty = derived.properties.get(props.type.name);
+        if (derivedProperty) {
+          const derivedResult = preprocessPropertyType(derivedProperty);
+          return derivedResult.nullable === result.nullable && derivedResult.type === result.type;
+        }
+      });
+    }
+  }
   return _$createComponent(cs.Property, {
     get name() {
       return props.type.name;
@@ -24,7 +50,10 @@ export function Property(props) {
         }
       });
     },
+    override: overrideType === "override",
+    "new": overrideType === "new",
     "public": true,
+    virtual: isVirtual,
     get required() {
       return !props.type.optional;
     },
@@ -57,29 +86,26 @@ function JsonNameAttribute(props) {
     }
   });
 }
-function preprocessPropertyType(type) {
-  const {
-    $
-  } = useTsp();
+function preprocessPropertyType(prop) {
+  const type = prop.type;
   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
     };
   }
-}
+}
+//# sourceMappingURL=property.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["cs","Attribute","getProperty","resolveEncodedName","useTsp","TypeExpression","getDocComments","getNullableUnionInnerType","Property","props","result","preprocessPropertyType","type","$","overrideType","isVirtual","model","baseModel","base","baseProperty","name","baseResult","nullable","derivedModels","length","some","derived","derivedProperty","properties","get","derivedResult","_$createComponent","override","virtual","required","optional","doc","attributes","_$memo","jsonAttributes","JsonNameAttribute","undefined","set","program","jsonName","args","JSON","stringify","prop","kind","innerType"],"sources":["../../../../../src/csharp/components/property/property.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

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

@@ -1,6 +1,7 @@
 import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
 import { Tester } from "#test/test-host.js";
-import { ClassDeclaration, createCSharpNamePolicy, Namespace, SourceFile } from "@alloy-js/csharp";
+import { List } from "@alloy-js/core";
+import { ClassDeclaration, createCSharpNamePolicy, SourceFile } from "@alloy-js/csharp";
 import { t } from "@typespec/compiler/testing";
 import { beforeEach, describe, expect, it } from "vitest";
 import { Output } from "../../../core/components/output.js";
@@ -17,18 +18,13 @@ function Wrapper(props) {
     },
     namePolicy: policy,
     get children() {
-      return _$createComponent(Namespace, {
-        name: "TestNamespace",
+      return _$createComponent(SourceFile, {
+        path: "test.cs",
         get children() {
-          return _$createComponent(SourceFile, {
-            path: "test.cs",
+          return _$createComponent(ClassDeclaration, {
+            name: "Test",
             get children() {
-              return _$createComponent(ClassDeclaration, {
-                name: "Test",
-                get children() {
-                  return props.children;
-                }
-              });
+              return props.children;
             }
           });
         }
@@ -51,12 +47,51 @@ it("maps prop: string | null to nullable property", async () => {
       });
     }
   })).toRenderTo(`
-      namespace TestNamespace
+      class Test
       {
-          class Test
-          {
-              public required string? Prop1 { get; set; }
-          }
+          public required string? Prop1 { get; set; }
+      }
+  `);
+});
+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(`
+      class Test
+      {
+          public string? Prop1 { get; set; }
+      }
+  `);
+});
+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(`
+      class Test
+      {
+          public string? Prop1 { get; set; }
       }
   `);
 });
@@ -77,13 +112,10 @@ describe("jsonAttributes", () => {
         });
       }
     })).toRenderTo(`
-      namespace TestNamespace
+      class Test
       {
-          class Test
-          {
-              [System.Text.Json.JsonPropertyName("prop1")]
-              public required string Prop1 { get; set; }
-          }
+          [System.Text.Json.JsonPropertyName("prop1")]
+          public required string Prop1 { get; set; }
       }
   `);
   });
@@ -104,14 +136,82 @@ describe("jsonAttributes", () => {
         });
       }
     })).toRenderTo(`
-      namespace TestNamespace
+        class Test
+        {
+            [System.Text.Json.JsonPropertyName("prop_1")]
+            public required string Prop1 { get; set; }
+        }
+  `);
+  });
+  it("inherit prop: override, new", async () => {
+    const r = await tester.compile(t.code`
+      model TestModel extends BaseModel {
+        ${t.modelProperty("prop1")}: string;
+        ${t.modelProperty("prop2")}: string | null;
+      }
+      model BaseModel {
+        prop1: string | null;
+        prop2: string | null;
+      }
+    `);
+    expect(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(List, {
+          get children() {
+            return [_$createComponent(Property, {
+              get type() {
+                return r.prop1;
+              }
+            }), _$createComponent(Property, {
+              get type() {
+                return r.prop2;
+              }
+            })];
+          }
+        });
+      }
+    })).toRenderTo(`
+      class Test
       {
-          class Test
-          {
-              [System.Text.Json.JsonPropertyName("prop_1")]
-              public required string Prop1 { get; set; }
+          public new required string Prop1 { get; set; }
+          public override required string? Prop2 { get; set; }
+      }
+    `);
+  });
+  it("inherit prop: virtual", async () => {
+    const r = await tester.compile(t.code`
+      model TestModel extends BaseModel {
+        prop1: string;
+        prop2: string | null;
+      }
+      model BaseModel {
+        ${t.modelProperty("prop1")}: string | null;
+        ${t.modelProperty("prop2")}: string | null;
+      }
+    `);
+    expect(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(List, {
+          get children() {
+            return [_$createComponent(Property, {
+              get type() {
+                return r.prop1;
+              }
+            }), _$createComponent(Property, {
+              get type() {
+                return r.prop2;
+              }
+            })];
           }
+        });
       }
-  `);
+    })).toRenderTo(`
+      class Test
+      {
+          public required string? Prop1 { get; set; }
+          public virtual required string? Prop2 { get; set; }
+      }
+    `);
   });
-});
+});
+//# sourceMappingURL=property.test.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["Tester","List","ClassDeclaration","createCSharpNamePolicy","SourceFile","t","beforeEach","describe","expect","it","Output","Property","tester","createInstance","Wrapper","props","policy","_$createComponent","program","namePolicy","children","path","name","prop1","compile","code","modelProperty","type","toRenderTo","jsonAttributes","r","prop2"],"sources":["../../../../../src/csharp/components/property/property.test.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

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,EAAE,KAAK,QAAQ,EAAQ,MAAM,gBAAgB,CAAC;AAErD,OAAO,EAAe,KAAK,aAAa,EAAE,KAAK,MAAM,EAAE,KAAK,IAAI,EAAE,MAAM,oBAAoB,CAAC;AAC7F,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,CAoBnE;AAED,QAAA,MAAM,yBAAyB,4BAqC7B,CAAC;AAEH,wBAAgB,4BAA4B,CAC1C,CAAC,EAAE,OAAO,EACV,IAAI,EAAE,MAAM,GAAG,aAAa,GAC3B,MAAM,GAAG,IAAI,CAoBf;AA0BD,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,11 +2,20 @@ 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 } 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") {
+    const nullabletype = getNullableUnionInnerType(props.type);
+    if (nullabletype) {
+      return code`${_$createComponent(TypeExpression, {
+        type: nullabletype
+      })}?`;
+    }
+  }
   const {
     $
   } = useTsp();
@@ -39,6 +48,15 @@ export function TypeExpression(props) {
         return props.type.indexer.value;
       }
     })}>`;
+  } else if ($.literal.isString(props.type)) {
+    // c# doesn't have literal types, so we map them to their corresponding C# types in general
+    return code`string`;
+  } else if ($.literal.isNumeric(props.type)) {
+    return Number.isInteger(props.type.value) ? code`int` : code`double`;
+  } else if ($.literal.isBoolean(props.type)) {
+    return code`bool`;
+  } else if (isVoidType(props.type)) {
+    return code`void`;
   }
   throw new Error(`Unsupported type for TypeExpression: ${props.type.kind} (${getTypeName(props.type)})`);
 }
@@ -142,11 +160,12 @@ function isDeclaration($, type) {
       if ($.array.is(type) || $.record.is(type)) {
         return false;
       }
-      return Boolean(type.name);
+      return true;
     case "Union":
       return Boolean(type.name);
     default:
       return false;
   }
 }
-export { intrinsicNameToCSharpType };
+export { intrinsicNameToCSharpType };
+//# sourceMappingURL=type-expression.js.map

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

@@ -0,0 +1 @@
+{"version":3,"names":["Experimental_OverridableComponent","code","Reference","getTypeName","isVoidType","useTsp","reportTypescriptDiagnostic","getNullableUnionInnerType","efRefkey","TypeExpression","props","type","kind","nullabletype","_$createComponent","$","isDeclaration","reference","children","refkey","scalar","is","getScalarIntrinsicExpression","array","indexer","value","record","literal","isString","isNumeric","Number","isInteger","isBoolean","Error","intrinsicNameToCSharpType","Map","intrinsicName","isUtcDateTime","extendsUtcDateTime","getStdBase","name","csType","get","program","target","Boolean"],"sources":["../../../../src/csharp/components/type-expression.tsx"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}