@alloy-js/csharp 0.4.0 → 0.6.0

package/package.json

@@ -1,14 +1,12 @@
 {
   "name": "@alloy-js/csharp",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "description": "",
   "exports": {
     ".": {
-      "development": "./src/index.ts",
       "import": "./dist/src/index.js"
     },
     "./stc": {
-      "development": "./src/components/stc/index.ts",
       "import": "./dist/src/components/stc/index.js"
     }
   },
@@ -18,7 +16,7 @@
   "dependencies": {
     "change-case": "^5.4.4",
     "pathe": "^1.1.2",
-    "@alloy-js/core": "~0.4.0"
+    "@alloy-js/core": "~0.6.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.24.7",
@@ -27,9 +25,9 @@
     "@rollup/plugin-babel": "^6.0.4",
     "@rollup/plugin-typescript": "^11.1.6",
     "concurrently": "^8.2.2",
-    "typescript": "^5.5.4",
+    "typescript": "^5.7.3",
     "vitest": "^3.0.4",
-    "@alloy-js/babel-preset": "~0.1.1"
+    "@alloy-js/babel-preset": "~0.2.0"
   },
   "type": "module",
   "scripts": {

package/src/components/Class.tsx

@@ -40,7 +40,7 @@ export function Class(props: ClassProps) {
     "class-decl",
   );
 
-  let typeParams: string | undefined;
+  let typeParams: core.Children;
   if (props.typeParameters) {
     const typeParamNames = new Array<string>();
     for (const entry of Object.entries(props.typeParameters)) {
@@ -55,20 +55,29 @@ export function Class(props: ClassProps) {
         refkey: entry[1],
       });
     }
-    typeParams = `<${typeParamNames.join(", ")}>`;
+    typeParams = (
+      <group>
+        {"<"}
+        <core.For each={typeParamNames} comma line>
+          {(name) => name}
+        </core.For>
+        {">"}
+      </group>
+    );
   }
 
-  return <core.Declaration symbol={thisClassSymbol}>
-      {getAccessModifier(props.accessModifier)}class <Name />{typeParams}{!props.children && ";"}{props.children &&
-        <>
-          {"\n{"}
-            <core.Scope value={thisClassScope}>
-              {props.children}
-            </core.Scope>
-          {"}"}
-        </>
-        }
-    </core.Declaration>;
+  return (
+    <core.Declaration symbol={thisClassSymbol}>
+      {getAccessModifier(props.accessModifier)}class <Name />
+      {typeParams}
+      {!props.children && ";"}
+      {props.children && (
+        <core.Block newline>
+          <core.Scope value={thisClassScope}>{props.children}</core.Scope>
+        </core.Block>
+      )}
+    </core.Declaration>
+  );
 }
 
 export interface ClassConstructorProps {
@@ -105,22 +114,18 @@ export function ClassConstructor(props: ClassConstructorProps) {
   );
 
   const accessModifier = getAccessModifier(props.accessModifier);
-  const params = props.parameters ?
-    <Parameters parameters={props.parameters} />
-  : "";
+  const params =
+    props.parameters ? <Parameters parameters={props.parameters} /> : "";
 
   // note that scope wraps the ctor decl so that the params get the correct scope
-  return <core.Declaration symbol={ctorSymbol}>
-    <core.Scope value={ctorDeclScope}>
-      {accessModifier}<Name />({params}){!props.children && " {}"}{props.children &&
-        <>
-          {"\n{"}
-            {props.children}
-          {"}"}
-        </>
-        }
+  return (
+    <core.Declaration symbol={ctorSymbol}>
+      <core.Scope value={ctorDeclScope}>
+        {accessModifier}
+        <Name />({params})<core.Block newline>{props.children}</core.Block>
       </core.Scope>
-    </core.Declaration>;
+    </core.Declaration>
+  );
 }
 
 // properties for creating a class member
@@ -151,9 +156,12 @@ export function ClassMember(props: ClassMemberProps) {
     refkey: props.refkey ?? core.refkey(props.name),
   });
 
