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

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

@@ -31,7 +31,7 @@ describe("modifiers", () => {
       })).toRenderTo(`
         public class TestClass
         {
-          ${accessModifier} string TestProp { get; }
+            ${accessModifier} string TestProp { get; }
         }
       `);
     });
@@ -51,7 +51,7 @@ describe("modifiers", () => {
       })).toRenderTo(`
         public class TestClass
         {
-          ${methodModifier} string TestProp { get; }
+            ${methodModifier} string TestProp { get; }
         }
       `);
     });
@@ -70,7 +70,7 @@ describe("modifiers", () => {
     })).toRenderTo(`
         public class TestClass
         {
-          public new string TestProp { get; }
+            public new string TestProp { get; }
         }
       `);
   });
@@ -87,7 +87,7 @@ it("applies PascalCase naming policy", () => {
   })).toRenderTo(`
     public class TestClass
     {
-      string TestProp { get; }
+        string TestProp { get; }
     }
 `);
 });
@@ -103,7 +103,7 @@ it("has getter only", () => {
   })).toRenderTo(`
     public class TestClass
     {
-      string TestProp { get; }
+        string TestProp { get; }
     }
   `);
 });
@@ -119,7 +119,7 @@ it("has setter only", () => {
   })).toRenderTo(`
     public class TestClass
     {
-      string TestProp { set; }
+        string TestProp { set; }
     }
   `);
 });
@@ -136,7 +136,7 @@ it("has getter and setter", () => {
   })).toRenderTo(`
     public class TestClass
     {
-      string TestProp { get; set; }
+        string TestProp { get; set; }
     }
   `);
 });
@@ -153,7 +153,7 @@ it("has getter and init", () => {
   })).toRenderTo(`
     public class TestClass
     {
-      string TestProp { get; init; }
+        string TestProp { get; init; }
     }
   `);
 });
@@ -176,8 +176,8 @@ it("specify doc comment", () => {
   })).toRenderTo(`
     class Test
     {
-      /// This is a test
-      string Method { get; set; }
+        /// This is a test
+        string Method { get; set; }
     }
   `);
 });
@@ -195,7 +195,7 @@ it("specify nullable property", () => {
   })).toRenderTo(`
     public class TestClass
     {
-      string? TestProp { get; set; }
+        string? TestProp { get; set; }
     }
   `);
 });
@@ -213,7 +213,7 @@ it("specify initializer", () => {
   })).toRenderTo(`
     public class TestClass
     {
-      string TestProp { get; set; } = "abc";
+        string TestProp { get; set; } = "abc";
     }
   `);
 });
@@ -235,8 +235,8 @@ it("specify attributes", () => {
   })).toRenderTo(`
     public class TestClass
     {
-      [Test]
-      int Test { get; set; }
+        [Test]
+        int Test { get; set; }
     }
   `);
 });

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

