@alloy-js/csharp 0.20.0-dev.3 → 0.20.0-dev.4

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

@@ -3,7 +3,6 @@ import { Children } from "@alloy-js/core/jsx-runtime";
 import { describe, expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.jsx";
 import { Attribute } from "../attributes/attributes.jsx";
-import { SourceFile } from "../SourceFile.jsx";
 import { TypeParameterProps } from "../type-parameters/type-parameter.jsx";
 import { InterfaceDeclaration } from "./declaration.jsx";
 import { InterfaceMethod } from "./method.jsx";
@@ -28,7 +27,7 @@ describe("modifiers", () => {
         ).toRenderTo(`
         public interface TestInterface
         {
-          ${accessModifier} void MethodOne();
+            ${accessModifier} void MethodOne();
         }
       `);
       },
@@ -44,7 +43,7 @@ describe("modifiers", () => {
       ).toRenderTo(`
         public interface TestInterface
         {
-          ${methodModifier} void MethodOne();
+            ${methodModifier} void MethodOne();
         }
       `);
     });
@@ -58,7 +57,7 @@ describe("modifiers", () => {
     ).toRenderTo(`
         public interface TestInterface
         {
-          public new Task MethodOne();
+            public new Task MethodOne();
         }
       `);
   });
@@ -72,7 +71,7 @@ it("applies PascalCase naming policy", () => {
   ).toRenderTo(`
     public interface TestInterface
     {
-      void MethodOne();
+        void MethodOne();
     }
 `);
 });
@@ -102,7 +101,7 @@ it("defines params and return type", () => {
   expect(res).toRenderTo(`
     public interface TestInterface
     {
-      public string MethodOne(int intParam, string stringParam);
+        public string MethodOne(int intParam, string stringParam);
     }
   `);
 });
@@ -128,7 +127,7 @@ it("defines optional param", () => {
   expect(res).toRenderTo(`
     public interface TestInterface
     {
-      public string MethodOne(int? intParam);
+        public string MethodOne(int? intParam);
     }
   `);
 });
@@ -154,7 +153,7 @@ it("defines optional param with default", () => {
   expect(res).toRenderTo(`
     public interface TestInterface
     {
-      public string MethodOne(int intParam = 12);
+        public string MethodOne(int intParam = 12);
     }
   `);
 });
@@ -169,8 +168,8 @@ it("specify doc comment", () => {
   ).toRenderTo(`
     interface Test
     {
-      /// This is a test
-      void Method();
+        /// This is a test
+        void Method();
     }
   `);
 });
@@ -183,8 +182,8 @@ it("specify attributes", () => {
   ).toRenderTo(`
     public interface TestInterface
     {
-      [Test]
-      void Test();
+        [Test]
+        void Test();
     }
   `);
 });
@@ -204,30 +203,25 @@ describe("with type parameters", () => {
 
     expect(
       <TestNamespace>
-        <SourceFile path="TestFile.cs">
-          <InterfaceDeclaration public name="TestInterface">
-            <InterfaceMethod
-              name="Test"
-              public
-              typeParameters={typeParameters}
-              parameters={[
-                {
-                  name: "paramA",
-                  type: typeParameters[0].refkey,
-                },
-              ]}
-              returns={typeParameters[0].refkey}
-            />
-          </InterfaceDeclaration>
-        </SourceFile>
+        <InterfaceDeclaration public name="TestInterface">
+          <InterfaceMethod
+            name="Test"
+            public
+            typeParameters={typeParameters}
+            parameters={[
+              {
+                name: "paramA",
+                type: typeParameters[0].refkey,
+              },
+            ]}
+            returns={typeParameters[0].refkey}
+          />
+        </InterfaceDeclaration>
       </TestNamespace>,
     ).toRenderTo(`
-      namespace TestCode
+      public interface TestInterface
       {
-          public interface TestInterface
-          {
-              public T Test<T, U>(T paramA);
-          }
+          public T Test<T, U>(T paramA);
       }
     `);
   });
@@ -253,12 +247,12 @@ describe("with type parameters", () => {
     ).toRenderTo(`
       public interface TestInterface
       {
-        public void Test<T, U>()
-          where T : IFoo
-          where U : IBar
-        {
-          // Body
-        }
+          public void Test<T, U>()
+              where T : IFoo
+              where U : IBar
+          {
+              // Body
+          }
       }
     `);
   });
