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

package/src/components/SourceFile.tsx

@@ -1,23 +1,27 @@
 import {
+  Block,
   Children,
   computed,
   SourceFile as CoreSourceFile,
   Scope,
-  Show,
   useBinder,
 } from "@alloy-js/core";
 import { getGlobalNamespace } from "../contexts/global-namespace.js";
 import { useNamespaceContext } from "../contexts/namespace.js";
 import { CSharpSourceFileScope } from "../scopes/source-file.js";
 import { NamespaceSymbol } from "../symbols/namespace.js";
-import { NamespaceScope, NamespaceScopes } from "./namespace-scopes.jsx";
+import { NamespaceScopes } from "./namespace-scopes.jsx";
 import { Reference } from "./Reference.jsx";
 import { UsingDirective } from "./UsingDirective.jsx";
 
+/**
+ * Props for {@link SourceFile} component
+ */
 export interface SourceFileProps {
   /** Path of the source file */
   path: string;
 
+  /** Source file content */
   children?: Children;
 
   /**
@@ -27,8 +31,7 @@ export interface SourceFileProps {
   using?: string[];
 }
 
-// a C# source file. exists within the context of a namespace
-// contains using statements and declarations
+/** A C# source file exists within the context of a namespace contains using statements and declarations */
 export function SourceFile(props: SourceFileProps) {
   const sourceFileScope = new CSharpSourceFileScope(props.path);
 
@@ -41,6 +44,10 @@ export function SourceFile(props: SourceFileProps) {
       Array.from(sourceFileScope.usings) as (NamespaceSymbol | string)[]
     ).concat(props.using ?? []);
   });
+
+  const content = computed(() => (
+    <NamespaceScopes symbol={nsSymbol}>{props.children}</NamespaceScopes>
+  ));
   return (
     <CoreSourceFile
       path={props.path}
@@ -58,33 +65,23 @@ export function SourceFile(props: SourceFileProps) {
             <hbr />
           </>
         )}
-        <Show when={!!nsContext && nsSymbol !== globalNs}>
-          <Show when={sourceFileScope.hasBlockNamespace}>
+        {nsSymbol === globalNs ?
+          content
+        : <>
             namespace {nsRef}
-            {" {"}
-            <hbr />
-            {"    "}
-          </Show>
-
-          <Show when={!sourceFileScope.hasBlockNamespace}>
-            namespace {nsRef};<hbr />
-            <hbr />
-          </Show>
-          <align width={sourceFileScope.hasBlockNamespace ? 4 : 0}>
-            <NamespaceScopes symbol={nsContext!.symbol}>
-              {props.children}
-            </NamespaceScopes>
-          </align>
-          <Show when={sourceFileScope.hasBlockNamespace}>
-            <hbr />
-            {"}"}
-          </Show>
-        </Show>
-        <Show when={!nsContext || nsSymbol === globalNs}>
-          <NamespaceScope symbol={getGlobalNamespace(useBinder())}>
-            {props.children}
-          </NamespaceScope>
-        </Show>
+            {sourceFileScope.hasBlockNamespace ?
+              <>
+                {" "}
+                <Block>{content}</Block>
+              </>
+            : <>
+                ;<hbr />
+                <hbr />
+                {content}
+              </>
+            }
+          </>
+        }
       </Scope>
     </CoreSourceFile>
   );

package/src/components/class/declaration.tsx

