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

package/dist/src/csharp/components/class/declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../../src/csharp/components/class/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEvC,OAAO,EAAc,KAAK,SAAS,EAAE,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAO5E,MAAM,WAAW,qBAAsB,SAAQ,IAAI,CAAC,EAAE,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACnF,iFAAiF;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,wCAAwC;IACxC,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;IACxB,8FAA8F;IAC9F,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAYD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,QAAQ,CAuBvE"}
+{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../../src/csharp/components/class/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAO,KAAK,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AACpD,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAEvC,OAAO,EAAc,KAAK,SAAS,EAAE,KAAK,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAO5E,MAAM,WAAW,qBAAsB,SAAQ,IAAI,CAAC,EAAE,CAAC,qBAAqB,EAAE,MAAM,CAAC;IACnF,iFAAiF;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,wCAAwC;IACxC,IAAI,EAAE,KAAK,GAAG,SAAS,CAAC;IACxB,8FAA8F;IAC9F,cAAc,CAAC,EAAE,OAAO,CAAC;CAC1B;AAYD,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,GAAG,QAAQ,CA6BvE"}

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

@@ -19,6 +19,13 @@ export function ClassDeclaration(props) {
   return [_$createComponent(cs.ClassDeclaration, _$mergeProps(props, {
     name: className,
     refkey: refkeys,
+    get baseType() {
+      return props.baseType ?? (props.type.kind === "Model" && props.type.baseModel ? _$createComponent(TypeExpression, {
+        get type() {
+          return props.type.baseModel;
+        }
+      }) : undefined);
+    },
     get doc() {
       return getDocComments($, props.type);
     },

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;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"}
+{"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,7 +1,7 @@
 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";
@@ -14,6 +14,31 @@ export function Property(props) {
   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;
@@ -25,7 +50,10 @@ export function Property(props) {
         }
       });
     },
+    override: overrideType === "override",
+    "new": overrideType === "new",
     "public": true,
+    virtual: isVirtual,
     get required() {
       return !props.type.optional;
     },

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

@@ -1,5 +1,6 @@
 import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
 import { Tester } from "#test/test-host.js";
+import { List } from "@alloy-js/core";
 import { ClassDeclaration, createCSharpNamePolicy, Namespace, SourceFile } from "@alloy-js/csharp";
 import { t } from "@typespec/compiler/testing";
 import { beforeEach, describe, expect, it } from "vitest";
@@ -162,4 +163,80 @@ describe("jsonAttributes", () => {
       }
   `);
   });
+  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(`
+      namespace TestNamespace
+      {
+          class Test
+          {
+              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(`
+      namespace TestNamespace
+      {
+          class Test
+          {
+              public required string? Prop1 { get; set; }
+              public virtual required string? Prop2 { get; set; }
+          }
+      }
+  `);
+  });
 });

package/package.json

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

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

@@ -41,6 +41,12 @@ export function ClassDeclaration(props: ClassDeclarationProps): Children {
         {...props}
         name={className}
         refkey={refkeys}
+        baseType={
+          props.baseType ??
+          (props.type.kind === "Model" && props.type.baseModel ? (
+            <TypeExpression type={props.type.baseModel} />
+          ) : undefined)
+        }
         doc={getDocComments($, props.type)}
       >
         {props.type.kind === "Model" && (

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

@@ -1,5 +1,5 @@
 import { Tester } from "#test/test-host.js";
-import { type Children } from "@alloy-js/core";
+import { List, type Children } from "@alloy-js/core";
 import { ClassDeclaration, createCSharpNamePolicy, Namespace, SourceFile } from "@alloy-js/csharp";
 import { t, type TesterInstance } from "@typespec/compiler/testing";
 import { beforeEach, describe, expect, it } from "vitest";
@@ -138,4 +138,66 @@ describe("jsonAttributes", () => {
       }
   `);
   });
+
+  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(
+      <Wrapper>
+        <List>
+          <Property type={r.prop1} />
+          <Property type={r.prop2} />
+        </List>
+      </Wrapper>,
+    ).toRenderTo(`
+      namespace TestNamespace
+      {
+          class Test
+          {
+              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(
+      <Wrapper>
+        <List>
+          <Property type={r.prop1} />
+          <Property type={r.prop2} />
+        </List>
+      </Wrapper>,
+    ).toRenderTo(`
+      namespace TestNamespace
+      {
+          class Test
+          {
+              public required string? Prop1 { get; set; }
+              public virtual required string? Prop2 { get; set; }
+          }
+      }
+  `);
+  });
 });

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

@@ -1,7 +1,7 @@
 import { type Children } from "@alloy-js/core";
 import * as cs from "@alloy-js/csharp";
 import { Attribute } from "@alloy-js/csharp";
-import { type ModelProperty, resolveEncodedName, type Type } from "@typespec/compiler";
+import { getProperty, type ModelProperty, resolveEncodedName, type Type } from "@typespec/compiler";
 import { useTsp } from "../../../core/index.js";
 import { TypeExpression } from "../type-expression.jsx";
 import { getDocComments } from "../utils/doc-comments.jsx";
@@ -20,11 +20,44 @@ export function Property(props: PropertyProps): Children {
   const result = preprocessPropertyType(props.type);
   const { $ } = useTsp();
 
+  let overrideType: "" | "override" | "new" = "";
+  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 (
     <cs.Property
       name={props.type.name}
       type={<TypeExpression type={result.type} />}
+      override={overrideType === "override"}
+      new={overrideType === "new"}
       public
+      virtual={isVirtual}
       required={!props.type.optional}
       nullable={result.nullable}
       doc={getDocComments($, props.type)}