@@ -274,19 +268,19 @@ describe("formatting", () => {
           parameters={[
             {
               name: "message",
-              type: "Some.Quite.Long.Type.That.Will.Split",
+              type: "Some.Quite.Long.Type.That.Will.Split.At.One.Hundred.Chars.Line.Width",
             },
           ]}
           typeParameters={["T"]}
-          returns="Some.Quite.Long.Type.That.Will.Split"
+          returns="Some.Quite.Long.Type.That.Will.Split.At.One.Hundred.Chars.Line.Width"
         />
       </Wrapper>,
     ).toRenderTo(`
       public interface TestInterface
       {
-        public Some.Quite.Long.Type.That.Will.Split Handle<T>(
-          Some.Quite.Long.Type.That.Will.Split message
-        );
+          public Some.Quite.Long.Type.That.Will.Split.At.One.Hundred.Chars.Line.Width Handle<T>(
+              Some.Quite.Long.Type.That.Will.Split.At.One.Hundred.Chars.Line.Width message
+          );
       }
     `);
   });

package/src/components/interface/method.tsx

@@ -2,7 +2,7 @@ import {
   Block,
   Children,
   MemberDeclaration,
-  refkey,
+  MemberName,
   Refkey,
   Scope,
 } from "@alloy-js/core";
@@ -12,12 +12,8 @@ import {
   getAccessModifier,
   makeModifiers,
 } from "../../modifiers.js";
-import { useCSharpNamePolicy } from "../../name-policy.js";
-import { CSharpOutputSymbol } from "../../symbols/csharp-output-symbol.js";
-import {
-  CSharpMemberScope,
-  useCSharpMemberScope,
-} from "../../symbols/scopes.js";
+import { createMethodScope } from "../../scopes/factories.js";
+import { createMethodSymbol } from "../../symbols/factories.js";
 import { AttributeList, AttributesProp } from "../attributes/attributes.jsx";
 import { DocWhen } from "../doc/comment.jsx";
 import { ParameterProps, Parameters } from "../parameters/parameters.jsx";
@@ -79,19 +75,11 @@ export interface InterfaceMethodProps
 
 // a C# interface method
 export function InterfaceMethod(props: InterfaceMethodProps) {
-  const name = useCSharpNamePolicy().getName(props.name, "class-method");
-
-  const scope = useCSharpMemberScope(["interface-decl"]);
-
-  const methodSymbol = new CSharpOutputSymbol(name, {
-    scope,
-    refkeys: props.refkey ?? refkey(props.name),
+  const methodSymbol = createMethodSymbol(props.name, {
+    refkeys: props.refkey,
   });
 
-  // scope for method declaration
-  const methodScope = new CSharpMemberScope("method-decl", {
-    owner: methodSymbol,
-  });
+  const methodScope = createMethodScope();
 
   const modifiers = computeModifiersPrefix([
     getAccessModifier(props),
@@ -104,7 +92,7 @@ export function InterfaceMethod(props: InterfaceMethodProps) {
         <DocWhen doc={props.doc} />
         <AttributeList attributes={props.attributes} endline />
         {modifiers}
-        {props.returns ?? "void"} {name}
+        {props.returns ?? "void"} <MemberName />
         {props.typeParameters && (
           <TypeParameters parameters={props.typeParameters} />
         )}

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

@@ -30,7 +30,7 @@ describe("modifiers", () => {
         ).toRenderTo(`
         public interface TestInterface
         {
-          ${accessModifier} string TestProp { get; }
+            ${accessModifier} string TestProp { get; }
         }
       `);
       },
@@ -51,7 +51,7 @@ describe("modifiers", () => {
       ).toRenderTo(`
         public interface TestInterface
         {
-          ${methodModifier} string TestProp { get; }
+            ${methodModifier} string TestProp { get; }
         }
       `);
     });
@@ -65,7 +65,7 @@ describe("modifiers", () => {
     ).toRenderTo(`
         public interface TestInterface
         {
-          public new string TestProp { get; }
+            public new string TestProp { get; }
         }
       `);
   });
@@ -79,7 +79,7 @@ it("applies PascalCase naming policy", () => {
   ).toRenderTo(`
     public interface TestInterface
     {
-      string TestProp { get; }
+        string TestProp { get; }
     }
 `);
 });
@@ -92,7 +92,7 @@ it("has getter only", () => {
   ).toRenderTo(`
     public interface TestInterface
     {
-      string TestProp { get; }
+        string TestProp { get; }
     }
   `);
 });
@@ -105,7 +105,7 @@ it("has setter only", () => {
   ).toRenderTo(`
     public interface TestInterface
     {
-      string TestProp { set; }
+        string TestProp { set; }
     }
   `);
 });
@@ -117,7 +117,7 @@ it("has getter and setter", () => {
   ).toRenderTo(`
     public interface TestInterface
     {
-      string TestProp { get; set; }
+        string TestProp { get; set; }
     }
   `);
 });
