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

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

@@ -1,8 +1,8 @@
 import * as core from "@alloy-js/core";
 export interface DeclarationProps {
     name: string;
-    refkey?: core.Refkey;
+    refkey?: core.Refkey | core.Refkey[];
     children?: core.Children;
 }
-export declare function Declaration(props: DeclarationProps): core.Children;
+export declare function Declaration(props: DeclarationProps): void;
 //# sourceMappingURL=Declaration.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"Declaration.d.ts","sourceRoot":"","sources":["../../../src/components/Declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAIvC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;CAC1B;AAGD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,iBAMlD"}
+{"version":3,"file":"Declaration.d.ts","sourceRoot":"","sources":["../../../src/components/Declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAGvC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;IACrC,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;CAC1B;AAGD,wBAAgB,WAAW,CAAC,KAAK,EAAE,gBAAgB,QAIlD"}

package/dist/src/components/Declaration.js

@@ -1,18 +1,8 @@
-import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import * as core from "@alloy-js/core";
-import { CSharpOutputSymbol } from "../symbols/csharp-output-symbol.js";
-
 // properties for creating a declaration
 
 // declares a symbol in the program (class, enum, interface etc)
 export function Declaration(props) {
-  const sym = new CSharpOutputSymbol(props.name, {
-    refkeys: props.refkey
-  });
-  return _$createComponent(core.Declaration, {
-    symbol: sym,
-    get children() {
-      return props.children;
-    }
-  });
+  throw new Error("Not supported");
+
+  //return <core.Declaration symbol={sym}>{props.children}</core.Declaration>;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"Reference.d.ts","sourceRoot":"","sources":["../../../src/components/Reference.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAGvC,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;CACrB;AAGD,wBAAgB,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,cAAc,iBAInD"}
+{"version":3,"file":"Reference.d.ts","sourceRoot":"","sources":["../../../src/components/Reference.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAGvC,MAAM,WAAW,cAAc;IAC7B,MAAM,EAAE,IAAI,CAAC,MAAM,CAAC;CACrB;AAGD,wBAAgB,SAAS,CAAC,EAAE,MAAM,EAAE,EAAE,cAAc,iBAMnD"}

package/dist/src/components/Reference.js

@@ -1,8 +1,12 @@
+import { memo as _$memo } from "@alloy-js/core/jsx-runtime";
+import * as core from "@alloy-js/core";
 import { ref } from "../symbols/reference.js";
 // used to resolve refkey references within source files
 export function Reference({
   refkey
 }) {
   const reference = ref(refkey);
-  return [reference];
+  const symbolRef = core.computed(() => reference()[1]);
+  core.emitSymbol(symbolRef);
+  return [_$memo(() => reference()[0])];
 }

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

@@ -1,14 +1,13 @@
-import * as core from "@alloy-js/core";
-export interface SourceFileContext {
-    addUsing(namespace: string): void;
-}
-export declare function useSourceFile(): SourceFileContext | undefined;
+import { Children } from "@alloy-js/core";
 export interface SourceFileProps {
     /** Path of the source file */
     path: string;
-    /** A list of namespaces to use */
-    using?: Array<string>;
-    children?: core.Children;
+    children?: Children;
+    /**
+     * A list of using directives to explicitly include. Note that providing
+     * explicit usings is not necessary when referencing symbols via refkeys.
+     */
+    using?: string[];
 }
-export declare function SourceFile(props: SourceFileProps): core.Children;
+export declare function SourceFile(props: SourceFileProps): Children;
 //# sourceMappingURL=SourceFile.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"SourceFile.d.ts","sourceRoot":"","sources":["../../../src/components/SourceFile.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAMvC,MAAM,WAAW,iBAAiB;IAEhC,QAAQ,CAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAC;CACnC;AAKD,wBAAgB,aAAa,IAAI,iBAAiB,GAAG,SAAS,CAE7D;AAED,MAAM,WAAW,eAAe;IAC9B,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IAEb,kCAAkC;IAClC,KAAK,CAAC,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;IAEtB,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;CAC1B;AAID,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,iBA+ChD"}
+{"version":3,"file":"SourceFile.d.ts","sourceRoot":"","sources":["../../../src/components/SourceFile.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,QAAQ,EAMT,MAAM,gBAAgB,CAAC;AASxB,MAAM,WAAW,eAAe;IAC9B,8BAA8B;IAC9B,IAAI,EAAE,MAAM,CAAC;IAEb,QAAQ,CAAC,EAAE,QAAQ,CAAC;IAEpB;;;OAGG;IACH,KAAK,CAAC,EAAE,MAAM,EAAE,CAAC;CAClB;AAID,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,YA2DhD"}

package/dist/src/components/SourceFile.js

@@ -1,40 +1,23 @@
-import { memo as _$memo, createComponent as _$createComponent, createIntrinsic as _$createIntrinsic } from "@alloy-js/core/jsx-runtime";
-import * as core from "@alloy-js/core";
-import { useNamespace } from "./Namespace.js";
+import { memo as _$memo, createIntrinsic as _$createIntrinsic, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
+import { 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 { NamespaceScope, NamespaceScopes } from "./namespace-scopes.js";
 import { Reference } from "./Reference.js";
 import { UsingDirective } from "./UsingDirective.js";
-
-// contains the info for the current source file
-
-const SourceFileContext = core.createContext();
-
-// returns the current source file
-export function useSourceFile() {
-  return core.useContext(SourceFileContext);
-}
 // a C# source file. exists within the context of a namespace
 // contains using statements and declarations
 export function SourceFile(props) {
-  const namespaceCtx = useNamespace();
-  if (!namespaceCtx) {
-    throw new Error("SourceFile must be declared inside a namespace");
-  }
-  const using = core.reactive(new Array());
-  if (props.using) {
-    using.push(...props.using);
-  }
-
-  // adds the specified namespace to the array of using statements.
-  // called via SourceFileContext.addUsing when resolving refkeys.
-  function addUsing(namespace) {
-    if (!using.includes(namespace)) {
-      using.push(namespace);
-    }
-  }
-  const sourceFileCtx = {
-    addUsing
-  };
-  return _$createComponent(core.SourceFile, {
+  const sourceFileScope = new CSharpSourceFileScope(props.path);
+  const nsContext = useNamespaceContext();
+  const globalNs = getGlobalNamespace(useBinder());
+  const nsSymbol = nsContext ? nsContext.symbol : globalNs;
+  const nsRef = nsContext ? nsContext.symbol.name : undefined;
+  const usings = computed(() => {
+    return Array.from(sourceFileScope.usings).concat(props.using ?? []);
+  });
+  return _$createComponent(CoreSourceFile, {
     get path() {
       return props.path;
     },
@@ -43,25 +26,66 @@ export function SourceFile(props) {
     tabWidth: 4,
     printWidth: 120,
     get children() {
-      return _$createComponent(SourceFileContext.Provider, {
-        value: sourceFileCtx,
+      return _$createComponent(Scope, {
+        value: sourceFileScope,
         get children() {
-          return _$createComponent(core.Scope, {
-            get name() {
-              return props.path;
-            },
-            kind: "source-file",
+          return [_$memo(() => _$memo(() => !!(sourceFileScope.usings.size > 0 || props.using && props.using.length > 0))() && [_$createComponent(UsingDirective, {
+            get namespaces() {
+              return usings.value;
+            }
+          }), _$createIntrinsic("hbr", {}), _$createIntrinsic("hbr", {})]), _$createComponent(Show, {
+            when: !!nsContext && nsSymbol !== globalNs,
             get children() {
-              return [_$memo(() => _$memo(() => using.length > 0)() && [_$createComponent(UsingDirective, {
-                namespaces: using
-              }), _$createIntrinsic("hbr", {}), _$createIntrinsic("hbr", {})]), "namespace ", _$memo(() => namespaceCtx.name), _$createComponent(core.Block, {
-                newline: true,
+              return [_$createComponent(Show, {
+                get when() {
+                  return sourceFileScope.hasBlockNamespace;
+                },
                 get children() {
-                  return props.children;
+                  return ["namespace ", nsRef, " {", _$createIntrinsic("hbr", {}), "    "];
+                }
+              }), _$createComponent(Show, {
+                get when() {
+                  return !sourceFileScope.hasBlockNamespace;
+                },
+                get children() {
+                  return ["namespace ", nsRef, ";", _$createIntrinsic("hbr", {}), _$createIntrinsic("hbr", {})];
+                }
+              }), _$createIntrinsic("align", {
+                get width() {
+                  return sourceFileScope.hasBlockNamespace ? 4 : 0;
+                },
+                get children() {
+                  return _$createComponent(NamespaceScopes, {
+                    get symbol() {
+                      return nsContext.symbol;
+                    },
+                    get children() {
+                      return props.children;
+                    }
+                  });
+                }
+              }), _$createComponent(Show, {
+                get when() {
+                  return sourceFileScope.hasBlockNamespace;
+                },
+                get children() {
+                  return [_$createIntrinsic("hbr", {}), "}"];
                 }
               })];
             }
-          });
+          }), _$createComponent(Show, {
+            when: !nsContext || nsSymbol === globalNs,
+            get children() {
+              return _$createComponent(NamespaceScope, {
+                get symbol() {
+                  return getGlobalNamespace(useBinder());
+                },
+                get children() {
+                  return props.children;
+                }
+              });
+            }
+          })];
         }
       });
     }

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

@@ -1,6 +1,10 @@
 import * as core from "@alloy-js/core";
+import { NamespaceSymbol } from "../symbols/namespace.js";
 export interface UsingDirectiveProps {
-    namespaces: Array<string>;
+    /**
+     * Namespace symbols or namespace names to use to generate using statements.
+     */
+    namespaces?: (NamespaceSymbol | string)[];
 }
 export declare function UsingDirective(props: UsingDirectiveProps): core.Children;
 //# sourceMappingURL=UsingDirective.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"UsingDirective.d.ts","sourceRoot":"","sources":["../../../src/components/UsingDirective.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAEvC,MAAM,WAAW,mBAAmB;IAClC,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CAC3B;AAGD,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,iBAUxD"}
+{"version":3,"file":"UsingDirective.d.ts","sourceRoot":"","sources":["../../../src/components/UsingDirective.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,yBAAyB,CAAC;AAE1D,MAAM,WAAW,mBAAmB;IAClC;;OAEG;IACH,UAAU,CAAC,EAAE,CAAC,eAAe,GAAG,MAAM,CAAC,EAAE,CAAC;CAC3C;AAGD,wBAAgB,cAAc,CAAC,KAAK,EAAE,mBAAmB,iBAgBxD"}

package/dist/src/components/UsingDirective.js

@@ -3,7 +3,9 @@ import * as core from "@alloy-js/core";
 // one ore more C# using directives
 export function UsingDirective(props) {
   const sortedNamespaces = core.computed(() => {
-    return props.namespaces.sort();
+    return props.namespaces.map(ns => typeof ns === "string" ? ns : ns.getFullyQualifiedName({
+      omitGlobal: true
+    })).sort((n1, n2) => n1.localeCompare(n2));
   });
   return _$createComponent(core.For, {
     each: sortedNamespaces,

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

@@ -1,4 +1,4 @@
-import { Children, DeclarationProps, Refkey } from "@alloy-js/core";
+import { Children, DeclarationProps, Namekey, Refkey } from "@alloy-js/core";
 import { AccessModifiers } from "../../modifiers.js";
 import { AttributesProp } from "../attributes/attributes.jsx";
 import { ParameterProps } from "../parameters/parameters.jsx";
@@ -10,7 +10,7 @@ export interface ClassModifiers {
     readonly static?: boolean;
 }
 export interface ClassDeclarationProps extends Omit<DeclarationProps, "nameKind">, AccessModifiers, ClassModifiers {
-    name: string;
+    name: string | Namekey;
     /** Doc comment */
     doc?: Children;
     refkey?: Refkey;

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

@@ -1 +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"}
+{"version":3,"file":"declaration.d.ts","sourceRoot":"","sources":["../../../../src/components/class/declaration.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAER,gBAAgB,EAGhB,OAAO,EACP,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAIhB,MAAM,oBAAoB,CAAC;AAG5B,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,GAAG,OAAO,CAAC;IACvB,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,YAqC5D"}

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

@@ -1,15 +1,14 @@
 import { memo as _$memo, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
 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 { createClassScope } from "../../scopes/factories.js";
+import { createNamedTypeSymbol } from "../../symbols/factories.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"]);
+const getClassModifiers = makeModifiers(["abstract", "sealed", "static", "partial"]);
 
 // properties for creating a class
 
@@ -38,18 +37,10 @@ const getClassModifiers = makeModifiers(["abstract", "partial", "sealed", "stati
  * ```
  */
 export function ClassDeclaration(props) {
-  const name = useCSharpNamePolicy().getName(props.name, "class");
-  const thisClassSymbol = new CSharpOutputSymbol(name, {
+  const thisClassSymbol = createNamedTypeSymbol(props.name, "class", {
     refkeys: props.refkey
   });
-
-  // this creates a new scope for the class definition.
-  // members will automatically "inherit" this scope so
-  // that refkeys to them will produce the fully-qualified
-  // name e.g. Foo.Bar.
-  const thisClassScope = new CSharpMemberScope("class-decl", {
-    owner: thisClassSymbol
-  });
+  const thisClassScope = createClassScope(thisClassSymbol);
   const bases = [...(props.baseType ? [props.baseType] : []), ...(props.interfaceTypes || [])];
   const base = bases.length > 0 ? [" : ", _$memo(() => join(bases, {
     joiner: ", "
@@ -67,34 +58,29 @@ export function ClassDeclaration(props) {
           return props.attributes;
         },
         endline: true
-      }), modifiers, "class ", _$createComponent(Name, {}), _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameters, {
-        get parameters() {
-          return props.typeParameters;
-        }
-      })), _$memo(() => _$memo(() => !!props.primaryConstructor)() && _$createComponent(Scope, {
+      }), modifiers, "class ", _$createComponent(Name, {}), _$createComponent(Scope, {
         value: thisClassScope,
         get children() {
-          return _$createComponent(Parameters, {
+          return [_$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameters, {
+            get parameters() {
+              return props.typeParameters;
+            }
+          })), _$memo(() => _$memo(() => !!props.primaryConstructor)() && _$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(Block, {
-        newline: true,
-        get children() {
-          return _$createComponent(Scope, {
-            value: thisClassScope,
+          })), base, _$memo(() => _$memo(() => !!props.typeParameters)() && _$createComponent(TypeParameterConstraints, {
+            get parameters() {
+              return props.typeParameters;
+            }
+          })), _$memo(() => !props.children && ";"), _$memo(() => _$memo(() => !!props.children)() && _$createComponent(Block, {
+            newline: true,
             get children() {
               return props.children;
             }
-          });
+          }))];
         }
-      }))];
+      })];
     }
   });
 }