@alloy-js/csharp 0.18.0-dev.5 → 0.18.0-dev.7

package/src/components/index.ts

@@ -1,7 +1,9 @@
 export * from "./ClassDeclaration.jsx";
-export { ClassMethod, type ClassMethodProps } from "./ClassMethod.jsx";
+export * from "./ClassMethod.jsx";
 export * from "./Declaration.js";
 export * from "./EnumDeclaration.jsx";
+export * from "./interface/declaration.js";
+export * from "./interface/method.js";
 export * from "./Name.js";
 export * from "./Namespace.js";
 export * from "./Parameters.js";

package/src/components/interface/declaration.test.tsx

@@ -0,0 +1,45 @@
+import { describe, expect, it } from "vitest";
+import { TestNamespace } from "../../../test/utils.jsx";
+import { InterfaceDeclaration } from "./declaration.jsx";
+
+it("declares class with no members", () => {
+  expect(
+    <TestNamespace>
+      <InterfaceDeclaration name="TestInterface" />
+    </TestNamespace>,
+  ).toRenderTo(`
+      interface TestInterface;
+  `);
+});
+
+describe("modifiers", () => {
+  it.each(["public", "private", "internal"])("%s", (mod) => {
+    expect(
+      <TestNamespace>
+        <InterfaceDeclaration {...{ [mod]: true }} name="TestInterface" />
+      </TestNamespace>,
+    ).toRenderTo(`
+        ${mod} interface TestInterface;
+    `);
+  });
+
+  it.each(["partial"])("%s", (mod) => {
+    expect(
+      <TestNamespace>
+        <InterfaceDeclaration {...{ [mod]: true }} name="TestInterface" />
+      </TestNamespace>,
+    ).toRenderTo(`
+        ${mod} interface TestInterface;
+    `);
+  });
+
+  it("combines modifiers", () => {
+    expect(
+      <TestNamespace>
+        <InterfaceDeclaration public partial name="TestInterface" />
+      </TestNamespace>,
+    ).toRenderTo(`
+        public partial interface TestInterface;
+    `);
+  });
+});

package/src/components/interface/declaration.tsx

@@ -0,0 +1,104 @@
+import * as core from "@alloy-js/core";
+import {
+  AccessModifiers,
+  computeModifiersPrefix,
+  getAccessModifier,
+  makeModifiers,
+} from "../../modifiers.js";
+import { useCSharpNamePolicy } from "../../name-policy.js";
+import { CSharpOutputSymbol } from "../../symbols/csharp-output-symbol.js";
+import { CSharpMemberScope } from "../../symbols/scopes.js";
+import { Name } from "../Name.jsx";
+
+export interface InterfaceModifiers {
+  readonly partial?: boolean;
+}
+
+const getInterfaceModifiers = makeModifiers<InterfaceModifiers>(["partial"]);
+
+// properties for creating a class
+export interface InterfaceDeclarationProps
+  extends Omit<core.DeclarationProps, "nameKind">,
+    AccessModifiers,
+    InterfaceModifiers {
+  name: string;
+  refkey?: core.Refkey;
+  typeParameters?: Record<string, core.Refkey>;
+}
+
+/**
+ * CSharp interface declaration.
+ * @example
+ * ```tsx
+ * <InterfaceDeclaration public name="IMyInterface">
+ *   <InterfaceMember public name="MyProperty" type="int" />
+ *   <InterfaceMethod public name="MyMethod" returnType="void">
+ *     <Parameter name="value" type="int" />
+ *   </InterfaceMethod>
+ * </InterfaceDeclaration>
+ * ```
+ * This will produce:
+ * ```csharp
+ * public interface MyIface
+ * {
+ *   public int MyProperty { get; set; }
+ *   public void MyMethod(int value);
+ * }
+ * ```
+ */
+export function InterfaceDeclaration(props: InterfaceDeclarationProps) {
+  const name = useCSharpNamePolicy().getName(props.name!, "interface");
+
+  const thisInterfaceSymbol = new CSharpOutputSymbol(name, {
+    refkeys: props.refkey,
+  });
+
+  // this creates a new scope for the interface definition.
+  // members will automatically "inherit" this scope so
+  // that refkeys to them will produce the fully-qualified
+  // name e.g. Foo.Bar.
+  const thisInterfaceScope = new CSharpMemberScope("interface-decl", {
+    owner: thisInterfaceSymbol,
+  });
+
+  let typeParams: core.Children;
+  if (props.typeParameters) {
+    const typeParamNames = new Array<string>();
+    for (const entry of Object.entries(props.typeParameters)) {
+      typeParamNames.push(
+        useCSharpNamePolicy().getName(entry[0], "type-parameter"),
+      );
+      // create a symbol for each type param so its
+      // refkey resolves to the type param's name
+      new CSharpOutputSymbol(entry[0], {
+        scope: thisInterfaceScope,
+        refkeys: entry[1],
+      });
+    }
+    typeParams = (
+      <group>
+        {"<"}
+        <core.For each={typeParamNames} comma line>
+          {(name) => name}
+        </core.For>
+        {">"}
+      </group>
+    );
+  }
+
+  const modifiers = computeModifiersPrefix([
+    getAccessModifier(props),
+    getInterfaceModifiers(props),
+  ]);
+  return (
+    <core.Declaration symbol={thisInterfaceSymbol}>
+      {modifiers}interface <Name />
+      {typeParams}
+      {props.children ?
+        <core.Block newline>
+          <core.Scope value={thisInterfaceScope}>{props.children}</core.Scope>
+        </core.Block>
+      : ";"}
+    </core.Declaration>
+  );
+}

