@typespec/emitter-framework 0.9.0-dev.3 → 0.9.0-dev.6

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

@@ -0,0 +1,13 @@
+import * as ay from "@alloy-js/core";
+import * as cs from "@alloy-js/csharp";
+import { Interface, Model } from "@typespec/compiler";
+export interface ClassDeclarationProps extends Omit<cs.ClassDeclarationProps, "name"> {
+    /** Set an alternative name for the class. Otherwise default to the type name. */
+    name?: string;
+    /** Type to use to create this class. */
+    type: Model | Interface;
+    /** If set the property will add the json serialization attributes(using System.Text.Json). */
+    jsonAttributes?: boolean;
+}
+export declare function ClassDeclaration(props: ClassDeclarationProps): ay.Children;
+//# sourceMappingURL=declaration.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../../src/csharp/components/class/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAOtD,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,EAAE,CAAC,QAAQ,CAuB1E"}

package/dist/src/csharp/components/{class-declaration.js → class/declaration.js}

@@ -1,9 +1,11 @@
-import { memo as _$memo, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { memo as _$memo, mergeProps as _$mergeProps, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
 import * as ay from "@alloy-js/core";
 import * as cs from "@alloy-js/csharp";
-import { useTsp } from "../../core/index.js";
-import { TypeExpression } from "./type-expression.js";
-import { declarationRefkeys } from "./utils/refkey.js";
+import { useTsp } from "../../../core/index.js";
+import { Property } from "../property/property.js";
+import { TypeExpression } from "../type-expression.js";
+import { getDocComments } from "../utils/doc-comments.js";
+import { declarationRefkeys } from "../utils/refkey.js";
 export function ClassDeclaration(props) {
   const {
     $
@@ -12,16 +14,19 @@ export function ClassDeclaration(props) {
   const className = props.name ?? namePolicy.getName(props.type.name, "class");
   const refkeys = declarationRefkeys(props.refkey, props.type)[0]; // TODO: support multiple refkeys for declarations in alloy
 
-  return [_$createComponent(cs.Class, {
+  return [_$createComponent(cs.ClassDeclaration, _$mergeProps(props, {
     name: className,
-    get accessModifier() {
-      return props.accessModifier;
-    },
     refkey: refkeys,
+    get doc() {
+      return getDocComments($, props.type);
+    },
     get children() {
-      return [_$memo(() => _$memo(() => !!$.model.is(props.type))() && _$createComponent(ClassProperties, {
+      return [_$memo(() => _$memo(() => props.type.kind === "Model")() && _$createComponent(ClassProperties, {
         get type() {
           return props.type;
+        },
+        get jsonAttributes() {
+          return props.jsonAttributes;
         }
       })), _$memo(() => _$memo(() => props.type.kind === "Interface")() && _$createComponent(ClassMethods, {
         get type() {
@@ -29,50 +34,36 @@ export function ClassDeclaration(props) {
         }
       }))];
     }
-  })];
+  }))];
 }
 function ClassProperties(props) {
-  const namePolicy = cs.useCSharpNamePolicy();
-  const classProperties = [];
-  for (const [name, prop] of props.type.properties) {
-    classProperties.push([_$createComponent(cs.ClassMember, {
-      get name() {
-        return namePolicy.getName(name, "class-member-public");
-      },
-      get type() {
-        return _$createComponent(TypeExpression, {
-          get type() {
-            return prop.type;
-          }
-        });
-      },
-      accessModifier: "public"
-    }), " ", _$createComponent(ay.Block, {
-      newline: true,
-      get children() {
-        return _$createComponent(ay.StatementList, {
-          children: ["get", "set"]
-        });
-      }
-    })]);
-  }
   return _$createComponent(ay.For, {
-    each: classProperties,
+    get each() {
+      return props.type.properties.entries();
+    },
     hardline: true,
-    children: c => c
+    children: ([name, property]) => _$createComponent(Property, {
+      type: property,
+      get jsonAttributes() {
+        return props.jsonAttributes;
+      }
+    })
   });
 }
 function ClassMethods(props) {
+  const {
+    $
+  } = useTsp();
   const namePolicy = cs.useCSharpNamePolicy();
   const abstractMethods = [];
-  for (const [name, prop] of props.type.operations) {
+  for (const [name, method] of props.type.operations) {
     abstractMethods.push(_$createComponent(cs.ClassMethod, {
       get name() {
         return namePolicy.getName(name, "class-method");
       },
-      methodModifier: "abstract",
+      abstract: true,
       get parameters() {
-        return [...prop.parameters.properties.entries()].map(([name, prop]) => {
+        return [...method.parameters.properties.entries()].map(([name, prop]) => {
           return {
             name: namePolicy.getName(name, "type-parameter"),
             type: _$createComponent(TypeExpression, {
@@ -83,11 +74,14 @@ function ClassMethods(props) {
           };
         });
       },
-      accessModifier: "public",
+      "public": true,
+      get doc() {
+        return getDocComments($, method);
+      },
       get returns() {
         return _$createComponent(TypeExpression, {
           get type() {
-            return prop.returnType;
+            return method.returnType;
           }
         });
       }

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

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=declaration.test.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"declaration.test.d.ts","sourceRoot":"","sources":["../../../../../src/csharp/components/class/declaration.test.tsx"],"names":[],"mappings":""}

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

@@ -0,0 +1,392 @@
+import { createComponent as _$createComponent, createIntrinsic as _$createIntrinsic } from "@alloy-js/core/jsx-runtime";
+import { Tester } from "#test/test-host.js";
+import { render } from "@alloy-js/core";
+import { d } from "@alloy-js/core/testing";
+import { createCSharpNamePolicy, Namespace, SourceFile } from "@alloy-js/csharp";
+import { t } from "@typespec/compiler/testing";
+import { beforeEach, describe, it } from "vitest";
+import { assertFileContents } from "../../../../test/csharp/utils.js";
+import { Output } from "../../../core/index.js";
+import { ClassDeclaration, EnumDeclaration } from "../../index.js";
+let runner;
+beforeEach(async () => {
+  runner = await Tester.createInstance();
+});
+function Wrapper(props) {
+  const policy = createCSharpNamePolicy();
+  return _$createComponent(Output, {
+    get program() {
+      return runner.program;
+    },
+    namePolicy: policy,
+    get children() {
+      return _$createComponent(Namespace, {
+        name: "TestNamespace",
+        get children() {
+          return _$createComponent(SourceFile, {
+            path: "test.cs",
+            get children() {
+              return props.children;
+            }
+          });
+        }
+      });
+    }
+  });
+}
+it("renders an empty class declaration", async () => {
+  const {
+    TestModel
+  } = await runner.compile(t.code`
+    model ${t.model("TestModel")} {}
+  `);
+  const res = render(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(ClassDeclaration, {
+        type: TestModel
+      });
+    }
+  }));
+  assertFileContents(res, d`
+      namespace TestNamespace
+      {
+          class TestModel
+          {
+
+          }
+      }
+    `);
+});
+it("renders a class declaration with properties", async () => {
+  const {
+    TestModel
+  } = await runner.compile(t.code`
+    model ${t.model("TestModel")} {
+      @test Prop1: string;
+      @test Prop2: int32;
+    }
+  `);
+  const res = render(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(ClassDeclaration, {
+        type: TestModel
+      });
+    }
+  }));
+  assertFileContents(res, d`
+      namespace TestNamespace
+      {
+          class TestModel
+          {
+              public required string Prop1 { get; set; }
+              public required int Prop2 { get; set; }
+          }
+      }
+    `);
+});
+it("can override class name", async () => {
+  const {
+    TestModel
+  } = await runner.compile(t.code`
+    model ${t.model("TestModel")} {}
+  `);
+  const res = render(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(ClassDeclaration, {
+        type: TestModel,
+        name: "CustomClassName"
+      });
+    }
+  }));
+  assertFileContents(res, d`
+      namespace TestNamespace
+      {
+          class CustomClassName
+          {
+
+          }
+      }
+    `);
+});
+it("renders a class with access modifiers", async () => {
+  const {
+    TestModel
+  } = await runner.compile(t.code`
+    model ${t.model("TestModel")} {
+    }
+  `);
+  const res = render(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(ClassDeclaration, {
+        type: TestModel,
+        "protected": true
+      });
+    }
+  }));
+  assertFileContents(res, d`
+      namespace TestNamespace
+      {
+          protected class TestModel
+          {
+
+          }
+      }
+    `);
+});
+describe("from an interface", () => {
+  it("renders an empty class", async () => {
+    const {
+      TestInterface
+    } = await runner.compile(t.code`
+    interface ${t.interface("TestInterface")} {
+    }
+  `);
+    const res = render(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(ClassDeclaration, {
+          type: TestInterface
+        });
+      }
+    }));
+    assertFileContents(res, d`
+      namespace TestNamespace
+      {
+          class TestInterface
+          {
+
+          }
+      }
+    `);
+  });
+  it("renders a class with operations", async () => {
+    const {
+      TestInterface
+    } = await runner.compile(t.code`
+    interface ${t.interface("TestInterface")} {
+      op getName(id: string): string;
+    }
+  `);
+    const res = render(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(ClassDeclaration, {
+          type: TestInterface
+        });
+      }
+    }));
+    assertFileContents(res, d`
+      namespace TestNamespace
+      {
+          class TestInterface
+          {
+              public abstract string GetName(string id);
+          }
+      }
+    `);
+  });
+});
+it("renders a class with model members", async () => {
+  const {
+    TestModel,
+    TestReference
+  } = await runner.compile(t.code`
+    model ${t.model("TestReference")} { }
+    model ${t.model("TestModel")} {
+      prop1: TestReference;
+    }
+  `);
+  const res = render(_$createComponent(Wrapper, {
+    get children() {
+      return [_$createComponent(ClassDeclaration, {
+        type: TestReference
+      }), _$createIntrinsic("hbr", {}), _$createComponent(ClassDeclaration, {
+        type: TestModel
+      })];
+    }
+  }));
+  assertFileContents(res, d`
+      namespace TestNamespace
+      {
+          class TestReference
+          {
+
+          }
+          class TestModel
+          {
+              public required TestReference Prop1 { get; set; }
+          }
+      }
+    `);
+});
+it("renders a class with enum members", async () => {
+  const {
+    TestModel,
+    TestEnum
+  } = await runner.compile(t.code`
+    @test enum ${t.enum("TestEnum")} {
+      Value1;
+      Value2;
+    }
+    model ${t.model("TestModel")} {
+      @test prop1: TestEnum;
+    }
+  `);
+  const res = render(_$createComponent(Wrapper, {
+    get children() {
+      return [_$createComponent(EnumDeclaration, {
+        type: TestEnum
+      }), _$createIntrinsic("hbr", {}), _$createComponent(ClassDeclaration, {
+        type: TestModel
+      })];
+    }
+  }));
+  assertFileContents(res, d`
+      namespace TestNamespace
+      {
+          enum TestEnum
+          {
+              Value1,
+              Value2
+          }
+          class TestModel
+          {
+              public required TestEnum Prop1 { get; set; }
+          }
+      }
+    `);
+});
+it("maps prop: string | null to nullable property", async () => {
+  const {
+    TestModel
+  } = await runner.compile(t.code`
+    model ${t.model("TestModel")} {
+      prop1: string | null;
+    }
+  `);
+  const res = render(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(ClassDeclaration, {
+        type: TestModel
+      });
+    }
+  }));
+  assertFileContents(res, d`
+      namespace TestNamespace
+      {
+          class TestModel
+          {
+              public required string? Prop1 { get; set; }
+          }
+      }
+    `);
+});
+it("renders a class with string enums", async () => {
+  const {
+    TestModel,
+    TestEnum
+  } = await runner.compile(t.code`
+    @test enum ${t.enum("TestEnum")} {
+      Value1;
+      Value2;
+    }
+    model ${t.model("TestModel")} {
+      @test prop1: TestEnum;
+    }
+  `);
+  const res = render(_$createComponent(Wrapper, {
+    get children() {
+      return [_$createComponent(EnumDeclaration, {
+        type: TestEnum
+      }), _$createIntrinsic("hbr", {}), _$createComponent(ClassDeclaration, {
+        type: TestModel
+      })];
+    }
+  }));
+  assertFileContents(res, d`
+      namespace TestNamespace
+      {
+          enum TestEnum
+          {
+              Value1,
+              Value2
+          }
+          class TestModel
+          {
+              public required TestEnum Prop1 { get; set; }
+          }
+      }
+    `);
+});
+describe("with doc comments", () => {
+  it("renders a model with docs", async () => {
+    const {
+      TestModel
+    } = await runner.compile(t.code`
+    @doc("This is a test model")
+    model ${t.model("TestModel")} {
+      @doc("This is a test property")
+        prop1: string;
+      }
+    
+  `);
+    const res = render(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(ClassDeclaration, {
+          type: TestModel
+        });
+      }
+    }));
+    assertFileContents(res, d`
+      namespace TestNamespace
+      {
+          /// <summary>
+          /// This is a test model
+          /// </summary>
+          class TestModel
+          {
+              /// <summary>
+              /// This is a test property
+              /// </summary>
+              public required string Prop1 { get; set; }
+          }
+      }
+    `);
+  });
+  it("renders an interface with docs", async () => {
+    const {
+      TestInterface
+    } = await runner.compile(t.code`
+      @doc("This is a test interface")
+      @test interface ${t.interface("TestInterface")} {
+        @doc("This is a test operation")
+        @returnsDoc("The name of the item")
+        op getName(id: string): string;
+      }
+    `);
+    const res = render(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(ClassDeclaration, {
+          type: TestInterface
+        });
+      }
+    }));
+    assertFileContents(res, d`
+      namespace TestNamespace
+      {
+          /// <summary>
+          /// This is a test interface
+          /// </summary>
+          class TestInterface
+          {
+              /// <summary>
+              /// This is a test operation
+              /// </summary>
+              ///
+              /// <returns>
+              /// The name of the item
+              /// </returns>
+              public abstract string GetName(string id);
+          }
+      }
+    `);
+  });
+});

