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

package/dist/src/components/interface/method.js

@@ -1,9 +1,8 @@
 import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
-import { Block, MemberDeclaration, refkey, Scope } from "@alloy-js/core";
+import { Block, MemberDeclaration, MemberName, Scope } from "@alloy-js/core";
 import { computeModifiersPrefix, 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 } from "../attributes/attributes.js";
 import { DocWhen } from "../doc/comment.js";
 import { Parameters } from "../parameters/parameters.js";
@@ -18,17 +17,10 @@ const getMethodModifier = makeModifiers(["new"]);
 
 // a C# interface method
 export function InterfaceMethod(props) {
-  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)
-  });
-
-  // scope for method declaration
-  const methodScope = new CSharpMemberScope("method-decl", {
-    owner: methodSymbol
+  const methodSymbol = createMethodSymbol(props.name, {
+    refkeys: props.refkey
   });
+  const methodScope = createMethodScope();
   const modifiers = computeModifiersPrefix([getAccessModifier(props), getMethodModifier(props)]);
   // note that scope wraps the method decl so that the params get the correct scope
   return _$createComponent(MemberDeclaration, {
@@ -46,7 +38,7 @@ export function InterfaceMethod(props) {
               return props.attributes;
             },
             endline: true
-          }), modifiers, _$memo(() => props.returns ?? "void"), " ", name, _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameters, {
+          }), modifiers, _$memo(() => props.returns ?? "void"), " ", _$createComponent(MemberName, {}), _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameters, {
             get parameters() {
               return props.typeParameters;
             }

package/dist/src/components/interface/method.test.js

@@ -3,7 +3,6 @@ import { refkey } from "@alloy-js/core";
 import { describe, expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.js";
 import { Attribute } from "../attributes/attributes.js";
-import { SourceFile } from "../SourceFile.js";
 import { InterfaceDeclaration } from "./declaration.js";
 import { InterfaceMethod } from "./method.js";
 const Wrapper = props => _$createComponent(TestNamespace, {
@@ -31,7 +30,7 @@ describe("modifiers", () => {
       })).toRenderTo(`
         public interface TestInterface
         {
-          ${accessModifier} void MethodOne();
+            ${accessModifier} void MethodOne();
         }
       `);
     });
@@ -49,7 +48,7 @@ describe("modifiers", () => {
       })).toRenderTo(`
         public interface TestInterface
         {
-          ${methodModifier} void MethodOne();
+            ${methodModifier} void MethodOne();
         }
       `);
     });
@@ -67,7 +66,7 @@ describe("modifiers", () => {
     })).toRenderTo(`
         public interface TestInterface
         {
-          public new Task MethodOne();
+            public new Task MethodOne();
         }
       `);
   });
@@ -82,7 +81,7 @@ it("applies PascalCase naming policy", () => {
   })).toRenderTo(`
     public interface TestInterface
     {
-      void MethodOne();
+        void MethodOne();
     }
 `);
 });
@@ -107,7 +106,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);
     }
   `);
 });
@@ -129,7 +128,7 @@ it("defines optional param", () => {
   expect(res).toRenderTo(`
     public interface TestInterface
     {
-      public string MethodOne(int? intParam);
+        public string MethodOne(int? intParam);
     }
   `);
 });
@@ -151,7 +150,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);
     }
   `);
 });
@@ -171,8 +170,8 @@ it("specify doc comment", () => {
   })).toRenderTo(`
     interface Test
     {
-      /// This is a test
-      void Method();
+        /// This is a test
+        void Method();
     }
   `);
 });
@@ -191,8 +190,8 @@ it("specify attributes", () => {
   })).toRenderTo(`
     public interface TestInterface
     {
-      [Test]
-      void Test();
+        [Test]
+        void Test();
     }
   `);
 });