@@ -138,8 +138,8 @@ it("specify doc comment", () => {
   ).toRenderTo(`
     interface Test
     {
-      /// This is a test
-      string Method { get; set; }
+        /// This is a test
+        string Method { get; set; }
     }
   `);
 });
@@ -158,8 +158,8 @@ it("specify attributes", () => {
   ).toRenderTo(`
     public interface TestInterface
     {
-      [Test]
-      int Test { get; set; }
+        [Test]
+        int Test { get; set; }
     }
   `);
 });

package/src/components/interface/property.tsx

@@ -3,9 +3,8 @@ import {
   Children,
   List,
   MemberDeclaration,
-  refkey,
+  MemberName,
   Refkey,
-  Scope,
 } from "@alloy-js/core";
 import {
   AccessModifiers,
@@ -13,12 +12,7 @@ import {
   getAccessModifier,
   makeModifiers,
 } from "../../modifiers.js";
-import { useCSharpNamePolicy } from "../../name-policy.js";
-import { CSharpOutputSymbol } from "../../symbols/csharp-output-symbol.js";
-import {
-  CSharpMemberScope,
-  useCSharpMemberScope,
-} from "../../symbols/scopes.js";
+import { createPropertySymbol } from "../../symbols/factories.js";
 import { AttributeList, AttributesProp } from "../attributes/attributes.jsx";
 import { DocWhen } from "../doc/comment.jsx";
 
@@ -87,18 +81,8 @@ export interface InterfacePropertyProps
  * ```
  */
 export function InterfaceProperty(props: InterfacePropertyProps) {
-  const name = useCSharpNamePolicy().getName(props.name, "class-property");
-
-  const scope = useCSharpMemberScope(["interface-decl"]);
-
-  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 propertySymbol = createPropertySymbol(props.name, {
+    refkeys: props.refkey,
   });
 
   const modifiers = computeModifiersPrefix([
@@ -108,19 +92,17 @@ export function InterfaceProperty(props: InterfacePropertyProps) {
   // note that scope wraps the method decl so that the params get the correct scope
   return (
     <MemberDeclaration symbol={propertySymbol}>
-      <Scope value={propertyScope}>
-        <DocWhen doc={props.doc} />
-        <AttributeList attributes={props.attributes} endline />
-        {modifiers}
-        {props.type}
-        {props.nullable && "?"} {name}{" "}
-        <Block newline inline>
-          <List joiner=" ">
-            {props.get && "get;"}
-            {props.set && "set;"}
-          </List>
-        </Block>
-      </Scope>
+      <DocWhen doc={props.doc} />
+      <AttributeList attributes={props.attributes} endline />
+      {modifiers}
+      {props.type}
+      {props.nullable && "?"} <MemberName />{" "}
+      <Block newline inline>
+        <List joiner=" ">
+          {props.get && "get;"}
+          {props.set && "set;"}
+        </List>
+      </Block>
     </MemberDeclaration>
   );
 }

package/src/components/lexical-scope.tsx

@@ -0,0 +1,29 @@
+import { Scope, ScopePropsWithInfo, ScopePropsWithValue } from "@alloy-js/core";
+import { useCSharpScope } from "../scopes/contexts.js";
+import { CSharpLexicalScope } from "../scopes/lexical.js";
+
+export interface LexicalScopePropsWithScopeValue extends ScopePropsWithValue {}
+export interface LeixcalScopePropsWithScopeInfo extends ScopePropsWithInfo {}
+
+export type LexicalScopeProps =
+  | LexicalScopePropsWithScopeValue
+  | LeixcalScopePropsWithScopeInfo;
+
+export function LexicalScope(props: LexicalScopeProps) {
+  let scope;
+  if ("value" in props) {
+    if (!(props.value instanceof CSharpLexicalScope)) {
+      throw new Error(
+        "LexicalScope value must be a CSharpLexicalScope instance",
+      );
+    }
+    scope = props.value;
+  } else {
+    const parentScope = useCSharpScope();
+    scope = new CSharpLexicalScope(props.name ?? "lexical scope", parentScope, {
+      ...props,
+    });
+  }
+
+  return <Scope value={scope}>{props.children}</Scope>;
+}

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

@@ -23,7 +23,7 @@ describe("modifiers", () => {
         ).toRenderTo(`
         public class TestClass
         {
-          ${accessModifier} void MethodOne() {}
+            ${accessModifier} void MethodOne() {}
         }
       `);
       },
@@ -41,7 +41,7 @@ describe("modifiers", () => {
         ).toRenderTo(`
         public class TestClass
         {
-          ${methodModifier} void MethodOne() {}
+            ${methodModifier} void MethodOne() {}
         }
       `);
       },
@@ -55,7 +55,7 @@ describe("modifiers", () => {
       ).toRenderTo(`
         public class TestClass
         {
-          abstract void MethodOne();
+            abstract void MethodOne();
         }
       `);
     });
@@ -69,7 +69,7 @@ describe("modifiers", () => {
     ).toRenderTo(`
         public class TestClass
         {
-          async Task MethodOne() {}
+            async Task MethodOne() {}
         }
       `);
   });
@@ -82,7 +82,7 @@ describe("modifiers", () => {
     ).toRenderTo(`
         public class TestClass
         {
-          public abstract async Task MethodOne();
+            public abstract async Task MethodOne();
         }
       `);
   });
@@ -96,7 +96,7 @@ it("applies PascalCase naming policy", () => {
   ).toRenderTo(`
     public class TestClass
     {
-      void MethodOne() {}
+        void MethodOne() {}
     }
 `);
 });
@@ -120,7 +120,7 @@ it("defines params and return type", () => {
   expect(res).toRenderTo(`
     public class TestClass
     {
-      public string MethodOne(int intParam, string stringParam) {}
+        public string MethodOne(int intParam, string stringParam) {}
     }
   `);
 });
@@ -135,8 +135,8 @@ it("specify doc comment", () => {
   ).toRenderTo(`
     class Test
     {
-      /// This is a test
-      void Method() {}
+        /// This is a test
+        void Method() {}
     }
   `);
 });
@@ -153,8 +153,8 @@ it("use expression body form", () => {
   ).toRenderTo(`
     class Test
     {
-      /// This is a test
-      void Method() => this.MyProperty.Value;
+        /// This is a test
+        void Method() => this.MyProperty.Value;
     }
   `);
 });

package/src/components/method/method.tsx

@@ -2,7 +2,8 @@ import {
   Block,
   Children,
   MemberDeclaration,
-  refkey,
+  MemberName,
+  Namekey,
   Refkey,
   Scope,
 } from "@alloy-js/core";
@@ -13,12 +14,8 @@ import {
   getAsyncModifier,
   makeModifiers,
 } from "../../modifiers.js";
-import { useCSharpNamePolicy } from "../../name-policy.js";
-import { CSharpOutputSymbol } from "../../symbols/csharp-output-symbol.js";
-import {
-  CSharpMemberScope,
-  useCSharpMemberScope,
-} from "../../symbols/scopes.js";
+import { createMethodScope } from "../../scopes/factories.js";
+import { createMethodSymbol } from "../../symbols/factories.js";
 import { AttributeList, AttributesProp } from "../attributes/attributes.jsx";
 import { DocWhen } from "../doc/comment.jsx";
 import { ParameterProps, Parameters } from "../parameters/parameters.jsx";
@@ -49,9 +46,12 @@ const getMethodModifier = makeModifiers<MethodModifiers>([
 
 // properties for creating a method
 export interface MethodProps extends AccessModifiers, MethodModifiers {
-  name: string;
+  name: string | Namekey;
   refkey?: Refkey;
   children?: Children;
+  /**
+   * An array of parameter descriptors.
+   */
   parameters?: Array<ParameterProps>;
   returns?: Children;
 
@@ -113,18 +113,12 @@ export interface MethodProps extends AccessModifiers, MethodModifiers {
 
 // a C# class method
 export function Method(props: MethodProps) {
-  const name = useCSharpNamePolicy().getName(props.name, "class-method");
-  const scope = useCSharpMemberScope(["class-decl", "struct-decl"]);
-
-  const methodSymbol = new CSharpOutputSymbol(name, {
-    scope,
-    refkeys: props.refkey ?? refkey(props.name),
+  const methodSymbol = createMethodSymbol(props.name, {
+    refkeys: props.refkey,
   });
 
   // scope for method declaration
-  const methodScope = new CSharpMemberScope("method-decl", {
-    owner: methodSymbol,
-  });
+  const methodScope = createMethodScope();
 
   const returns = props.returns ?? (props.async ? "Task" : "void");
 
@@ -140,7 +134,7 @@ export function Method(props: MethodProps) {
         <DocWhen doc={props.doc} />
         <AttributeList attributes={props.attributes} endline />
         {modifiers}
-        {returns} {name}
+        {returns} <MemberName />
         {props.typeParameters && (
           <TypeParameters parameters={props.typeParameters} />
         )}

package/src/components/method-scope.tsx

@@ -0,0 +1,27 @@
+import { Scope, ScopePropsWithInfo, ScopePropsWithValue } from "@alloy-js/core";
+import { useCSharpScope } from "../scopes/contexts.js";
+import { CSharpMethodScope } from "../scopes/method.js";
+
+export interface MethodScopePropsWithScopeValue extends ScopePropsWithValue {}
+export interface MethodScopePropsWithScopeInfo extends ScopePropsWithInfo {}
+
+export type MethodScopeProps =
+  | MethodScopePropsWithScopeValue
+  | MethodScopePropsWithScopeInfo;
+
+export function MethodScope(props: MethodScopeProps) {
+  let scope;
+  if ("value" in props) {
+    if (!(props.value instanceof CSharpMethodScope)) {
+      throw new Error("MethodScope value must be a CSharpMethodScope instance");
+    }
+    scope = props.value;
+  } else {
+    const parentScope = useCSharpScope();
+    scope = new CSharpMethodScope(props.name ?? "method scope", parentScope, {
+      ...props,
+    });
+  }
+
+  return <Scope value={scope}>{props.children}</Scope>;
+}

package/src/components/namespace-scopes.tsx

@@ -0,0 +1,44 @@
+import { Scope } from "@alloy-js/core";
+import { Children } from "@alloy-js/core/jsx-runtime";
+import { NamespaceContext } from "../contexts/namespace.js";
+import { createCSharpNamespaceScope } from "../scopes/namespace.js";
+import { NamespaceSymbol } from "../symbols/namespace.js";
+
+export interface NamespaceScopProps {
+  symbol: NamespaceSymbol;
+  children: Children;
+}
+
+export function NamespaceScope(props: NamespaceScopProps) {
+  const scope = createCSharpNamespaceScope(props.symbol);
+  return (
+    <NamespaceContext.Provider value={{ symbol: props.symbol }}>
+      <Scope value={scope}>{props.children}</Scope>
+    </NamespaceContext.Provider>
+  );
+}
+
+export interface NamespaceScopesProps {
+  symbol: NamespaceSymbol;
+  children: Children;
+}
+
+export function NamespaceScopes(props: NamespaceScopesProps) {
+  function wrapWithScope(symbol: NamespaceSymbol, children: Children) {
+    const scopeChildren = (
+      <NamespaceScope symbol={symbol}>{children}</NamespaceScope>
+    );
+
+    if (symbol.enclosingNamespace) {
+      return wrapWithScope(symbol.enclosingNamespace, scopeChildren);
+    }
+
+    return scopeChildren;
+  }
+
+  return (
+    <NamespaceContext.Provider value={{ symbol: props.symbol }}>
+      {wrapWithScope(props.symbol, props.children)}
+    </NamespaceContext.Provider>
+  );
+}