@alloy-js/csharp 0.19.0 → 0.20.0-dev.1

package/dist/src/components/{ClassDeclaration.d.ts → class/declaration.d.ts}

@@ -1,18 +1,19 @@
-import * as core from "@alloy-js/core";
-import { AccessModifiers } from "../modifiers.js";
-import { AttributesProp } from "./attributes/attributes.jsx";
-import { TypeParameterProps } from "./type-parameters/type-parameter.jsx";
+import { Children, DeclarationProps, Refkey } from "@alloy-js/core";
+import { AccessModifiers } from "../../modifiers.js";
+import { AttributesProp } from "../attributes/attributes.jsx";
+import { ParameterProps } from "../parameters/parameters.jsx";
+import { TypeParameterProps } from "../type-parameters/type-parameter.jsx";
 export interface ClassModifiers {
     readonly abstract?: boolean;
     readonly partial?: boolean;
     readonly sealed?: boolean;
     readonly static?: boolean;
 }
-export interface ClassDeclarationProps extends Omit<core.DeclarationProps, "nameKind">, AccessModifiers, ClassModifiers {
+export interface ClassDeclarationProps extends Omit<DeclarationProps, "nameKind">, AccessModifiers, ClassModifiers {
     name: string;
     /** Doc comment */
-    doc?: core.Children;
-    refkey?: core.Refkey;
+    doc?: Children;
+    refkey?: Refkey;
     /**
      * Type parameters for the class
      *
@@ -27,9 +28,9 @@ export interface ClassDeclarationProps extends Omit<core.DeclarationProps, "name
      */
     typeParameters?: (string | TypeParameterProps)[];
     /** Base class that this class extends */
-    baseType?: core.Children;
+    baseType?: Children;
     /** Interfaces this class implements */
-    interfaceTypes?: core.Children[];
+    interfaceTypes?: Children[];
     /**
      * Define attributes to attach
      * @example
@@ -47,6 +48,23 @@ export interface ClassDeclarationProps extends Omit<core.DeclarationProps, "name
      * ```
      */
     attributes?: AttributesProp;
+    /**
+     * Set the primary constructor parameters
+     * @example
+     * ```tsx
+     *  <ClassDeclaration name="MyClass" primaryConstructor={[
+     *    {name: "value", type: "int"}
+     *  ]}>
+     * ```
+     * This will produce:
+     * ```csharp
+     * public class MyClass(int value)
+     * {
+     *
+     * }
+     * ```
+     */
+    primaryConstructor?: ParameterProps[];
 }
 /**
  * CSharp class declaration.
@@ -72,5 +90,5 @@ export interface ClassDeclarationProps extends Omit<core.DeclarationProps, "name
  * }
  * ```
  */
-export declare function ClassDeclaration(props: ClassDeclarationProps): core.Children;
-//# sourceMappingURL=ClassDeclaration.d.ts.map
+export declare function ClassDeclaration(props: ClassDeclarationProps): Children;
+//# sourceMappingURL=declaration.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../src/components/class/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAER,gBAAgB,EAGhB,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAI5B,OAAO,EAAiB,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAE7E,OAAO,EAAE,cAAc,EAAc,MAAM,8BAA8B,CAAC;AAE1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AAG3E,MAAM,WAAW,cAAc;IAC7B,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;CAC3B;AAUD,MAAM,WAAW,qBACf,SAAQ,IAAI,CAAC,gBAAgB,EAAE,UAAU,CAAC,EACxC,eAAe,EACf,cAAc;IAChB,IAAI,EAAE,MAAM,CAAC;IACb,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;IACf,MAAM,CAAC,EAAE,MAAM,CAAC;IAEhB;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,MAAM,GAAG,kBAAkB,CAAC,EAAE,CAAC;IAEjD,yCAAyC;IACzC,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB,uCAAuC;IACvC,cAAc,CAAC,EAAE,QAAQ,EAAE,CAAC;IAE5B;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B;;;;;;;;;;;;;;;OAeG;IACH,kBAAkB,CAAC,EAAE,cAAc,EAAE,CAAC;CACvC;AAED;;;;;;;;;;;;;;;;;;;;;;;GAuBG;AACH,wBAAgB,gBAAgB,CAAC,KAAK,EAAE,qBAAqB,YAkD5D"}

package/dist/src/components/{ClassDeclaration.js → class/declaration.js}

@@ -1,15 +1,14 @@
 import { memo as _$memo, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-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 { AttributeList } from "./attributes/attributes.js";
-import { DocWhen } from "./doc/comment.js";
-import { Name } from "./Name.js";
-import { TypeParameterConstraints } from "./type-parameters/type-parameter-constraints.js";
-import { TypeParameters } from "./type-parameters/type-parameters.js";
+import { Block, Declaration, join, Name, 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 } from "../../symbols/scopes.js";
+import { AttributeList } from "../attributes/attributes.js";
+import { DocWhen } from "../doc/comment.js";
+import { Parameters } from "../parameters/parameters.js";
+import { TypeParameterConstraints } from "../type-parameters/type-parameter-constraints.js";
+import { TypeParameters } from "../type-parameters/type-parameters.js";
 const getClassModifiers = makeModifiers(["abstract", "partial", "sealed", "static"]);
 
 // properties for creating a class
@@ -56,7 +55,7 @@ export function ClassDeclaration(props) {
     joiner: ", "
   }))] : null;
   const modifiers = computeModifiersPrefix([getAccessModifier(props), getClassModifiers(props)]);