-  return <core.Declaration symbol={memberSymbol}>
-      {getAccessModifier(props.accessModifier)}{props.type} <Name />;
-    </core.Declaration>;
+  return (
+    <core.Declaration symbol={memberSymbol}>
+      {getAccessModifier(props.accessModifier)}
+      {props.type} <Name />
+    </core.Declaration>
+  );
 }
 
 // properties for creating a method
@@ -190,21 +198,19 @@ export function ClassMethod(props: ClassMethodProps) {
 
   const accessModifier = getAccessModifier(props.accessModifier);
   const methodModifier = getMethodModifier(props.methodModifier);
-  const params = props.parameters ?
-    <Parameters parameters={props.parameters} />
-  : "";
+  const params =
+    props.parameters ? <Parameters parameters={props.parameters} /> : "";
   const returns = props.returns ?? "void";
 
   // note that scope wraps the method decl so that the params get the correct scope
-  return <core.Declaration symbol={methodSymbol}>
-    <core.Scope value={methodScope}>
-      {accessModifier}{methodModifier}{returns} <Name />({params}){!props.children && " {}"}{props.children &&
-        <>
-          {"\n{"}
-            {props.children}
-          {"}"}
-        </>
-        }
+  return (
+    <core.Declaration symbol={methodSymbol}>
+      <core.Scope value={methodScope}>
+        {accessModifier}
+        {methodModifier}
+        {returns} <Name />({params})
+        <core.Block newline>{props.children}</core.Block>
       </core.Scope>
-    </core.Declaration>;
+    </core.Declaration>
+  );
 }

package/src/components/Declaration.tsx

@@ -11,7 +11,5 @@ export interface DeclarationProps {
 // declares a symbol in the program (class, enum, interface etc)
 export function Declaration(props: DeclarationProps) {
   const sym = createCSharpSymbol(props);
-  return <core.Declaration symbol={sym}>
-    {props.children}
-  </core.Declaration>;
+  return <core.Declaration symbol={sym}>{props.children}</core.Declaration>;
 }

package/src/components/Enum.tsx

@@ -33,17 +33,17 @@ export function Enum(props: EnumProps) {
     "enum-decl",
   );
 
-  return <core.Declaration symbol={thisEnumSymbol}>
-      {getAccessModifier(props.accessModifier)}enum <Name />{!props.children && ";"}{props.children && 
-        <>
-          {"\n{"}
-            <core.Scope value={thisEnumScope}>
-              {props.children}
-            </core.Scope>
-          {"}"}
-        </>
-        }
-    </core.Declaration>;
+  return (
+    <core.Declaration symbol={thisEnumSymbol}>
+      {getAccessModifier(props.accessModifier)}enum <Name />
+      {!props.children && ";"}
+      {props.children && (
+        <core.Scope value={thisEnumScope}>
+          <core.Block newline>{props.children}</core.Block>
+        </core.Scope>
+      )}
+    </core.Declaration>
+  );
 }
 
 // properties for creating a C# enum member
@@ -68,7 +68,9 @@ export function EnumMember(props: EnumMemberProps) {
     refkey: props.refkey ?? core.refkey(props.name),
   });
 
-  return <core.Declaration symbol={thisEnumValueSymbol}>
+  return (
+    <core.Declaration symbol={thisEnumValueSymbol}>
       <Name />
-    </core.Declaration>;
+    </core.Declaration>
+  );
 }

package/src/components/Namespace.tsx

@@ -31,9 +31,9 @@ export function Namespace(props: NamespaceProps) {
     name: props.name,
   };
 
-  return <NamespaceContext.Provider value={namespaceCtx}>
-      <core.Scope value={scope}>
-        {props.children}
-      </core.Scope>
-    </NamespaceContext.Provider>;
+  return (
+    <NamespaceContext.Provider value={namespaceCtx}>
+      <core.Scope value={scope}>{props.children}</core.Scope>
+    </NamespaceContext.Provider>
+  );
 }