package/dist/src/csharp/components/enum-declaration.d.ts

@@ -1,7 +1,7 @@
 import * as ay from "@alloy-js/core";
 import * as cs from "@alloy-js/csharp";
 import { Enum, Union } from "@typespec/compiler";
-export interface EnumDeclarationProps extends Omit<cs.EnumProps, "name"> {
+export interface EnumDeclarationProps extends Omit<cs.EnumDeclarationProps, "name"> {
     name?: string;
     type: Union | Enum;
 }

package/dist/src/csharp/components/enum-declaration.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"enum-declaration.d.ts","sourceRoot":"","sources":["../../../../src/csharp/components/enum-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAKjD,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAAC,EAAE,CAAC,SAAS,EAAE,MAAM,CAAC;IACtE,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;CACpB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,EAAE,CAAC,QAAQ,CAmCxE"}
+{"version":3,"file":"enum-declaration.d.ts","sourceRoot":"","sources":["../../../../src/csharp/components/enum-declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,gBAAgB,CAAC;AACrC,OAAO,KAAK,EAAE,MAAM,kBAAkB,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,oBAAoB,CAAC;AAMjD,MAAM,WAAW,oBAAqB,SAAQ,IAAI,CAAC,EAAE,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACjF,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,EAAE,KAAK,GAAG,IAAI,CAAC;CACpB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,GAAG,EAAE,CAAC,QAAQ,CA0CxE"}

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

@@ -1,8 +1,9 @@
-import { memo as _$memo, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { createComponent as _$createComponent, mergeProps as _$mergeProps, memo as _$memo } from "@alloy-js/core/jsx-runtime";
 import * as ay from "@alloy-js/core";
 import * as cs from "@alloy-js/csharp";
 import { useTsp } from "../../core/index.js";
 import { reportDiagnostic } from "../../lib.js";
+import { getDocComments } from "./utils/doc-comments.js";
 import { declarationRefkeys, efRefkey } from "./utils/refkey.js";
 export function EnumDeclaration(props) {
   const {
@@ -26,27 +27,29 @@ export function EnumDeclaration(props) {
   const refkeys = declarationRefkeys(props.refkey, props.type)[0]; // TODO: support multiple refkeys for declarations in alloy
   const name = props.name ?? cs.useCSharpNamePolicy().getName(props.type.name, "enum");
   const members = Array.from(type.members.entries());
-  return _$createComponent(cs.Enum, {
+  return [_$createComponent(cs.EnumDeclaration, _$mergeProps({
     name: name,
-    refkey: refkeys,
-    get accessModifier() {
-      return props.accessModifier ?? "public";
-    },
+    refkey: refkeys
+  }, props, {
     get children() {
       return _$createComponent(ay.For, {
         each: members,
         joiner: ",\n",
         children: ([key, value]) => {
-          return _$createComponent(cs.EnumMember, {
+          return [_$createComponent(cs.DocWhen, {
+            get doc() {
+              return getDocComments($, value);
+            }
+          }), _$createComponent(cs.EnumMember, {
             get name() {
               return cs.useCSharpNamePolicy().getName(key, "enum-member");
             },
             get refkey() {
               return _$memo(() => !!$.union.is(props.type))() ? efRefkey(props.type.variants.get(key)) : efRefkey(value);
             }
-          });
+          })];
         }
       });
     }
-  });
+  }))];
 }

package/dist/src/csharp/components/index.d.ts

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

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/csharp/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,yBAAyB,CAAC;AACxC,cAAc,wBAAwB,CAAC;AACvC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/csharp/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,wBAAwB,CAAC;AACvC,cAAc,wBAAwB,CAAC;AACvC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC"}

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

@@ -1,3 +1,4 @@
-export * from "./class-declaration.js";
+export * from "./class/declaration.js";
 export * from "./enum-declaration.js";
+export * from "./property/property.js";
 export * from "./type-expression.js";

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

@@ -0,0 +1,15 @@
+import { Children } from "@alloy-js/core";
+import { ModelProperty } from "@typespec/compiler";
+export interface PropertyProps {
+    type: ModelProperty;
+    /** If set the property will add the json serialization attributes(using System.Text.Json). */
+    jsonAttributes?: boolean;
+}
+/**
+ * Create a C# property declaration from a TypeSpec property type.
+ */
+export declare function Property(props: PropertyProps): Children;
+export interface JsonNameAttributeProps {
+    type: ModelProperty;
+}
+//# sourceMappingURL=property.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../../../src/csharp/components/property/property.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,gBAAgB,CAAC;AAG1C,OAAO,EAAE,aAAa,EAA4B,MAAM,oBAAoB,CAAC;AAK7E,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"}