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

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

@@ -1,4 +1,7 @@
 import { createComponent as _$createComponent, mergeProps as _$mergeProps, createIntrinsic as _$createIntrinsic } from "@alloy-js/core/jsx-runtime";
+import { Constructor } from "#components/constructor/constructor.js";
+import { EnumDeclaration } from "#components/enum/declaration.js";
+import { EnumMember } from "#components/enum/member.js";
 import { code, createNamePolicy, List, NamePolicyContext, Output, refkey, render } from "@alloy-js/core";
 import * as coretest from "@alloy-js/core/testing";
 import { describe, expect, it } from "vitest";
@@ -7,21 +10,14 @@ import { createCSharpNamePolicy } from "../../name-policy.js";
 import { Attribute } from "../attributes/attributes.js";
 import { Field } from "../field/field.js";
 import { Method } from "../method/method.js";
-import { Namespace } from "../Namespace.js";
 import { Property } from "../property/property.js";
 import { SourceFile } from "../SourceFile.js";
-import { Constructor, EnumDeclaration, EnumMember } from "../stc/index.js";
 import { ClassDeclaration } from "./declaration.js";
 function Wrapper({
   children
 }) {
   return _$createComponent(TestNamespace, {
-    get children() {
-      return _$createComponent(SourceFile, {
-        path: "Test.cs",
-        children: children
-      });
-    }
+    children: children
   });
 }
 it("declares class with no members", () => {
@@ -76,6 +72,27 @@ describe("modifiers", () => {
         public abstract partial class TestClass;
     `);
   });
+  it("places visibility, attributes, and modifiers in the correct order", () => {
+    expect(_$createComponent(TestNamespace, {
+      get children() {
+        return _$createComponent(ClassDeclaration, {
+          partial: true,
+          "public": true,
+          abstract: true,
+          sealed: true,
+          name: "TestClass",
+          get attributes() {
+            return [_$createComponent(Attribute, {
+              name: "Test"
+            })];
+          }
+        });
+      }
+    })).toRenderTo(`
+        [Test]
+        public abstract sealed partial class TestClass;
+    `);
+  });
 });
 describe("base", () => {
   it("define base class", () => {
@@ -117,63 +134,65 @@ describe("base", () => {
   });
 });
 it("declares class with some members", () => {
-  const res = toSourceText(_$createComponent(ClassDeclaration, {
-    "public": true,
-    name: "TestClass",
+  const tree = _$createComponent(TestNamespace, {
     get children() {
-      return _$createComponent(List, {
+      return _$createComponent(ClassDeclaration, {
+        "public": true,
+        name: "TestClass",
         get children() {
-          return [_$createComponent(Field, {
-            "public": true,
-            name: "MemberOne",
-            type: "string"
-          }), _$createComponent(Field, {
-            "public": true,
-            name: "MemberTwo",
-            type: "int"
-          })];
+          return _$createComponent(List, {
+            get children() {
+              return [_$createComponent(Field, {
+                "public": true,
+                name: "MemberOne",
+                type: "string"
+              }), _$createComponent(Field, {
+                "public": true,
+                name: "MemberTwo",
+                type: "int"
+              })];
+            }
+          });
         }
       });
     }
-  }));
-  expect(res).toBe(coretest.d`
-    namespace TestCode
+  });
+  expect(tree).toRenderTo(coretest.d`
+    public class TestClass
     {
-        public class TestClass
-        {
-            public string MemberOne;
-            public int MemberTwo;
-        }
+        public string MemberOne;
+        public int MemberTwo;
     }
   `);
 });
 it("declares class with some methods", () => {
-  const res = toSourceText(_$createComponent(ClassDeclaration, {
-    "public": true,
-    name: "TestClass",
+  const tree = _$createComponent(TestNamespace, {
     get children() {
-      return _$createComponent(List, {
+      return _$createComponent(ClassDeclaration, {
+        "public": true,
+        name: "TestClass",
         get children() {
-          return [_$createComponent(Method, {
-            "public": true,
-            name: "MethodOne"
-          }), _$createComponent(Method, {
-            "private": true,
-            virtual: true,
-            name: "MethodTwo"
-          })];
+          return _$createComponent(List, {
+            get children() {
+              return [_$createComponent(Method, {
+                "public": true,
+                name: "MethodOne"
+              }), _$createComponent(Method, {
+                "private": true,
+                virtual: true,
+                name: "MethodTwo"
+              })];
+            }
+          });
         }
       });
     }
-  }));
-  expect(res).toBe(coretest.d`
-    namespace TestCode
+  });
+  expect(tree).toRenderTo(coretest.d`
+    public class TestClass
     {
-        public class TestClass
-        {
-            public void MethodOne() {}
-            private virtual void MethodTwo() {}
-        }
+        public void MethodOne() {}
+        private virtual void MethodTwo() {}
     }
   `);
 });
@@ -193,79 +212,71 @@ it("uses refkeys for members, params, and return type", () => {
       return createCSharpNamePolicy();
     },
     get children() {
-      return _$createComponent(Namespace, {
-        name: "TestCode",
+      return _$createComponent(SourceFile, {
+        path: "Test.cs",
         get children() {
-          return _$createComponent(SourceFile, {
-            path: "Test.cs",
+          return [_$createComponent(EnumDeclaration, {
+            "public": true,
+            name: "TestEnum",
+            refkey: enumTypeRefkey,
             get children() {
-              return [_$createComponent(EnumDeclaration, {
-                "public": true,
-                name: "TestEnum",
-                refkey: enumTypeRefkey,
+              return _$createComponent(List, {
+                comma: true,
+                hardline: true,
                 get children() {
-                  return _$createComponent(List, {
-                    comma: true,
-                    hardline: true,
-                    get children() {
-                      return [_$createComponent(EnumMember, {
-                        name: "One"
-                      }), _$createComponent(EnumMember, {
-                        name: "Two"
-                      })];
-                    }
-                  });
+                  return [_$createComponent(EnumMember, {
+                    name: "One"
+                  }), _$createComponent(EnumMember, {
+                    name: "Two"
+                  })];
                 }
-              }), _$createIntrinsic("hbr", {}), _$createComponent(ClassDeclaration, {
-                "public": true,
-                name: "TestInput",
-                refkey: inputTypeRefkey
-              }), _$createIntrinsic("hbr", {}), _$createComponent(ClassDeclaration, {
-                "public": true,
-                name: "TestResult",
-                refkey: testResultTypeRefkey
-              }), _$createIntrinsic("hbr", {}), _$createComponent(ClassDeclaration, {
+              });
+            }
+          }), _$createIntrinsic("hbr", {}), _$createComponent(ClassDeclaration, {
+            "public": true,
+            name: "TestInput",
+            refkey: inputTypeRefkey
+          }), _$createIntrinsic("hbr", {}), _$createComponent(ClassDeclaration, {
+            "public": true,
+            name: "TestResult",
+            refkey: testResultTypeRefkey
+          }), _$createIntrinsic("hbr", {}), _$createComponent(ClassDeclaration, {
+            "public": true,
+            name: "TestClass",
+            get children() {
+              return [_$createComponent(Field, {
+                "private": true,
+                name: "MemberOne",
+                type: enumTypeRefkey
+              }), _$createIntrinsic("hbr", {}), _$createComponent(Method, {
                 "public": true,
-                name: "TestClass",
+                name: "MethodOne",
+                parameters: params,
+                returns: testResultTypeRefkey,
                 get children() {
-                  return [_$createComponent(Field, {
-                    "private": true,
-                    name: "MemberOne",
-                    type: enumTypeRefkey
-                  }), _$createIntrinsic("hbr", {}), _$createComponent(Method, {
-                    "public": true,
-                    name: "MethodOne",
-                    parameters: params,
-                    returns: testResultTypeRefkey,
-                    get children() {
-                      return ["return new ", testResultTypeRefkey, "();"];
-                    }
-                  })];
+                  return ["return new ", testResultTypeRefkey, "();"];
                 }
               })];
             }
-          });
+          })];
         }
       });
     }
   }));
   expect(findFile(res, "Test.cs").contents).toBe(coretest.d`
-    namespace TestCode
+    public enum TestEnum
     {
-        public enum TestEnum
-        {
-            One,
-            Two
-        }
-        public class TestInput;
-        public class TestResult;
-        public class TestClass
+        One,
+        Two
+    }
+    public class TestInput;
+    public class TestResult;
+    public class TestClass
+    {
+        private TestEnum _memberOne;
+        public TestResult MethodOne(int intParam, TestInput bodyParam)
         {
-            private TestEnum _memberOne;
-            public TestResult MethodOne(int intParam, TestInput bodyParam)
-            {
-                return new TestResult();
-            }
+            return new TestResult();
         }
     }
   `);
@@ -281,46 +292,38 @@ describe("with type parameters", () => {
     }];
     expect(_$createComponent(TestNamespace, {
       get children() {
-        return _$createComponent(SourceFile, {
-          path: "Test.cs",
+        return _$createComponent(ClassDeclaration, {
+          "public": true,
+          name: "TestClass",
+          typeParameters: typeParameters,
           get children() {
-            return _$createComponent(ClassDeclaration, {
-              "public": true,
-              name: "TestClass",
-              typeParameters: typeParameters,
+            return _$createComponent(List, {
               get children() {
-                return _$createComponent(List, {
-                  get children() {
-                    return [_$createComponent(Property, {
-                      name: "PropA",
-                      get type() {
-                        return typeParameters[0].refkey;
-                      },
-                      get: true,
-                      set: true
-                    }), _$createComponent(Property, {
-                      name: "PropB",
-                      get type() {
-                        return typeParameters[1].refkey;
-                      },
-                      get: true,
-                      set: true
-                    })];
-                  }
-                });
+                return [_$createComponent(Property, {
+                  name: "PropA",
+                  get type() {
+                    return typeParameters[0].refkey;
+                  },
+                  get: true,
+                  set: true
+                }), _$createComponent(Property, {
+                  name: "PropB",
+                  get type() {
+                    return typeParameters[1].refkey;
+                  },
+                  get: true,
+                  set: true
+                })];
               }
             });
           }
         });
       }
     })).toRenderTo(`
-      namespace TestCode
+      public class TestClass<T, U>
       {
-          public class TestClass<T, U>
-          {
-              T PropA { get; set; }
-              U PropB { get; set; }
-          }
+          T PropA { get; set; }
+          U PropB { get; set; }
       }
     `);
   });
@@ -343,10 +346,10 @@ describe("with type parameters", () => {
       }
     })).toRenderTo(`
       public class TestClass<T, U>
-        where T : IFoo
-        where U : IBar
+          where T : IFoo
+          where U : IBar
       {
-        // Body
+          // Body
       }
     `);
   });
@@ -363,26 +366,27 @@ it("declares class with invalid members", () => {
       })];
     }
   });
-  expect(() => toSourceText(decl)).toThrow("can't define an enum member outside of an enum-decl scope");
+  expect(() => toSourceText(decl)).toThrow("EnumMember must be used within an EnumDeclaration.");
 });
 describe("constructor", () => {
   it("declares with constructor", () => {
-    const res = toSourceText(_$createComponent(ClassDeclaration, {
-      "public": true,
-      name: "TestClass",
+    const tree = _$createComponent(TestNamespace, {
       get children() {
-        return _$createComponent(Constructor, {
-          "public": true
+        return _$createComponent(ClassDeclaration, {
+          "public": true,
+          name: "TestClass",
+          get children() {
+            return _$createComponent(Constructor, {
+              "public": true
+            });
+          }
         });
       }
-    }));
-    expect(res).toBe(coretest.d`
-    namespace TestCode
+    });
+    expect(tree).toRenderTo(coretest.d`
+    public class TestClass
     {
-        public class TestClass
-        {
-            public TestClass() {}
-        }
+        public TestClass() {}
     }
   `);
   });
@@ -400,44 +404,45 @@ describe("constructor", () => {
       type: "int",
       refkey: paramSizeRefkey
     }];
-    const res = toSourceText(_$createComponent(ClassDeclaration, {
-      "public": true,
-      name: "TestClass",
+    const tree = _$createComponent(TestNamespace, {
       get children() {
-        return [_$createComponent(Field, {
-          "private": true,
-          name: "name",
-          type: "string",
-          refkey: thisNameRefkey
-        }), _$createIntrinsic("hbr", {}), _$createComponent(Field, {
-          "private": true,
-          name: "size",
-          type: "int",
-          refkey: thisSizeRefkey
-        }), _$createIntrinsic("hbr", {}), _$createComponent(Constructor, {
+        return _$createComponent(ClassDeclaration, {
           "public": true,
-          parameters: ctorParams,
+          name: "TestClass",
           get children() {
-            return [thisNameRefkey, " = ", paramNameRefkey, ";", _$createIntrinsic("hbr", {}), thisSizeRefkey, " = ", paramSizeRefkey, ";"];
+            return [_$createComponent(Field, {
+              "private": true,
+              name: "name",
+              type: "string",
+              refkey: thisNameRefkey
+            }), _$createIntrinsic("hbr", {}), _$createComponent(Field, {
+              "private": true,
+              name: "size",
+              type: "int",
+              refkey: thisSizeRefkey
+            }), _$createIntrinsic("hbr", {}), _$createComponent(Constructor, {
+              "public": true,
+              parameters: ctorParams,
+              get children() {
+                return [thisNameRefkey, " = ", paramNameRefkey, ";", _$createIntrinsic("hbr", {}), thisSizeRefkey, " = ", paramSizeRefkey, ";"];
+              }
+            })];
           }
-        })];
+        });
       }
-    }));
+    });
 
     // TODO: assignments to members should have this. prefix
     // e.g. this.name = name;
-    expect(res).toBe(coretest.d`
-    namespace TestCode
+    expect(tree).toRenderTo(coretest.d`
+    public class TestClass
     {
-        public class TestClass
+        private string _name;
+        private int _size;
+        public TestClass(string name, int size)
         {
-            private string _name;
-            private int _size;
-            public TestClass(string name, int size)
-            {
-                _name = name;
-                _size = size;
-            }
+            _name = name;
+            _size = size;
         }
     }
   `);
@@ -471,12 +476,9 @@ describe("constructor", () => {
         });
       }
     })).toRenderTo(`
-      namespace TestCode
+      public class TestClass(string name, int size)
       {
-          public class TestClass(string name, int size)
-          {
-              string PrettyName { get; } = $"{name} {size}";
-          }
+          string PrettyName { get; } = $"{name} {size}";
       }
   `);
   });
@@ -507,12 +509,9 @@ describe("constructor", () => {
         });
       }
     })).toRenderTo(`
-      namespace TestCode
+      public class TestClass(string name)
       {
-          public class TestClass(string name)
-          {
-              string name_2;
-          }
+          string name_2;
       }
   `);
   });
@@ -550,8 +549,8 @@ it("supports class member doc comments", () => {
     /// This is a test
     class Test
     {
-      /// This is a member
-      public int Member;
+        /// This is a member
+        public int Member;
     }
   `);
 });

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

@@ -1 +1 @@
-{"version":3,"file":"constructor.d.ts","sourceRoot":"","sources":["../../../../src/components/constructor/constructor.tsx"],"names":[],"mappings":"AAAA,OAAO,EAIL,MAAM,EAGP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EACL,eAAe,EAGhB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAE,cAAc,EAAc,MAAM,8BAA8B,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,6BAA6B;IAC7B,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;IAE9B,aAAa;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,uBAAuB;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,YAiClD"}
+{"version":3,"file":"constructor.d.ts","sourceRoot":"","sources":["../../../../src/components/constructor/constructor.tsx"],"names":[],"mappings":"AACA,OAAO,EAAwC,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAC9E,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AACtD,OAAO,EACL,eAAe,EAGhB,MAAM,oBAAoB,CAAC;AAG5B,OAAO,EAAE,cAAc,EAAc,MAAM,8BAA8B,CAAC;AAE1E;;GAEG;AACH,MAAM,WAAW,gBAAiB,SAAQ,eAAe;IACvD,6BAA6B;IAC7B,UAAU,CAAC,EAAE,cAAc,EAAE,CAAC;IAE9B,aAAa;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB,uBAAuB;IACvB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,YAqBlD"}

package/dist/src/components/constructor/constructor.js

@@ -1,9 +1,9 @@
 import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import { Block, Declaration, Name, refkey, Scope } from "@alloy-js/core";
+import { MethodScope } from "#components/method-scope.js";
+import { Block, MemberDeclaration, MemberName } from "@alloy-js/core";
 import { computeModifiersPrefix, getAccessModifier } 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 { useNamedTypeScope } from "../../scopes/contexts.js";
+import { MethodSymbol } from "../../symbols/method.js";
 import { Parameters } from "../parameters/parameters.js";
 
 /**
@@ -11,26 +11,18 @@ import { Parameters } from "../parameters/parameters.js";
  */
 
 export function Constructor(props) {
-  const scope = useCSharpScope();
-  if (scope.kind !== "member" || scope.name !== "class-decl" && scope.name !== "struct-decl") {
-    throw new Error("can't define a class method outside of a class or struct scope");
-  }
-  const name = useCSharpNamePolicy().getName(scope.owner.name, "class-method");
-  const ctorSymbol = new CSharpOutputSymbol(name, {
-    scope,
-    refkeys: props.refkey ?? refkey(name)
-  });
-  const ctorDeclScope = new CSharpMemberScope("constructor-decl", {
-    owner: ctorSymbol
+  const scope = useNamedTypeScope();
+  const name = scope.ownerSymbol.name;
+  const ctorSymbol = new MethodSymbol(name, scope.members, "constructor", {
+    refkeys: props.refkey
   });
   const modifiers = computeModifiersPrefix([getAccessModifier(props)]);
-  return _$createComponent(Declaration, {
+  return _$createComponent(MemberDeclaration, {
     symbol: ctorSymbol,
     get children() {
-      return _$createComponent(Scope, {
-        value: ctorDeclScope,
+      return _$createComponent(MethodScope, {
         get children() {
-          return [modifiers, _$createComponent(Name, {}), _$createComponent(Parameters, {
+          return [modifiers, _$createComponent(MemberName, {}), _$createComponent(Parameters, {
             get parameters() {
               return props.parameters;
             }

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

@@ -3,7 +3,6 @@ import { refkey } from "@alloy-js/core";
 import { expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.js";
 import { ClassDeclaration } from "../class/declaration.js";
-import { SourceFile } from "../SourceFile.js";
 import { Constructor } from "./constructor.js";
 it("reference constructor parameters in body", () => {
   const paramNameRefkey = refkey();
@@ -19,35 +18,27 @@ it("reference constructor parameters in body", () => {
   }];
   expect(_$createComponent(TestNamespace, {
     get children() {
-      return _$createComponent(SourceFile, {
-        path: "Test.cs",
+      return _$createComponent(ClassDeclaration, {
+        "public": true,
+        name: "TestClass",
         get children() {
-          return _$createComponent(ClassDeclaration, {
+          return _$createComponent(Constructor, {
             "public": true,
-            name: "TestClass",
+            parameters: ctorParams,
             get children() {
-              return _$createComponent(Constructor, {
-                "public": true,
-                parameters: ctorParams,
-                get children() {
-                  return [paramNameRefkey, ";", _$createIntrinsic("hbr", {}), paramSizeRefkey, ";"];
-                }
-              });
+              return [paramNameRefkey, ";", _$createIntrinsic("hbr", {}), paramSizeRefkey, ";"];
             }
           });
         }
       });
     }
   })).toRenderTo(`
-    namespace TestCode
+    public class TestClass
     {
-        public class TestClass
+        public TestClass(string name, int size)
         {
-            public TestClass(string name, int size)
-            {
-                name;
-                size;
-            }
+            name;
+            size;
         }
     }
   `);

package/dist/src/components/{EnumDeclaration.d.ts → enum/declaration.d.ts}

@@ -1,9 +1,9 @@
-import * as core from "@alloy-js/core";
-import { AccessModifiers } from "../modifiers.js";
+import { Children, Refkey } from "@alloy-js/core";
+import { AccessModifiers } from "../../modifiers.js";
 export interface EnumDeclarationProps extends AccessModifiers {
     name: string;
-    refkey?: core.Refkey;
-    children?: core.Children;
+    refkey?: Refkey | Refkey[];
+    children?: Children;
 }
 /**
  * A C# enum declaration
@@ -25,10 +25,5 @@ export interface EnumDeclarationProps extends AccessModifiers {
  * }
  * ```
  */
-export declare function EnumDeclaration(props: EnumDeclarationProps): core.Children;
-export interface EnumMemberProps {
-    name: string;
-    refkey?: core.Refkey;
-}
-export declare function EnumMember(props: EnumMemberProps): core.Children;
-//# sourceMappingURL=EnumDeclaration.d.ts.map
+export declare function EnumDeclaration(props: EnumDeclarationProps): Children;
+//# sourceMappingURL=declaration.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../src/components/enum/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,MAAM,EACP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAGhB,MAAM,oBAAoB,CAAC;AAO5B,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC3B,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,YAoB1D"}