@@ -207,39 +206,31 @@ describe("with type parameters", () => {
     }];
     expect(_$createComponent(TestNamespace, {
       get children() {
-        return _$createComponent(SourceFile, {
-          path: "TestFile.cs",
+        return _$createComponent(InterfaceDeclaration, {
+          "public": true,
+          name: "TestInterface",
           get children() {
-            return _$createComponent(InterfaceDeclaration, {
+            return _$createComponent(InterfaceMethod, {
+              name: "Test",
               "public": true,
-              name: "TestInterface",
-              get children() {
-                return _$createComponent(InterfaceMethod, {
-                  name: "Test",
-                  "public": true,
-                  typeParameters: typeParameters,
-                  get parameters() {
-                    return [{
-                      name: "paramA",
-                      type: typeParameters[0].refkey
-                    }];
-                  },
-                  get returns() {
-                    return typeParameters[0].refkey;
-                  }
-                });
+              typeParameters: typeParameters,
+              get parameters() {
+                return [{
+                  name: "paramA",
+                  type: typeParameters[0].refkey
+                }];
+              },
+              get returns() {
+                return typeParameters[0].refkey;
               }
             });
           }
         });
       }
     })).toRenderTo(`
-      namespace TestCode
+      public interface TestInterface
       {
-          public interface TestInterface
-          {
-              public T Test<T, U>(T paramA);
-          }
+          public T Test<T, U>(T paramA);
       }
     `);
   });
@@ -263,12 +254,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
+          }
       }
     `);
   });
@@ -282,18 +273,18 @@ describe("formatting", () => {
           name: "Handle",
           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"
         });
       }
     })).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/dist/src/components/interface/property.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../../src/components/interface/property.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAIR,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAO5B,OAAO,EAAiB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG7E,yCAAyC;AACzC,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;CACxB;AAKD,MAAM,WAAW,sBACf,SAAQ,eAAe,EACrB,0BAA0B;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,oBAAoB;IACpB,IAAI,EAAE,QAAQ,CAAC;IAEf,uCAAuC;IACvC,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd,uCAAuC;IACvC,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,YAqC9D"}
+{"version":3,"file":"property.d.ts","sourceRoot":"","sources":["../../../../src/components/interface/property.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAIR,MAAM,EACP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAE5B,OAAO,EAAiB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAG7E,yCAAyC;AACzC,MAAM,WAAW,0BAA0B;IACzC,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;CACxB;AAKD,MAAM,WAAW,sBACf,SAAQ,eAAe,EACrB,0BAA0B;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,oBAAoB;IACpB,IAAI,EAAE,QAAQ,CAAC;IAEf,uCAAuC;IACvC,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd,uCAAuC;IACvC,GAAG,CAAC,EAAE,OAAO,CAAC;IAEd,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;;;;;OAOG;IACH,QAAQ,CAAC,EAAE,OAAO,CAAC;IAEnB;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;CAC7B;AAED;;;;;;;;GAQG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,YAyB9D"}

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

@@ -1,9 +1,7 @@
 import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
-import { Block, List, MemberDeclaration, refkey, Scope } from "@alloy-js/core";
+import { Block, List, MemberDeclaration, MemberName } from "@alloy-js/core";
 import { computeModifiersPrefix, 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 } from "../attributes/attributes.js";
 import { DocWhen } from "../doc/comment.js";
 
@@ -23,48 +21,35 @@ const getModifiers = makeModifiers(["new"]);
  * ```
  */
 export function InterfaceProperty(props) {
-  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([getAccessModifier(props), getModifiers(props)]);
   // note that scope wraps the method decl so that the params get the correct scope
   return _$createComponent(MemberDeclaration, {
     symbol: propertySymbol,
     get children() {
-      return _$createComponent(Scope, {
-        value: propertyScope,
+      return [_$createComponent(DocWhen, {
+        get doc() {
+          return props.doc;
+        }
+      }), _$createComponent(AttributeList, {
+        get attributes() {
+          return props.attributes;
+        },
+        endline: true
+      }), modifiers, _$memo(() => props.type), _$memo(() => props.nullable && "?"), " ", _$createComponent(MemberName, {}), " ", _$createComponent(Block, {
+        newline: true,
+        inline: true,
         get children() {
-          return [_$createComponent(DocWhen, {
-            get doc() {
-              return props.doc;
-            }
-          }), _$createComponent(AttributeList, {
-            get attributes() {
-              return props.attributes;
-            },
-            endline: true
-          }), modifiers, _$memo(() => props.type), _$memo(() => props.nullable && "?"), " ", name, " ", _$createComponent(Block, {
-            newline: true,
-            inline: true,
+          return _$createComponent(List, {
+            joiner: " ",
             get children() {
-              return _$createComponent(List, {
-                joiner: " ",
-                get children() {
-                  return [_$memo(() => props.get && "get;"), _$memo(() => props.set && "set;")];
-                }
-              });
+              return [_$memo(() => props.get && "get;"), _$memo(() => props.set && "set;")];
             }
-          })];
+          });
         }
-      });
+      })];
     }
   });
 }

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

@@ -31,7 +31,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; }
         }
       `);
     });
@@ -70,7 +70,7 @@ describe("modifiers", () => {
     })).toRenderTo(`
         public interface TestInterface
         {
-          public new string TestProp { get; }
+            public new string TestProp { get; }
         }
       `);
   });
@@ -87,7 +87,7 @@ it("applies PascalCase naming policy", () => {
   })).toRenderTo(`
     public interface TestInterface
     {
-      string TestProp { get; }
+        string TestProp { get; }
     }
 `);
 });
@@ -103,7 +103,7 @@ it("has getter only", () => {
   })).toRenderTo(`
     public interface TestInterface
     {
-      string TestProp { get; }
+        string TestProp { get; }
     }
   `);
 });
@@ -119,7 +119,7 @@ it("has setter only", () => {
   })).toRenderTo(`
     public interface TestInterface
     {
-      string TestProp { set; }
+        string TestProp { set; }
     }
   `);
 });
@@ -136,7 +136,7 @@ it("has getter and setter", () => {
   })).toRenderTo(`
     public interface TestInterface
     {
-      string TestProp { get; set; }
+        string TestProp { get; set; }
     }
   `);
 });
@@ -159,8 +159,8 @@ it("specify doc comment", () => {
   })).toRenderTo(`
     interface Test
     {
-      /// This is a test
-      string Method { get; set; }
+        /// This is a test
+        string Method { get; set; }
     }
   `);
 });
@@ -182,8 +182,8 @@ it("specify attributes", () => {
   })).toRenderTo(`
     public interface TestInterface
     {
-      [Test]
-      int Test { get; set; }
+        [Test]
+        int Test { get; set; }
     }
   `);
 });

package/dist/src/components/lexical-scope.d.ts

@@ -0,0 +1,8 @@
+import { ScopePropsWithInfo, ScopePropsWithValue } from "@alloy-js/core";
+export interface LexicalScopePropsWithScopeValue extends ScopePropsWithValue {
+}
+export interface LeixcalScopePropsWithScopeInfo extends ScopePropsWithInfo {
+}
+export type LexicalScopeProps = LexicalScopePropsWithScopeValue | LeixcalScopePropsWithScopeInfo;
+export declare function LexicalScope(props: LexicalScopeProps): import("@alloy-js/core").Children;
+//# sourceMappingURL=lexical-scope.d.ts.map

package/dist/src/components/lexical-scope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"lexical-scope.d.ts","sourceRoot":"","sources":["../../../src/components/lexical-scope.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAS,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAIhF,MAAM,WAAW,+BAAgC,SAAQ,mBAAmB;CAAG;AAC/E,MAAM,WAAW,8BAA+B,SAAQ,kBAAkB;CAAG;AAE7E,MAAM,MAAM,iBAAiB,GACzB,+BAA+B,GAC/B,8BAA8B,CAAC;AAEnC,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,qCAiBpD"}

package/dist/src/components/lexical-scope.js

@@ -0,0 +1,24 @@
+import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { Scope } from "@alloy-js/core";
+import { useCSharpScope } from "../scopes/contexts.js";
+import { CSharpLexicalScope } from "../scopes/lexical.js";
+export function LexicalScope(props) {
+  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 _$createComponent(Scope, {
+    value: scope,
+    get children() {
+      return props.children;
+    }
+  });
+}

package/dist/src/components/method/method.d.ts

@@ -1,4 +1,4 @@
-import { Children, Refkey } from "@alloy-js/core";
+import { Children, Namekey, Refkey } from "@alloy-js/core";
 import { AccessModifiers } from "../../modifiers.js";
 import { AttributesProp } from "../attributes/attributes.jsx";
 import { ParameterProps } from "../parameters/parameters.jsx";
@@ -14,9 +14,12 @@ export interface MethodModifiers {
     readonly readonly?: boolean;
 }
 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;
     /**

package/dist/src/components/method/method.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../src/components/method/method.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAKhB,MAAM,oBAAoB,CAAC;AAO5B,OAAO,EAAiB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE7E,OAAO,EAAE,cAAc,EAAc,MAAM,8BAA8B,CAAC;AAE1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,yCAAyC;AACzC,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AAaD,MAAM,WAAW,WAAY,SAAQ,eAAe,EAAE,eAAe;IACnE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;IAEjD;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAGD,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,YA4CxC"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../src/components/method/method.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,OAAO,EACP,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAKhB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAiB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE7E,OAAO,EAAE,cAAc,EAAc,MAAM,8BAA8B,CAAC;AAE1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,yCAAyC;AACzC,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AAaD,MAAM,WAAW,WAAY,SAAQ,eAAe,EAAE,eAAe;IACnE,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB;;OAEG;IACH,UAAU,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;IAEjD;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAGD,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,YAsCxC"}

package/dist/src/components/method/method.js

@@ -1,9 +1,8 @@
 import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
-import { Block, MemberDeclaration, refkey, Scope } from "@alloy-js/core";
+import { Block, MemberDeclaration, MemberName, Scope } from "@alloy-js/core";
 import { computeModifiersPrefix, getAccessModifier, 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 } from "../attributes/attributes.js";
 import { DocWhen } from "../doc/comment.js";
 import { Parameters } from "../parameters/parameters.js";
@@ -18,17 +17,12 @@ const getMethodModifier = makeModifiers(["abstract", "sealed", "static", "virtua
 
 // a C# class method
 export function Method(props) {
-  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");
   const modifiers = computeModifiersPrefix([getAccessModifier(props), getMethodModifier(props), getAsyncModifier(props.async)]);
   // note that scope wraps the method decl so that the params get the correct scope
@@ -47,7 +41,7 @@ export function Method(props) {
               return props.attributes;
             },
             endline: true
-          }), modifiers, returns, " ", name, _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameters, {
+          }), modifiers, returns, " ", _$createComponent(MemberName, {}), _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameters, {
             get parameters() {
               return props.typeParameters;
             }

package/dist/src/components/method/method.test.js

@@ -27,7 +27,7 @@ describe("modifiers", () => {
       })).toRenderTo(`
         public class TestClass
         {
-          ${accessModifier} void MethodOne() {}
+            ${accessModifier} void MethodOne() {}
         }
       `);
     });
@@ -45,7 +45,7 @@ describe("modifiers", () => {
       })).toRenderTo(`
         public class TestClass
         {
-          ${methodModifier} void MethodOne() {}
+            ${methodModifier} void MethodOne() {}
         }
       `);
     });
@@ -60,7 +60,7 @@ describe("modifiers", () => {
       })).toRenderTo(`
         public class TestClass
         {
-          abstract void MethodOne();
+            abstract void MethodOne();
         }
       `);
     });
@@ -76,7 +76,7 @@ describe("modifiers", () => {
     })).toRenderTo(`
         public class TestClass
         {
-          async Task MethodOne() {}
+            async Task MethodOne() {}
         }
       `);
   });
@@ -94,7 +94,7 @@ describe("modifiers", () => {
     })).toRenderTo(`
         public class TestClass
         {
-          public abstract async Task MethodOne();
+            public abstract async Task MethodOne();
         }
       `);
   });
@@ -109,7 +109,7 @@ it("applies PascalCase naming policy", () => {
   })).toRenderTo(`
     public class TestClass
     {
-      void MethodOne() {}
+        void MethodOne() {}
     }
 `);
 });
@@ -134,7 +134,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) {}
     }
   `);
 });