@@ -1 +1 @@
-{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../src/components/record/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAM5B,OAAO,EAAE,cAAc,EAAc,MAAM,8BAA8B,CAAC;AAE1E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAID,2DAA2D;AAC3D,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC7C,eAAe,EACf,eAAe;IACjB,IAAI,EAAE,MAAM,CAAC;IAEb,kBAAkB;IAClB,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAE7C;;;;;;;;;;;;;;;OAeG;IACH,kBAAkB,CAAC,EAAE,cAAc,EAAE,CAAC;CACvC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,iBA6D9D"}
+{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../src/components/record/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAS5B,OAAO,EAAE,cAAc,EAAc,MAAM,8BAA8B,CAAC;AAE1E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAID,2DAA2D;AAC3D,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC7C,eAAe,EACf,eAAe;IACjB,IAAI,EAAE,MAAM,CAAC;IAEb,kBAAkB;IAClB,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,cAAc,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAE7C;;;;;;;;;;;;;;;OAeG;IACH,kBAAkB,CAAC,EAAE,cAAc,EAAE,CAAC;CACvC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,iBAyD9D"}

package/dist/src/components/record/declaration.js

@@ -2,8 +2,8 @@ import { createComponent as _$createComponent, createIntrinsic as _$createIntrin
 import * as core 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 } from "../../symbols/scopes.js";
+import { createClassScope } from "../../scopes/factories.js";
+import { createNamedTypeSymbol, createTypeParameterSymbol } from "../../symbols/factories.js";
 import { DocWhen } from "../doc/comment.js";
 import { Name } from "../Name.js";
 import { Parameters } from "../parameters/parameters.js";
@@ -33,17 +33,13 @@ const getRecordModifiers = makeModifiers(["partial"]);
  */
 export function RecordDeclaration(props) {
   const name = useCSharpNamePolicy().getName(props.name, "record");
-  const thisRecordSymbol = new CSharpOutputSymbol(name, {
-    refkeys: props.refkey
-  });
 
-  // this creates a new scope for the record definition.
-  // members will automatically "inherit" this scope so
-  // that refkeys to them will produce the fully-qualified
-  // name e.g. Foo.Bar.
-  const thisRecordScope = new CSharpMemberScope("record-decl", {
-    owner: thisRecordSymbol
+  // records don't have their own type kind but instead use class or struct
+  // depending on what kind of record we have.
+  const thisRecordSymbol = createNamedTypeSymbol(name, "record", {
+    refkeys: props.refkey
   });
+  const thisRecordScope = createClassScope(thisRecordSymbol);
   let typeParams;
   if (props.typeParameters) {
     const typeParamNames = new Array();
@@ -51,7 +47,7 @@ export function RecordDeclaration(props) {
       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], {
+      createTypeParameterSymbol(entry[0], {
         scope: thisRecordScope,
         refkeys: entry[1]
       });

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

@@ -3,18 +3,14 @@ import { code, refkey } from "@alloy-js/core";
 import { describe, expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.js";
 import { Property } from "../property/property.js";
-import { SourceFile } from "../SourceFile.js";
 import { RecordDeclaration } from "./declaration.js";
+
+// Remove Wrapper that added <SourceFile> because TestNamespace already does
 function Wrapper({
   children
 }) {
   return _$createComponent(TestNamespace, {
-    get children() {
-      return _$createComponent(SourceFile, {
-        path: "Test.cs",
-        children: children
-      });
-    }
+    children: children
   });
 }
 it("declares record with no members", () => {
@@ -102,7 +98,7 @@ it("specify record property inside", () => {
     /// This is a test
     record TestRecord
     {
-      string Prop { get; set; }
+        string Prop { get; set; }
     }
   `);
 });
@@ -136,12 +132,9 @@ describe("constructor", () => {
         });
       }
     })).toRenderTo(`
-      namespace TestCode
+      public record Test(string name, int size)
       {
-          public record Test(string name, int size)
-          {
-              string PrettyName { get; } = $"{name} {size}";
-          }
+          string PrettyName { get; } = $"{name} {size}";
       }
   `);
   });

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

@@ -1 +1 @@
-{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../src/components/struct/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAiB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAI7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAUD,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC7C,eAAe,EACf,eAAe;IACjB,IAAI,EAAE,MAAM,CAAC;IAEb,kBAAkB;IAClB,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAErB;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;IAEjD;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B,wCAAwC;IACxC,cAAc,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,iBAwC9D"}
+{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../src/components/struct/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAiB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAI7E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,GAAG,CAAC,EAAE,OAAO,CAAC;IACvB,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAUD,MAAM,WAAW,sBACf,SAAQ,IAAI,CAAC,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EAC7C,eAAe,EACf,eAAe;IACjB,IAAI,EAAE,MAAM,CAAC;IAEb,kBAAkB;IAClB,GAAG,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;IACpB,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IAErB;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;IAEjD;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B,wCAAwC;IACxC,cAAc,CAAC,EAAE,IAAI,CAAC,QAAQ,EAAE,CAAC;CAClC;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,sBAAsB,iBAsC9D"}

package/dist/src/components/struct/declaration.js

@@ -3,8 +3,8 @@ import * as core from "@alloy-js/core";
 import { join } 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 } from "../../symbols/scopes.js";
+import { createNamedTypeScope } from "../../scopes/factories.js";
+import { createNamedTypeSymbol } from "../../symbols/factories.js";
 import { AttributeList } from "../attributes/attributes.js";
 import { DocWhen } from "../doc/comment.js";
 import { Name } from "../Name.js";
@@ -36,12 +36,10 @@ const getStructModifiers = makeModifiers(["new", "readonly", "ref", "partial"]);
  */
 export function StructDeclaration(props) {
   const name = useCSharpNamePolicy().getName(props.name, "struct");
-  const thisStructSymbol = new CSharpOutputSymbol(name, {
+  const thisStructSymbol = createNamedTypeSymbol(name, "struct", {
     refkeys: props.refkey
   });
-  const thisStructScope = new CSharpMemberScope("struct-decl", {
-    owner: thisStructSymbol
-  });
+  const thisStructScope = createNamedTypeScope(thisStructSymbol);
   const modifiers = computeModifiersPrefix([getAccessModifier(props), getStructModifiers(props)]);
   const base = props.interfaceTypes && props.interfaceTypes.length > 0 ? [" : ", _$memo(() => join(props.interfaceTypes, {
     joiner: ", "

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

@@ -7,7 +7,6 @@ import { Constructor } from "../constructor/constructor.js";
 import { Field } from "../field/field.js";
 import { Method } from "../method/method.js";
 import { Property } from "../property/property.js";
-import { SourceFile } from "../SourceFile.js";
 import { StructDeclaration } from "./declaration.js";
 it("declares struct with no members", () => {
   expect(_$createComponent(TestNamespace, {
@@ -85,46 +84,38 @@ describe("with type parameters", () => {
     }];
     expect(_$createComponent(TestNamespace, {
       get children() {
-        return _$createComponent(SourceFile, {
-          path: "Test.cs",
+        return _$createComponent(StructDeclaration, {
+          "public": true,
+          name: "Test",
+          typeParameters: typeParameters,
           get children() {
-            return _$createComponent(StructDeclaration, {
-              "public": true,
-              name: "Test",
-              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 struct Test<T, U>
       {
-          public struct Test<T, U>
-          {
-              T PropA { get; set; }
-              U PropB { get; set; }
-          }
+          T PropA { get; set; }
+          U PropB { get; set; }
       }
     `);
   });
@@ -147,10 +138,10 @@ describe("with type parameters", () => {
       }
     })).toRenderTo(`
       public struct Test<T, U>
-        where T : IFoo
-        where U : IBar
+          where T : IFoo
+          where U : IBar
       {
-        // Body
+          // Body
       }
     `);
   });
@@ -187,7 +178,7 @@ it("define methods", () => {
   })).toRenderTo(`
     struct Test
     {
-      void MethodOne() {}
+        void MethodOne() {}
     }
   `);
 });
@@ -206,7 +197,7 @@ it("define constructor", () => {
   })).toRenderTo(`
     struct Test
     {
-      public Test() {}
+        public Test() {}
     }
   `);
 });