package/src/components/Parameters.tsx

@@ -30,9 +30,11 @@ export function Parameter(props: ParameterProps) {
     refkey: props.refkey ?? core.refkey(props.name),
   });
 
-  return <core.Declaration symbol={memberSymbol}>
+  return (
+    <core.Declaration symbol={memberSymbol}>
       {props.type} <Name />
-    </core.Declaration>;
+    </core.Declaration>
+  );
 }
 
 export interface ParametersProps {
@@ -41,12 +43,10 @@ export interface ParametersProps {
 }
 
 // a collection of parameters
-export function Parameters(props: ParametersProps): Array<core.Child | string> {
-  return core.mapJoin(
-    props.parameters,
-    (param) => {
-      return <Parameter {...param} />;
-    },
-    { joiner: ", " },
+export function Parameters(props: ParametersProps) {
+  return (
+    <core.For each={props.parameters} joiner={", "}>
+      {(param) => <Parameter {...param} />}
+    </core.For>
   );
 }

package/src/components/ProjectDirectory.tsx

@@ -35,9 +35,10 @@ export function ProjectDirectory(props: ProjectDirectoryProps) {
     props.targetFrameworkMoniker = "net8.0";
   }
 
-  return <core.SourceDirectory path={join(props.path, props.name)}>
-    <core.SourceFile path={props.name+".csproj"} filetype="xml">
-      {core.code`
+  return (
+    <core.SourceDirectory path={join(props.path, props.name)}>
+      <core.SourceFile path={props.name + ".csproj"} filetype="xml">
+        {core.code`
         <Project Sdk="Microsoft.NET.Sdk">
           <PropertyGroup>
             <Version>${props.version}</Version>
@@ -46,9 +47,10 @@ export function ProjectDirectory(props: ProjectDirectoryProps) {
           </PropertyGroup>
         </Project>
       `}
-    </core.SourceFile>
-    <core.SourceDirectory path={props.srcDir}>
-      {props.children}
+      </core.SourceFile>
+      <core.SourceDirectory path={props.srcDir}>
+        {props.children}
+      </core.SourceDirectory>
     </core.SourceDirectory>
-  </core.SourceDirectory>;
+  );
 }

package/src/components/SourceFile.tsx

@@ -16,10 +16,13 @@ export function useSourceFile(): SourceFileContext | undefined {
   return core.useContext(SourceFileContext) as SourceFileContext;
 }
 
-// properties fro creating a C# source file
 export interface SourceFileProps {
+  /** Path of the source file */
   path: string;
+
+  /** A list of namespaces to use */
   using?: Array<string>;
+
   children?: core.Children;
 }
 
@@ -49,21 +52,26 @@ export function SourceFile(props: SourceFileProps) {
     addUsing,
   };
 
-  return <core.SourceFile path={props.path} filetype="cs" reference={Reference} indent="    ">
+  return (
+    <core.SourceFile
+      path={props.path}
+      filetype="cs"
+      reference={Reference}
+      tabWidth={4}
+    >
       <SourceFileContext.Provider value={sourceFileCtx}>
         <core.Scope name={props.path} kind="source-file">
-          {using.length > 0 ? (
-            <>
-              <UsingDirective namespaces={using} />{"\n\n"}
-            </>
-          ) : undefined}namespace {namespaceCtx.name}{!props.children && " {}\n"}{props.children && 
+          {using.length > 0 && (
             <>
-              {"\n{"}
-                {props.children}
-              {"}\n"}
+              <UsingDirective namespaces={using} />
+              <hbr />
+              <hbr />
             </>
-          }
+          )}
+          namespace {namespaceCtx.name}
+          <core.Block newline>{props.children}</core.Block>
         </core.Scope>
       </SourceFileContext.Provider>
-    </core.SourceFile>;
+    </core.SourceFile>
+  );
 }

package/src/components/UsingDirective.tsx

@@ -6,14 +6,13 @@ export interface UsingDirectiveProps {
 
 // one ore more C# using directives
 export function UsingDirective(props: UsingDirectiveProps) {
-  // we need core.memo here so that the contents are in a reactive context.
-  // the values for namespaces are reactive thus we need to observe any changes.
-  return core.memo(() => {
-    props.namespaces.sort();
-    return core
-      .mapJoin(props.namespaces, (namespace) => {
-        return `using ${namespace};`;
-      })
-      .join("");
+  const sortedNamespaces = core.computed(() => {
+    return props.namespaces.sort();
   });
+
+  return (
+    <core.For each={sortedNamespaces}>
+      {(namespace) => `using ${namespace};`}
+    </core.For>
+  );
 }

package/temp/api.json

@@ -217,8 +217,9 @@
               "text": "): "
             },
             {
-              "kind": "Content",
-              "text": "any"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -263,8 +264,9 @@
               "text": "): "
             },
             {
-              "kind": "Content",
-              "text": "any"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -480,8 +482,9 @@
               "text": "): "
             },
             {
-              "kind": "Content",
-              "text": "any"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -655,8 +658,9 @@
               "text": "): "
             },
             {
-              "kind": "Content",
-              "text": "any"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -1632,8 +1636,9 @@
               "text": "): "
             },
             {
-              "kind": "Content",
-              "text": "any"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -1779,8 +1784,9 @@
               "text": "): "
             },
             {
-              "kind": "Content",
-              "text": "any"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -1825,8 +1831,9 @@
               "text": "): "
             },
             {
-              "kind": "Content",
-              "text": "any"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -2153,8 +2160,9 @@
               "text": "export declare function Name(): "
             },
             {
-              "kind": "Content",
-              "text": "any"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -2190,8 +2198,9 @@
               "text": "): "
             },
             {
-              "kind": "Content",
-              "text": "any"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -2354,8 +2363,9 @@
               "text": "): "
             },
             {
-              "kind": "Content",
-              "text": "any"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -2530,21 +2540,8 @@
             },
             {
               "kind": "Reference",
-              "text": "Array",
-              "canonicalReference": "!Array:interface"
-            },
-            {
-              "kind": "Content",
-              "text": "<"
-            },
-            {
-              "kind": "Reference",
-              "text": "core.Child",
-              "canonicalReference": "@alloy-js/core!Child:type"
-            },
-            {
-              "kind": "Content",
-              "text": " | string>"
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -2554,7 +2551,7 @@
           "fileUrlPath": "src/components/Parameters.tsx",
           "returnTypeTokenRange": {
             "startIndex": 3,
-            "endIndex": 7
+            "endIndex": 4
           },
           "releaseTag": "Public",
           "overloadIndex": 1,
@@ -2648,8 +2645,9 @@
               "text": "): "
             },
             {
-              "kind": "Content",
-              "text": "any"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -2948,8 +2946,9 @@
               "text": "): "
             },
             {
-              "kind": "Content",
-              "text": "any"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -3040,8 +3039,9 @@
               "text": "): "
             },
             {
-              "kind": "Content",
-              "text": "any"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",
@@ -3176,7 +3176,7 @@
             {
               "kind": "PropertySignature",
               "canonicalReference": "@alloy-js/csharp!SourceFileProps#path:member",
-              "docComment": "",
+              "docComment": "/**\n * Path of the source file\n */\n",
               "excerptTokens": [
                 {
                   "kind": "Content",
@@ -3203,7 +3203,7 @@
             {
               "kind": "PropertySignature",
               "canonicalReference": "@alloy-js/csharp!SourceFileProps#using:member",
-              "docComment": "",
+              "docComment": "/**\n * A list of namespaces to use\n */\n",
               "excerptTokens": [
                 {
                   "kind": "Content",
@@ -3391,8 +3391,9 @@
               "text": "): "
             },
             {
-              "kind": "Content",
-              "text": "() => string"
+              "kind": "Reference",
+              "text": "core.Children",
+              "canonicalReference": "@alloy-js/core!Children:type"
             },
             {
               "kind": "Content",