package/src/components/interface/method.test.tsx

@@ -0,0 +1,104 @@
+import { Children } from "@alloy-js/core/jsx-runtime";
+import { describe, expect, it } from "vitest";
+import { TestNamespace } from "../../../test/utils.jsx";
+import { InterfaceDeclaration } from "./declaration.jsx";
+import { InterfaceMethod } from "./method.jsx";
+
+const Wrapper = (props: { children: Children }) => (
+  <TestNamespace>
+    <InterfaceDeclaration public name="TestInterface">
+      {props.children}
+    </InterfaceDeclaration>
+  </TestNamespace>
+);
+
+describe("modifiers", () => {
+  describe("access modifiers", () => {
+    it.each(["public", "private", "protected", "internal"] as const)(
+      "%s",
+      (accessModifier) => {
+        expect(
+          <Wrapper>
+            <InterfaceMethod {...{ [accessModifier]: true }} name="MethodOne" />
+          </Wrapper>,
+        ).toRenderTo(`
+        public interface TestInterface
+        {
+          ${accessModifier} void MethodOne();
+        }
+      `);
+      },
+    );
+  });
+
+  describe("method modifiers", () => {
+    it.each(["new"] as const)("%s", (methodModifier) => {
+      expect(
+        <Wrapper>
+          <InterfaceMethod {...{ [methodModifier]: true }} name="MethodOne" />
+        </Wrapper>,
+      ).toRenderTo(`
+        public interface TestInterface
+        {
+          ${methodModifier} void MethodOne();
+        }
+      `);
+    });
+  });
+
+  it("combine modifiers", () => {
+    expect(
+      <Wrapper>
+        <InterfaceMethod returns="Task" public new name="MethodOne" />
+      </Wrapper>,
+    ).toRenderTo(`
+        public interface TestInterface
+        {
+          public new Task MethodOne();
+        }
+      `);
+  });
+});
+
+it("applies PascalCase naming policy", () => {
+  expect(
+    <Wrapper>
+      <InterfaceMethod name="method_one" />
+    </Wrapper>,
+  ).toRenderTo(`
+    public interface TestInterface
+    {
+      void MethodOne();
+    }
+`);
+});
+
+it("defines params and return type", () => {
+  const params = [
+    {
+      name: "intParam",
+      type: "int",
+    },
+    {
+      name: "stringParam",
+      type: "string",
+    },
+  ];
+  const res = (
+    <Wrapper>
+      <InterfaceMethod
+        public
+        name="MethodOne"
+        parameters={params}
+        returns="string"
+      />
+    </Wrapper>
+  );
+
+  expect(res).toRenderTo(`
+    public interface TestInterface
+    {
+      public string MethodOne(int intParam, string stringParam);
+    }
+  `);
+});

package/src/components/interface/method.tsx