@@ -154,8 +154,8 @@ it("specify doc comment", () => {
   })).toRenderTo(`
     class Test
     {
-      /// This is a test
-      void Method() {}
+        /// This is a test
+        void Method() {}
     }
   `);
 });
@@ -177,8 +177,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/dist/src/components/method-scope.d.ts

@@ -0,0 +1,8 @@
+import { ScopePropsWithInfo, ScopePropsWithValue } from "@alloy-js/core";
+export interface MethodScopePropsWithScopeValue extends ScopePropsWithValue {
+}
+export interface MethodScopePropsWithScopeInfo extends ScopePropsWithInfo {
+}
+export type MethodScopeProps = MethodScopePropsWithScopeValue | MethodScopePropsWithScopeInfo;
+export declare function MethodScope(props: MethodScopeProps): import("@alloy-js/core").Children;
+//# sourceMappingURL=method-scope.d.ts.map

package/dist/src/components/method-scope.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"method-scope.d.ts","sourceRoot":"","sources":["../../../src/components/method-scope.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAS,kBAAkB,EAAE,mBAAmB,EAAE,MAAM,gBAAgB,CAAC;AAIhF,MAAM,WAAW,8BAA+B,SAAQ,mBAAmB;CAAG;AAC9E,MAAM,WAAW,6BAA8B,SAAQ,kBAAkB;CAAG;AAE5E,MAAM,MAAM,gBAAgB,GACxB,8BAA8B,GAC9B,6BAA6B,CAAC;AAElC,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,qCAelD"}