@@ -133,6 +133,7 @@ export function ClassDeclaration(props: ClassDeclarationProps) {
   const thisClassSymbol = createNamedTypeSymbol(props.name, "class", {
     refkeys: props.refkey,
   });
+
   const thisClassScope = createClassScope(thisClassSymbol);
 
   const bases = [

package/src/symbols/factories.ts

@@ -1,6 +1,7 @@
 import {
   Namekey,
   NamePolicyGetter,
+  onCleanup,
   OutputSymbolOptions,
   useBinder,
 } from "@alloy-js/core";
@@ -99,13 +100,22 @@ export function createFieldSymbol(
   );
 }
 
+function withCleanup<T extends CSharpSymbol>(sym: T): T {
+  onCleanup(() => {
+    sym.delete();
+  });
+  return sym;
+}
+
 export function createNamedTypeSymbol(
   name: string | Namekey,
   kind: NamedTypeTypeKind,
   options?: OutputSymbolOptions,
 ) {
   const scope = useNamedTypeScope();
-  return new NamedTypeSymbol(name, scope.ownerSymbol.members, kind, options);
+  return withCleanup(
+    new NamedTypeSymbol(name, scope.ownerSymbol.members, kind, options),
+  );
 }
 
 export function createNamespaceSymbol(name: string) {
@@ -114,7 +124,7 @@ export function createNamespaceSymbol(name: string) {
   if (nsSymbol.members.symbolNames.has(name)) {
     return nsSymbol.members.symbolNames.get(name)! as NamespaceSymbol;
   }
-  return new NamespaceSymbol(name, nsSymbol);
+  return withCleanup(new NamespaceSymbol(name, nsSymbol));
 }
 
 export interface CreateMethodSymbolOptions extends CSharpSymbolOptions {
@@ -137,11 +147,13 @@ export function createMethodSymbol(
     );
   }
 
-  return new MethodSymbol(
-    originalName,
-    scope.members,
-    options.methodKind ?? "ordinary",
-    withNamePolicy(options, "class-method"),
+  return withCleanup(
+    new MethodSymbol(
+      originalName,
+      scope.members,
+      options.methodKind ?? "ordinary",
+      withNamePolicy(options, "class-method"),
+    ),
   );
 }
 
@@ -150,10 +162,12 @@ export function createPropertySymbol(
   options: CSharpSymbolOptions,
 ) {
   const scope = useNamedTypeScope();
-  return new CSharpSymbol(
-    name,
-    scope.members,
-    withNamePolicy(options, "class-property"),
+  return withCleanup(
+    new CSharpSymbol(
+      name,
+      scope.members,
+      withNamePolicy(options, "class-property"),
+    ),
   );
 }
 
@@ -181,10 +195,12 @@ export function createVariableSymbol(
       `Can't create variable symbol outside of a lexical scope, got a ${scope.constructor.name}.`,
     );
   }
-  return new CSharpSymbol(
-    originalName,
-    scope.localVariables,
-    withNamePolicy(options, "variable"),
+  return withCleanup(
+    new CSharpSymbol(
+      originalName,
+      scope.localVariables,
+      withNamePolicy(options, "variable"),
+    ),
   );
 }
 

package/temp/api.json

@@ -12101,7 +12101,7 @@
         {
           "kind": "Function",
           "canonicalReference": "@alloy-js/csharp!SourceFile:function(1)",
-          "docComment": "",
+          "docComment": "/**\n * A C# source file exists within the context of a namespace contains using statements and declarations\n */\n",
           "excerptTokens": [
             {
               "kind": "Content",
@@ -12148,7 +12148,7 @@
         {
           "kind": "Interface",
           "canonicalReference": "@alloy-js/csharp!SourceFileProps:interface",
-          "docComment": "",
+          "docComment": "/**\n * Props for {@link SourceFile} component\n */\n",
           "excerptTokens": [
             {
               "kind": "Content",
@@ -12163,7 +12163,7 @@
             {
               "kind": "PropertySignature",
               "canonicalReference": "@alloy-js/csharp!SourceFileProps#children:member",
-              "docComment": "",
+              "docComment": "/**\n * Source file content\n */\n",
               "excerptTokens": [
                 {
                   "kind": "Content",

package/tsconfig.json

@@ -4,7 +4,10 @@
     "emitDeclarationOnly": true,
     "declaration": true,
     "outDir": "dist",
-    "types": ["@alloy-js/core/testing/matchers"]
+    "types": ["@alloy-js/core/testing/matchers"],
+    "paths": {
+      "#components/*": ["./src/components/*"]
+    }
   },
   "references": [{ "path": "../core" }],
   "include": ["src/**/*.ts", "src/**/*.tsx", "test/**/*.ts", "test/**/*.tsx"],