@@ -0,0 +1,77 @@
+import {
+  Block,
+  Children,
+  MemberDeclaration,
+  refkey,
+  Refkey,
+  Scope,
+} from "@alloy-js/core";
+import {
+  AccessModifiers,
+  computeModifiersPrefix,
+  getAccessModifier,
+  makeModifiers,
+} from "../../modifiers.js";
+import { useCSharpNamePolicy } from "../../name-policy.js";
+import { CSharpOutputSymbol } from "../../symbols/csharp-output-symbol.js";
+import { CSharpMemberScope, useCSharpScope } from "../../symbols/scopes.js";
+import { ParameterProps, Parameters } from "../Parameters.jsx";
+
+/** Method modifiers. Can only be one. */
+export interface InterfaceMethodModifiers {
+  readonly new?: boolean;
+}
+
+const getMethodModifier = makeModifiers<InterfaceMethodModifiers>(["new"]);
+
+// properties for creating a method
+export interface InterfaceMethodProps
+  extends AccessModifiers,
+    InterfaceMethodModifiers {
+  name: string;
+  refkey?: Refkey;
+  children?: Children;
+  parameters?: Array<ParameterProps>;
+  returns?: Children;
+}
+
+// a C# interface method
+export function InterfaceMethod(props: InterfaceMethodProps) {
+  const name = useCSharpNamePolicy().getName(props.name, "class-method");
+  const scope = useCSharpScope();
+  if (scope.kind !== "member" || scope.name !== "interface-decl") {
+    throw new Error(
+      "can't define an interface method outside of an interface scope",
+    );
+  }
+
+  const methodSymbol = new CSharpOutputSymbol(name, {
+    scope,
+    refkeys: props.refkey ?? refkey(props.name),
+  });
+
+  // scope for method declaration
+  const methodScope = new CSharpMemberScope("method-decl", {
+    owner: methodSymbol,
+  });
+
+  const params =
+    props.parameters ? <Parameters parameters={props.parameters} /> : "";
+
+  const modifiers = computeModifiersPrefix([
+    getAccessModifier(props),
+    getMethodModifier(props),
+  ]);
+  // note that scope wraps the method decl so that the params get the correct scope
+  return (
+    <MemberDeclaration symbol={methodSymbol}>
+      <Scope value={methodScope}>
+        {modifiers}
+        {props.returns ?? "void"} {name}({params})
+        {props.children ?
+          <Block newline>{props.children}</Block>
+        : ";"}
+      </Scope>
+    </MemberDeclaration>
+  );
+}

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

@@ -0,0 +1,122 @@
+import { Children } from "@alloy-js/core/jsx-runtime";
+import { describe, expect, it } from "vitest";
+import { TestNamespace } from "../../../test/utils.jsx";
+import { InterfaceDeclaration } from "./declaration.jsx";
+import { InterfaceProperty } from "./property.jsx";
+
+const Wrapper = (props: { children: Children }) => (
+  <TestNamespace>
+    <InterfaceDeclaration public name="TestInterface">
+      {props.children}
+    </InterfaceDeclaration>
+  </TestNamespace>
+);
+
+describe("modifiers", () => {
+  describe("access modifiers", () => {
+    it.each(["public", "private", "protected", "internal"] as const)(
+      "%s",
+      (accessModifier) => {
+        expect(
+          <Wrapper>
+            <InterfaceProperty
+              {...{ [accessModifier]: true }}
+              name="TestProp"
+              type="string"
+              get
+            />
+          </Wrapper>,
+        ).toRenderTo(`
+        public interface TestInterface
+        {
+          ${accessModifier} string TestProp { get; }
+        }
+      `);
+      },
+    );
+  });
+
+  describe("method modifiers", () => {
+    it.each(["new"] as const)("%s", (methodModifier) => {
+      expect(
+        <Wrapper>
+          <InterfaceProperty
+            {...{ [methodModifier]: true }}
+            name="TestProp"
+            type="string"
+            get
+          />
+        </Wrapper>,
+      ).toRenderTo(`
+        public interface TestInterface
+        {
+          ${methodModifier} string TestProp { get; }
+        }
+      `);
+    });
+  });
+
+  it("combine modifiers", () => {
+    expect(
+      <Wrapper>
+        <InterfaceProperty public new name="TestProp" type="string" get />
+      </Wrapper>,
+    ).toRenderTo(`
+        public interface TestInterface
+        {
+          public new string TestProp { get; }
+        }
+      `);
+  });
+});
+
+it("applies PascalCase naming policy", () => {
+  expect(
+    <Wrapper>
+      <InterfaceProperty name="test_prop" type="string" get />
+    </Wrapper>,
+  ).toRenderTo(`
+    public interface TestInterface
+    {
+      string TestProp { get; }
+    }
+`);
+});
+
+it("has getter only", () => {
+  expect(
+    <Wrapper>
+      <InterfaceProperty name="TestProp" type="string" get />
+    </Wrapper>,
+  ).toRenderTo(`
+    public interface TestInterface
+    {
+      string TestProp { get; }
+    }
+  `);
+});
+
+it("has setter only", () => {
+  expect(
+    <Wrapper>
+      <InterfaceProperty name="TestProp" type="string" set />
+    </Wrapper>,
+  ).toRenderTo(`
+    public interface TestInterface
+    {
+      string TestProp { set; }
+    }
+  `);
+});
+it("has getter and setter", () => {
+  expect(
+    <Wrapper>
+      <InterfaceProperty name="TestProp" type="string" get set />
+    </Wrapper>,
+  ).toRenderTo(`
+    public interface TestInterface
+    {
+      string TestProp { get; set; }
+    }
+  `);
+});

package/src/components/interface/property.tsx