-  return _$createComponent(core.Declaration, {
+  return _$createComponent(Declaration, {
     symbol: thisClassSymbol,
     get children() {
       return [_$createComponent(DocWhen, {
@@ -72,14 +71,23 @@ export function ClassDeclaration(props) {
         get parameters() {
           return props.typeParameters;
         }
+      })), _$memo(() => _$memo(() => !!props.primaryConstructor)() && _$createComponent(Scope, {
+        value: thisClassScope,
+        get children() {
+          return _$createComponent(Parameters, {
+            get parameters() {
+              return props.primaryConstructor;
+            }
+          });
+        }
       })), base, _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameterConstraints, {
         get parameters() {
           return props.typeParameters;
         }
-      })), _$memo(() => !props.children && ";"), _$memo(() => _$memo(() => !!props.children)() && _$createComponent(core.Block, {
+      })), _$memo(() => !props.children && ";"), _$memo(() => _$memo(() => !!props.children)() && _$createComponent(Block, {
         newline: true,
         get children() {
-          return _$createComponent(core.Scope, {
+          return _$createComponent(Scope, {
             value: thisClassScope,
             get children() {
               return props.children;

package/dist/src/components/class/declaration.test.d.ts

@@ -0,0 +1,2 @@
+export {};
+//# sourceMappingURL=declaration.test.d.ts.map

package/dist/src/components/class/declaration.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"declaration.test.d.ts","sourceRoot":"","sources":["../../../../src/components/class/declaration.test.tsx"],"names":[],"mappings":""}

package/dist/{test/class-declaration.test.js → src/components/class/declaration.test.js}

@@ -1,17 +1,31 @@
 import { createComponent as _$createComponent, mergeProps as _$mergeProps, createIntrinsic as _$createIntrinsic } from "@alloy-js/core/jsx-runtime";
-import * as core from "@alloy-js/core";
-import { List, refkey } from "@alloy-js/core";
+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";
-import { Attribute } from "../src/components/attributes/attributes.js";
-import { Field } from "../src/components/field/field.js";
-import { Constructor } from "../src/components/stc/index.js";
-import * as csharp from "../src/index.js";
-import { ClassDeclaration, Property, SourceFile } from "../src/index.js";
-import * as utils from "./utils.js";
-import { findFile } from "./utils.js";
+import { findFile, TestNamespace, toSourceText } from "../../../test/utils.js";
+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
+      });
+    }
+  });
+}
 it("declares class with no members", () => {
-  expect(_$createComponent(utils.TestNamespace, {
+  expect(_$createComponent(TestNamespace, {
     get children() {
       return _$createComponent(ClassDeclaration, {
         name: "TestClass"
@@ -23,7 +37,7 @@ it("declares class with no members", () => {
 });
 describe("modifiers", () => {
   it.each(["public", "private"])("%s", mod => {
-    expect(_$createComponent(utils.TestNamespace, {
+    expect(_$createComponent(TestNamespace, {
       get children() {
         return _$createComponent(ClassDeclaration, _$mergeProps({
           [mod]: true
@@ -36,7 +50,7 @@ describe("modifiers", () => {
     `);
   });
   it.each(["partial", "abstract", "static", "sealed"])("%s", mod => {
-    expect(_$createComponent(utils.TestNamespace, {
+    expect(_$createComponent(TestNamespace, {
       get children() {
         return _$createComponent(ClassDeclaration, _$mergeProps({
           [mod]: true
@@ -49,7 +63,7 @@ describe("modifiers", () => {
     `);
   });
   it("combines modifiers", () => {
-    expect(_$createComponent(utils.TestNamespace, {
+    expect(_$createComponent(TestNamespace, {
       get children() {
         return _$createComponent(ClassDeclaration, {
           "public": true,
@@ -65,9 +79,9 @@ describe("modifiers", () => {
 });
 describe("base", () => {
   it("define base class", () => {
-    expect(_$createComponent(utils.TestNamespace, {
+    expect(_$createComponent(TestNamespace, {
       get children() {
-        return _$createComponent(csharp.ClassDeclaration, {
+        return _$createComponent(ClassDeclaration, {
           name: "TestClass",
           baseType: "Foo"
         });
@@ -77,9 +91,9 @@ describe("base", () => {
     `);
   });
   it("define multiple interface types", () => {
-    expect(_$createComponent(utils.TestNamespace, {
+    expect(_$createComponent(TestNamespace, {
       get children() {
-        return _$createComponent(csharp.ClassDeclaration, {
+        return _$createComponent(ClassDeclaration, {
           name: "TestClass",
           interfaceTypes: ["Foo", "Bar"]
         });
@@ -89,9 +103,9 @@ describe("base", () => {
     `);
   });
   it("define base class and multiple interface types", () => {
-    expect(_$createComponent(utils.TestNamespace, {
+    expect(_$createComponent(TestNamespace, {
       get children() {
-        return _$createComponent(csharp.ClassDeclaration, {
+        return _$createComponent(ClassDeclaration, {
           name: "TestClass",
           baseType: "BaseClass",
           interfaceTypes: ["Foo", "Bar"]
@@ -103,7 +117,7 @@ describe("base", () => {
   });
 });
 it("declares class with some members", () => {
-  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
+  const res = toSourceText(_$createComponent(ClassDeclaration, {
     "public": true,
     name: "TestClass",
     get children() {
@@ -134,16 +148,16 @@ it("declares class with some members", () => {
   `);
 });
 it("declares class with some methods", () => {
-  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
+  const res = toSourceText(_$createComponent(ClassDeclaration, {
     "public": true,
     name: "TestClass",
     get children() {
-      return _$createComponent(core.List, {
+      return _$createComponent(List, {
         get children() {
-          return [_$createComponent(csharp.Method, {
+          return [_$createComponent(Method, {
             "public": true,
             name: "MethodOne"
-          }), _$createComponent(csharp.Method, {
+          }), _$createComponent(Method, {
             "private": true,
             virtual: true,
             name: "MethodTwo"
@@ -164,9 +178,9 @@ it("declares class with some methods", () => {
   `);
 });
 it("uses refkeys for members, params, and return type", () => {
-  const inputTypeRefkey = core.refkey();
-  const testResultTypeRefkey = core.refkey();
-  const enumTypeRefkey = core.refkey();
+  const inputTypeRefkey = refkey();
+  const testResultTypeRefkey = refkey();
+  const enumTypeRefkey = refkey();
   const params = [{
     name: "IntParam",
     type: "int"
@@ -174,43 +188,43 @@ it("uses refkeys for members, params, and return type", () => {
     name: "BodyParam",
     type: inputTypeRefkey
   }];
-  const res = core.render(_$createComponent(core.Output, {
+  const res = render(_$createComponent(Output, {
     get namePolicy() {
-      return csharp.createCSharpNamePolicy();
+      return createCSharpNamePolicy();
     },
     get children() {
-      return _$createComponent(csharp.Namespace, {
+      return _$createComponent(Namespace, {
         name: "TestCode",
         get children() {
-          return _$createComponent(csharp.SourceFile, {
+          return _$createComponent(SourceFile, {
             path: "Test.cs",
             get children() {
-              return [_$createComponent(csharp.EnumDeclaration, {
+              return [_$createComponent(EnumDeclaration, {
                 "public": true,
                 name: "TestEnum",
                 refkey: enumTypeRefkey,
                 get children() {
-                  return _$createComponent(core.List, {
+                  return _$createComponent(List, {
                     comma: true,
                     hardline: true,
                     get children() {
-                      return [_$createComponent(csharp.EnumMember, {
+                      return [_$createComponent(EnumMember, {
                         name: "One"
-                      }), _$createComponent(csharp.EnumMember, {
+                      }), _$createComponent(EnumMember, {
                         name: "Two"
                       })];
                     }
                   });
                 }
-              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassDeclaration, {
+              }), _$createIntrinsic("hbr", {}), _$createComponent(ClassDeclaration, {
                 "public": true,
                 name: "TestInput",
                 refkey: inputTypeRefkey
-              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassDeclaration, {
+              }), _$createIntrinsic("hbr", {}), _$createComponent(ClassDeclaration, {
                 "public": true,
                 name: "TestResult",
                 refkey: testResultTypeRefkey
-              }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.ClassDeclaration, {
+              }), _$createIntrinsic("hbr", {}), _$createComponent(ClassDeclaration, {
                 "public": true,
                 name: "TestClass",
                 get children() {
@@ -218,7 +232,7 @@ it("uses refkeys for members, params, and return type", () => {
                     "private": true,
                     name: "MemberOne",
                     type: enumTypeRefkey
-                  }), _$createIntrinsic("hbr", {}), _$createComponent(csharp.Method, {
+                  }), _$createIntrinsic("hbr", {}), _$createComponent(Method, {
                     "public": true,
                     name: "MethodOne",
                     parameters: params,
@@ -265,7 +279,7 @@ describe("with type parameters", () => {
       name: "U",
       refkey: refkey()
     }];
-    expect(_$createComponent(utils.TestNamespace, {
+    expect(_$createComponent(TestNamespace, {
       get children() {
         return _$createComponent(SourceFile, {
           path: "Test.cs",
@@ -318,7 +332,7 @@ describe("with type parameters", () => {
       name: "U",
       constraints: "IBar"
     }];
-    expect(_$createComponent(utils.TestNamespace, {
+    expect(_$createComponent(TestNamespace, {
       get children() {
         return _$createComponent(ClassDeclaration, {
           "public": true,
@@ -338,30 +352,31 @@ describe("with type parameters", () => {
   });
 });
 it("declares class with invalid members", () => {
-  const decl = _$createComponent(csharp.ClassDeclaration, {
+  const decl = _$createComponent(ClassDeclaration, {
     "public": true,
     name: "TestClass",
     get children() {
-      return [_$createComponent(csharp.EnumMember, {
+      return [_$createComponent(EnumMember, {
         name: "One"
-      }), ",", _$createIntrinsic("hbr", {}), _$createComponent(csharp.EnumMember, {
+      }), ",", _$createIntrinsic("hbr", {}), _$createComponent(EnumMember, {
         name: "Two"
       })];
     }
   });
-  expect(() => utils.toSourceText(decl)).toThrow("can't define an enum member outside of an enum-decl scope");
+  expect(() => toSourceText(decl)).toThrow("can't define an enum member outside of an enum-decl scope");
 });
-it("declares class with constructor", () => {
-  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
-    "public": true,
-    name: "TestClass",
-    get children() {
-      return _$createComponent(Constructor, {
-        "public": true
-      });
-    }
-  }));
-  expect(res).toBe(coretest.d`
+describe("constructor", () => {
+  it("declares with constructor", () => {
+    const res = toSourceText(_$createComponent(ClassDeclaration, {
+      "public": true,
+      name: "TestClass",
+      get children() {
+        return _$createComponent(Constructor, {
+          "public": true
+        });
+      }
+    }));
+    expect(res).toBe(coretest.d`
     namespace TestCode
     {
         public class TestClass
@@ -370,48 +385,48 @@ it("declares class with constructor", () => {
         }
     }
   `);
-});
-it("declares class with constructor params and assigns values to fields", () => {
-  const thisNameRefkey = core.refkey();
-  const thisSizeRefkey = core.refkey();
-  const paramNameRefkey = core.refkey();
-  const paramSizeRefkey = core.refkey();
-  const ctorParams = [{
-    name: "name",
-    type: "string",
-    refkey: paramNameRefkey
-  }, {
-    name: "size",
-    type: "int",
-    refkey: paramSizeRefkey
-  }];
-  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
-    "public": true,
-    name: "TestClass",
-    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, {
-        "public": true,
-        parameters: ctorParams,
-        get children() {
-          return [thisNameRefkey, " = ", paramNameRefkey, ";", _$createIntrinsic("hbr", {}), thisSizeRefkey, " = ", paramSizeRefkey, ";"];
-        }
-      })];
-    }
-  }));
+  });
+  it("declares with constructor params and assigns values to fields", () => {
+    const thisNameRefkey = refkey();
+    const thisSizeRefkey = refkey();
+    const paramNameRefkey = refkey();
+    const paramSizeRefkey = refkey();
+    const ctorParams = [{
+      name: "name",
+      type: "string",
+      refkey: paramNameRefkey
+    }, {
+      name: "size",
+      type: "int",
+      refkey: paramSizeRefkey
+    }];
+    const res = toSourceText(_$createComponent(ClassDeclaration, {
+      "public": true,
+      name: "TestClass",
+      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, {
+          "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`
+    // TODO: assignments to members should have this. prefix
+    // e.g. this.name = name;
+    expect(res).toBe(coretest.d`
     namespace TestCode
     {
         public class TestClass
@@ -426,9 +441,84 @@ it("declares class with constructor params and assigns values to fields", () =>
         }
     }
   `);
+  });
+  it("declares primary constructor with args", () => {
+    const paramNameRefkey = refkey();
+    const paramSizeRefkey = refkey();
+    const ctorParams = [{
+      name: "name",
+      type: "string",
+      refkey: paramNameRefkey
+    }, {
+      name: "size",
+      type: "int",
+      refkey: paramSizeRefkey
+    }];
+    expect(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(ClassDeclaration, {
+          "public": true,
+          name: "TestClass",
+          primaryConstructor: ctorParams,
+          get children() {
+            return _$createComponent(Property, {
+              name: "PrettyName",
+              type: "string",
+              get: true,
+              initializer: code`$"{${paramNameRefkey}} {${paramSizeRefkey}}"`
+            });
+          }
+        });
+      }
+    })).toRenderTo(`
+      namespace TestCode
+      {
+          public class TestClass(string name, int size)
+          {
+              string PrettyName { get; } = $"{name} {size}";
+          }
+      }
+  `);
+  });
+  it("primary constructor params conflict with method", () => {
+    const ctorParams = [{
+      name: "name",
+      type: "string"
+    }];
+    expect(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(NamePolicyContext.Provider, {
+          get value() {
+            return createNamePolicy(x => x);
+          },
+          get children() {
+            return _$createComponent(ClassDeclaration, {
+              "public": true,
+              name: "TestClass",
+              primaryConstructor: ctorParams,
+              get children() {
+                return _$createComponent(Field, {
+                  name: "name",
+                  type: "string"
+                });
+              }
+            });
+          }
+        });
+      }
+    })).toRenderTo(`
+      namespace TestCode
+      {
+          public class TestClass(string name)
+          {
+              string name_2;
+          }
+      }
+  `);
+  });
 });
 it("specify doc comment", () => {
-  expect(_$createComponent(utils.TestNamespace, {
+  expect(_$createComponent(TestNamespace, {
     get children() {
       return _$createComponent(ClassDeclaration, {
         name: "Test",
@@ -441,7 +531,7 @@ it("specify doc comment", () => {
   `);
 });
 it("supports class member doc comments", () => {
-  expect(_$createComponent(utils.TestNamespace, {
+  expect(_$createComponent(TestNamespace, {
     get children() {
       return _$createComponent(ClassDeclaration, {
         name: "Test",
@@ -466,7 +556,7 @@ it("supports class member doc comments", () => {
   `);
 });
 it("specify attributes", () => {
-  expect(_$createComponent(utils.TestNamespace, {
+  expect(_$createComponent(TestNamespace, {
     get children() {
       return _$createComponent(ClassDeclaration, {
         name: "Test",

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

@@ -2,7 +2,7 @@ import { createIntrinsic as _$createIntrinsic, createComponent as _$createCompon
 import { refkey } from "@alloy-js/core";
 import { expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.js";
-import { ClassDeclaration } from "../ClassDeclaration.js";
+import { ClassDeclaration } from "../class/declaration.js";
 import { SourceFile } from "../SourceFile.js";
 import { Constructor } from "./constructor.js";
 it("reference constructor parameters in body", () => {

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

@@ -2,7 +2,7 @@ import { memo as _$memo, createComponent as _$createComponent, mergeProps as _$m
 import { List } from "@alloy-js/core";
 import { describe, expect, it } from "vitest";
 import { TestNamespace } from "../../../test/utils.js";
-import { ClassDeclaration } from "../ClassDeclaration.js";
+import { ClassDeclaration } from "../class/declaration.js";
 import { Field } from "./field.js";
 function Wrapper(props) {
   return _$createComponent(TestNamespace, {

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

@@ -1,5 +1,5 @@
 export * from "./attributes/attributes.jsx";
-export * from "./ClassDeclaration.jsx";
+export * from "./class/declaration.jsx";
 export * from "./constructor/constructor.jsx";
 export * from "./Declaration.js";
 export * from "./doc/comment.jsx";

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

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,wBAAwB,CAAC;AACvC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,YAAY,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/components/index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAC5C,cAAc,yBAAyB,CAAC;AACxC,cAAc,+BAA+B,CAAC;AAC9C,cAAc,kBAAkB,CAAC;AACjC,cAAc,mBAAmB,CAAC;AAClC,cAAc,yBAAyB,CAAC;AACxC,cAAc,uBAAuB,CAAC;AACtC,cAAc,mBAAmB,CAAC;AAClC,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,qBAAqB,CAAC;AACpC,cAAc,WAAW,CAAC;AAC1B,cAAc,gBAAgB,CAAC;AAC/B,cAAc,6BAA6B,CAAC;AAC5C,cAAc,uBAAuB,CAAC;AACtC,cAAc,yBAAyB,CAAC;AACxC,cAAc,yBAAyB,CAAC;AACxC,cAAc,gBAAgB,CAAC;AAC/B,cAAc,iBAAiB,CAAC;AAChC,cAAc,0BAA0B,CAAC;AACzC,YAAY,EAAE,kBAAkB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,cAAc,qBAAqB,CAAC;AACpC,cAAc,uBAAuB,CAAC"}

package/dist/src/components/index.js

@@ -1,5 +1,5 @@
 export * from "./attributes/attributes.js";
-export * from "./ClassDeclaration.js";
+export * from "./class/declaration.js";
 export * from "./constructor/constructor.js";
 export * from "./Declaration.js";
 export * from "./doc/comment.js";

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

@@ -1 +1 @@
-{"version":3,"file":"parameters.d.ts","sourceRoot":"","sources":["../../../../src/components/parameters/parameters.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAKR,YAAY,EAEZ,MAAM,EACP,MAAM,gBAAgB,CAAC;AAMxB,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,sCAAsC;IACtC,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB;AAED,kEAAkE;AAClE,wBAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,YAwB9C;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;CAC1C;AAED,wCAAwC;AACxC,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,YAehD"}
+{"version":3,"file":"parameters.d.ts","sourceRoot":"","sources":["../../../../src/components/parameters/parameters.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAKR,YAAY,EAEZ,MAAM,EACP,MAAM,gBAAgB,CAAC;AAMxB,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,QAAQ,CAAC;IACf,0DAA0D;IAC1D,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,sCAAsC;IACtC,OAAO,CAAC,EAAE,QAAQ,CAAC;IACnB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,MAAM,CAAC,EAAE,YAAY,CAAC;CACvB;AAED,kEAAkE;AAClE,wBAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,YA0B9C;AAED,MAAM,WAAW,eAAe;IAC9B,UAAU,EAAE,cAAc,EAAE,GAAG,SAAS,CAAC;CAC1C;AAED,wCAAwC;AACxC,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,YAehD"}