package/dist/src/components/method-scope.js

@@ -0,0 +1,24 @@
+import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { Scope } from "@alloy-js/core";
+import { useCSharpScope } from "../scopes/contexts.js";
+import { CSharpMethodScope } from "../scopes/method.js";
+export function MethodScope(props) {
+  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 _$createComponent(Scope, {
+    value: scope,
+    get children() {
+      return props.children;
+    }
+  });
+}

package/dist/src/components/namespace-scopes.d.ts

@@ -0,0 +1,13 @@
+import { Children } from "@alloy-js/core/jsx-runtime";
+import { NamespaceSymbol } from "../symbols/namespace.js";
+export interface NamespaceScopProps {
+    symbol: NamespaceSymbol;
+    children: Children;
+}
+export declare function NamespaceScope(props: NamespaceScopProps): Children;
+export interface NamespaceScopesProps {
+    symbol: NamespaceSymbol;
+    children: Children;
+}
+export declare function NamespaceScopes(props: NamespaceScopesProps): Children;
+//# sourceMappingURL=namespace-scopes.d.ts.map

package/dist/src/components/namespace-scopes.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"namespace-scopes.d.ts","sourceRoot":"","sources":["../../../src/components/namespace-scopes.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAGtD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,MAAM,WAAW,kBAAkB;IACjC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,wBAAgB,cAAc,CAAC,KAAK,EAAE,kBAAkB,YAOvD;AAED,MAAM,WAAW,oBAAoB;IACnC,MAAM,EAAE,eAAe,CAAC;IACxB,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,YAkB1D"}