@@ -0,0 +1,85 @@
+import {
+  Block,
+  Children,
+  List,
+  MemberDeclaration,
+  refkey,
+  Refkey,
+  Scope,
+} from "@alloy-js/core";
+import {
+  AccessModifiers,
+  computeModifiersPrefix,
+  getAccessModifier,
+  makeModifiers,
+} from "../../modifiers.js";
+import { useCSharpNamePolicy } from "../../name-policy.js";
+import { CSharpOutputSymbol } from "../../symbols/csharp-output-symbol.js";
+import { CSharpMemberScope, useCSharpScope } from "../../symbols/scopes.js";
+
+/** Method modifiers. Can only be one. */
+export interface InterfacePropertyModifiers {
+  readonly new?: boolean;
+}
+
+export const getMethodModifier = makeModifiers<InterfacePropertyModifiers>([
+  "new",
+]);
+
+// properties for creating a method
+export interface InterfacePropertyProps
+  extends AccessModifiers,
+    InterfacePropertyModifiers {
+  name: string;
+  refkey?: Refkey;
+
+  /** Property type */
+  type: Children;
+
+  /** If property should have a getter */
+  get?: boolean;
+
+  /** If property should have a setter */
+  set?: boolean;
+}
+
+// a C# interface property
+export function InterfaceProperty(props: InterfacePropertyProps) {
+  const name = useCSharpNamePolicy().getName(props.name, "class-property");
+  const scope = useCSharpScope();
+  if (scope.kind !== "member" || scope.name !== "interface-decl") {
+    throw new Error(
+      "can't define an interface method outside of an interface scope",
+    );
+  }
+
+  const propertySymbol = new CSharpOutputSymbol(name, {
+    scope,
+    refkeys: props.refkey ?? refkey(props.name),
+  });
+
+  // scope for property declaration
+  const propertyScope = new CSharpMemberScope("property-decl", {
+    owner: propertySymbol,
+  });
+
+  const modifiers = computeModifiersPrefix([
+    getAccessModifier(props),
+    getMethodModifier(props),
+  ]);
+  // note that scope wraps the method decl so that the params get the correct scope
+  return (
+    <MemberDeclaration symbol={propertySymbol}>
+      <Scope value={propertyScope}>
+        {modifiers}
+        {props.type} {name}{" "}
+        <Block newline inline>
+          <List joiner=" ">
+            {props.get && "get;"}
+            {props.set && "set;"}
+          </List>
+        </Block>
+      </Scope>
+    </MemberDeclaration>
+  );
+}

package/src/modifiers.ts

@@ -10,36 +10,13 @@ export interface AccessModifiers {
   readonly file?: boolean;
 }
 
-export function getAccessModifier(data: AccessModifiers): string {
-  return [
-    data.public && "public",
-    data.protected && "protected",
-    data.private && "private",
-    data.internal && "internal",
-    data.file && "file",
-  ]
-    .filter((x) => x)
-    .join(" ");
-}
-
-/** Method modifiers. Can only be one. */
-export interface MethodModifiers {
-  readonly abstract?: boolean;
-  readonly sealed?: boolean;
-  readonly static?: boolean;
-  readonly virtual?: boolean;
-}
-
-export function getMethodModifier(data: MethodModifiers): string {
-  return [
-    data.abstract && "abstract",
-    data.sealed && "sealed",
-    data.static && "static",
-    data.virtual && "virtual",
-  ]
-    .filter((x) => x)
-    .join(" ");
-}
+export const getAccessModifier = makeModifiers<AccessModifiers>([
+  "public",
+  "protected",
+  "private",
+  "internal",
+  "file",
+]);
 
 export function getAsyncModifier(async?: boolean): string {
   return async ? "async" : "";
@@ -52,3 +29,12 @@ export function computeModifiersPrefix(
   const resolved = modifiers.filter((x) => x);
   return resolved.length > 0 ? resolved.join(" ") + " " : "";
 }
+
+export function makeModifiers<T>(obj: Array<keyof T>) {
+  return (data: T) => {
+    return obj
+      .map((key) => (data[key] ? key : undefined))
+      .filter((x) => x)
+      .join(" ");
+  };
+}

package/src/name-policy.ts

@@ -12,6 +12,7 @@ export type CSharpElements =
   | "class-member-private"
   | "class-member-public"
   | "class-method"
+  | "class-property"
   | "parameter"
   | "type-parameter";
 
@@ -26,6 +27,7 @@ export function createCSharpNamePolicy(): core.NamePolicy<CSharpElements> {
       case "class-member-public":
       case "class-method":
       case "type-parameter":
+      case "class-property":
         return changecase.pascalCase(name);
       case "constant":
         return changecase.constantCase(name);