@@ -236,8 +227,8 @@ it("defines fields", () => {
   })).toRenderTo(`
     public struct TestClass
     {
-      public string MemberOne;
-      public int MemberTwo;
+        public string MemberOne;
+        public int MemberTwo;
     }
   `);
 });

package/dist/src/components/type-parameters/type-parameter.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"type-parameter.d.ts","sourceRoot":"","sources":["../../../../src/components/type-parameters/type-parameter.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAA6B,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAK7E;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAAC;IAE7C;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACrC;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,YAStD"}
+{"version":3,"file":"type-parameter.d.ts","sourceRoot":"","sources":["../../../../src/components/type-parameters/type-parameter.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAGR,MAAM,EACP,MAAM,gBAAgB,CAAC;AAGxB;;GAEG;AACH,MAAM,WAAW,kBAAkB;IACjC;;OAEG;IACH,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IAEtB;;OAEG;IACH,QAAQ,CAAC,WAAW,CAAC,EAAE,QAAQ,GAAG,QAAQ,EAAE,CAAC;IAE7C;;OAEG;IACH,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;CACrC;AAED,wBAAgB,aAAa,CAAC,KAAK,EAAE,kBAAkB,YAStD"}

package/dist/src/components/type-parameters/type-parameter.js

@@ -1,22 +1,19 @@
 import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import { MemberDeclaration, refkey } from "@alloy-js/core";
-import { useCSharpNamePolicy } from "../../name-policy.js";
-import { CSharpOutputSymbol } from "../../symbols/csharp-output-symbol.js";
-import { useCSharpScope } from "../../symbols/scopes.js";
+import { MemberDeclaration, MemberName } from "@alloy-js/core";
+import { createTypeParameterSymbol } from "../../symbols/factories.js";
 
 /**
  * Information for a TypeScript generic type parameter.
  */
 
 export function TypeParameter(props) {
-  const name = useCSharpNamePolicy().getName(props.name, "type-parameter");
-  const scope = useCSharpScope();
-  const symbol = new CSharpOutputSymbol(name, {
-    scope,
-    refkeys: props.refkey ?? refkey(props.name)
+  const symbol = createTypeParameterSymbol(props.name, {
+    refkeys: props.refkey
   });
   return _$createComponent(MemberDeclaration, {
     symbol: symbol,
-    children: name
+    get children() {
+      return _$createComponent(MemberName, {});
+    }
   });
 }

package/dist/src/components/type-parameters/type-parameters.test.js

@@ -15,13 +15,13 @@ it("render very long", () => {
   expect(_$createComponent(TestNamespace, {
     get children() {
       return _$createComponent(TypeParameters, {
-        parameters: ["SomeVeryVeryLongParamThatMightGetSplitOverMultipleLinesA", "SomeVeryVeryLongParamThatMightGetSplitOverMultipleLinesB"]
+        parameters: ["SomeVeryVeryLongParamThatMightGetSplitOverMultipleLinesLongLongLongLongLongA", "SomeVeryVeryLongParamThatMightGetSplitOverMultipleLinesLongLongLongLongLongB"]
       });
     }
   })).toRenderTo(`
     <
-      SomeVeryVeryLongParamThatMightGetSplitOverMultipleLinesA,
-      SomeVeryVeryLongParamThatMightGetSplitOverMultipleLinesB>
+        SomeVeryVeryLongParamThatMightGetSplitOverMultipleLinesLongLongLongLongLongA,
+        SomeVeryVeryLongParamThatMightGetSplitOverMultipleLinesLongLongLongLongLongB>
     `);
 });
 it("declare type parameters using parameters names", () => {

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

@@ -1 +1 @@
-{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../src/components/var/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,gBAAgB,EAAQ,MAAM,EAAE,MAAM,gBAAgB,CAAC;AAI1E,iDAAiD;AACjD,MAAM,WAAW,mBACf,SAAQ,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC;IAC1C,oBAAoB;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,4EAA4E;IAC5E,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,YAQxD"}
+{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../src/components/var/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAER,gBAAgB,EAEhB,MAAM,EACP,MAAM,gBAAgB,CAAC;AAGxB,iDAAiD;AACjD,MAAM,WAAW,mBACf,SAAQ,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC;IAC1C,oBAAoB;IACpB,IAAI,EAAE,MAAM,CAAC;IACb,4EAA4E;IAC5E,IAAI,CAAC,EAAE,QAAQ,CAAC;IAChB,sBAAsB;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,qBAAqB;IACrB,QAAQ,CAAC,EAAE,QAAQ,CAAC;CACrB;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,YASxD"}

package/dist/src/components/var/declaration.js

@@ -1,7 +1,6 @@
 import { memo as _$memo, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import { Name } from "@alloy-js/core";
-import { useCSharpNamePolicy } from "../../name-policy.js";
-import { Declaration } from "../Declaration.js";
+import { Declaration, Name } from "@alloy-js/core";
+import { createVariableSymbol } from "../../symbols/factories.js";
 
 /** Props for {@link VarDeclaration} component */
 
@@ -27,12 +26,11 @@ import { Declaration } from "../Declaration.js";
  * ```
  */
 export function VarDeclaration(props) {
-  const name = useCSharpNamePolicy().getName(props.name, "variable");
+  const sym = createVariableSymbol(props.name, {
+    refkeys: props.refkey
+  });
   return _$createComponent(Declaration, {
-    name: name,
-    get refkey() {
-      return props.refkey;
-    },
+    symbol: sym,
     get children() {
       return [_$memo(() => props.type ?? "var"), " ", _$createComponent(Name, {}), " = ", _$memo(() => props.children), ";"];
     }

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

@@ -2,7 +2,6 @@ import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime
 import { List, refkey } from "@alloy-js/core";
 import { expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.js";
-import { SourceFile } from "../SourceFile.js";
 import { VarDeclaration } from "./declaration.js";
 it("declares var without type", () => {
   expect(_$createComponent(TestNamespace, {
@@ -45,29 +44,21 @@ it("links refkey", () => {
   const key = refkey();
   expect(_$createComponent(TestNamespace, {
     get children() {
-      return _$createComponent(SourceFile, {
-        path: "test.cs",
+      return _$createComponent(List, {
         get children() {
-          return _$createComponent(List, {
-            get children() {
-              return [_$createComponent(VarDeclaration, {
-                name: "testVar",
-                refkey: key,
-                children: "42"
-              }), _$createComponent(VarDeclaration, {
-                name: "testVar2",
-                children: key
-              })];
-            }
-          });
+          return [_$createComponent(VarDeclaration, {
+            name: "testVar",
+            refkey: key,
+            children: "42"
+          }), _$createComponent(VarDeclaration, {
+            name: "testVar2",
+            children: key
+          })];
         }
       });
     }
   })).toRenderTo(`
-      namespace TestCode
-      {
-          var testVar = 42;
-          var testVar2 = testVar;
-      }
+      var testVar = 42;
+      var testVar2 = testVar;
   `);
 });

package/dist/src/contexts/global-namespace.d.ts

@@ -0,0 +1,5 @@
+import { Binder } from "@alloy-js/core";
+import { NamespaceSymbol } from "../symbols/namespace.js";
+export declare function useGlobalNamespace(): NamespaceSymbol;
+export declare function getGlobalNamespace(binder: Binder | undefined): NamespaceSymbol;
+//# sourceMappingURL=global-namespace.d.ts.map

package/dist/src/contexts/global-namespace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"global-namespace.d.ts","sourceRoot":"","sources":["../../../src/contexts/global-namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAa,MAAM,gBAAgB,CAAC;AACnD,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,wBAAgB,kBAAkB,oBAGjC;AAMD,wBAAgB,kBAAkB,CAAC,MAAM,EAAE,MAAM,GAAG,SAAS,mBAgB5D"}

package/dist/src/contexts/global-namespace.js

@@ -0,0 +1,24 @@
+import { useBinder } from "@alloy-js/core";
+import { NamespaceSymbol } from "../symbols/namespace.js";
+export function useGlobalNamespace() {
+  const binder = useBinder();
+  return getGlobalNamespace(binder);
+}
+const globalNamespaces = new WeakMap();
+const defaultGlobalNamespace = new NamespaceSymbol("global", undefined, {
+  isGlobal: true
+});
+export function getGlobalNamespace(binder) {
+  if (!binder) {
+    return defaultGlobalNamespace;
+  }
+  let namespace = globalNamespaces.get(binder);
+  if (!namespace) {
+    namespace = new NamespaceSymbol("global", undefined, {
+      binder,
+      isGlobal: true
+    });
+    globalNamespaces.set(binder, namespace);
+  }
+  return namespace;
+}

package/dist/src/contexts/namespace.d.ts

@@ -0,0 +1,8 @@
+import { ComponentContext } from "@alloy-js/core";
+import { NamespaceSymbol } from "../symbols/namespace.js";
+export interface NamespaceContext {
+    symbol: NamespaceSymbol;
+}
+export declare const NamespaceContext: ComponentContext<NamespaceContext>;
+export declare function useNamespaceContext(): NamespaceContext | undefined;
+//# sourceMappingURL=namespace.d.ts.map

package/dist/src/contexts/namespace.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"namespace.d.ts","sourceRoot":"","sources":["../../../src/contexts/namespace.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAA6B,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,MAAM,WAAW,gBAAgB;IAC/B,MAAM,EAAE,eAAe,CAAC;CACzB;AAED,eAAO,MAAM,gBAAgB,EAAE,gBAAgB,CAAC,gBAAgB,CAC/C,CAAC;AAElB,wBAAgB,mBAAmB,iCAElC"}

package/dist/src/contexts/namespace.js

@@ -0,0 +1,5 @@
+import { createContext, useContext } from "@alloy-js/core";
+export const NamespaceContext = createContext();
+export function useNamespaceContext() {
+  return useContext(NamespaceContext);
+}

package/dist/src/index.d.ts

@@ -1,5 +1,6 @@
 export * from "./components/index.js";
 export * from "./modifiers.js";
 export * from "./name-policy.js";
+export * from "./scopes/index.js";
 export * from "./symbols/index.js";
 //# sourceMappingURL=index.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,oBAAoB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,cAAc,uBAAuB,CAAC;AACtC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,oBAAoB,CAAC"}

package/dist/src/index.js

@@ -1,4 +1,5 @@
 export * from "./components/index.js";
 export * from "./modifiers.js";
 export * from "./name-policy.js";
+export * from "./scopes/index.js";
 export * from "./symbols/index.js";

package/dist/src/modifiers.d.ts

@@ -6,6 +6,17 @@ export interface AccessModifiers {
     readonly internal?: boolean;
     readonly file?: boolean;
 }
+export interface NonAccessModifiers {
+    readonly override?: boolean;
+    readonly abstract?: boolean;
+    readonly virtual?: boolean;
+    readonly static?: boolean;
+    readonly sealed?: boolean;
+    readonly extern?: boolean;
+    readonly readOnly?: boolean;
+}
+export interface DeclarationModifiers extends AccessModifiers, NonAccessModifiers {
+}
 export declare const getAccessModifier: (data: AccessModifiers) => string;
 export declare function getAsyncModifier(async?: boolean): string;
 /** Resolve the modifier prefix */

package/dist/src/modifiers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modifiers.d.ts","sourceRoot":"","sources":["../../src/modifiers.ts"],"names":[],"mappings":"AAGA,yBAAyB;AACzB,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,eAAO,MAAM,iBAAiB,mCAM5B,CAAC;AAEH,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAExD;AAED,kCAAkC;AAClC,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,GACnC,MAAM,CAGR;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,IAC1C,MAAM,CAAC,YAMhB"}
+{"version":3,"file":"modifiers.d.ts","sourceRoot":"","sources":["../../src/modifiers.ts"],"names":[],"mappings":"AAGA,yBAAyB;AACzB,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,MAAM,WAAW,kBAAkB;IACjC,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AAED,MAAM,WAAW,oBACf,SAAQ,eAAe,EACrB,kBAAkB;CAAG;AAEzB,eAAO,MAAM,iBAAiB,mCAM5B,CAAC;AAEH,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAExD;AAED,kCAAkC;AAClC,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,GACnC,MAAM,CAGR;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,IAC1C,MAAM,CAAC,YAMhB"}

package/dist/src/scopes/class.d.ts

@@ -0,0 +1,10 @@
+import type { OutputSpace } from "@alloy-js/core";
+import { CSharpNamedTypeScope } from "./named-type.js";
+export declare class CSharpClassScope extends CSharpNamedTypeScope {
+    /**
+     * For now, we stuff class parameters into the member scope. This is to ensure
+     * name conflicts are handled correctly.
+     */
+    get parameters(): OutputSpace;
+}
+//# sourceMappingURL=class.d.ts.map

package/dist/src/scopes/class.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"class.d.ts","sourceRoot":"","sources":["../../../src/scopes/class.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,qBAAa,gBAAiB,SAAQ,oBAAoB;IACxD;;;OAGG;IACH,IAAI,UAAU,IAAI,WAAW,CAE5B;CACF"}

package/dist/src/scopes/class.js

@@ -0,0 +1,10 @@
+import { CSharpNamedTypeScope } from "./named-type.js";
+export class CSharpClassScope extends CSharpNamedTypeScope {
+  /**
+   * For now, we stuff class parameters into the member scope. This is to ensure
+   * name conflicts are handled correctly.
+   */
+  get parameters() {
+    return this.members;
+  }
+}

package/dist/src/scopes/contexts.d.ts

@@ -0,0 +1,9 @@
+import { CSharpScope } from "./csharp.js";
+import { CSharpLexicalScope } from "./lexical.js";
+import { CSharpMethodScope } from "./method.js";
+import { CSharpNamedTypeScope } from "./named-type.js";
+export declare function useCSharpScope(): CSharpScope;
+export declare function useNamedTypeScope(): CSharpNamedTypeScope;
+export declare function useMethodScope(): CSharpMethodScope;
+export declare function useLexicalScope(): CSharpLexicalScope;
+//# sourceMappingURL=contexts.d.ts.map

package/dist/src/scopes/contexts.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"contexts.d.ts","sourceRoot":"","sources":["../../../src/scopes/contexts.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC1C,OAAO,EAAE,kBAAkB,EAAE,MAAM,cAAc,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAChD,OAAO,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAEvD,wBAAgB,cAAc,gBAO7B;AAED,wBAAgB,iBAAiB,yBAShC;AAED,wBAAgB,cAAc,sBAQ7B;AAED,wBAAgB,eAAe,uBAQ9B"}