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

package/test/project-directory.test.tsx

@@ -22,6 +22,7 @@ it("defines a project directory file with multiple source files", () => {
         </csharp.Namespace>
       </csharp.ProjectDirectory>
     </core.Output>,
+    { insertFinalNewLine: false },
   );
 
   const projDir = res.contents[0] as core.OutputDirectory;
@@ -46,19 +47,17 @@ it("defines a project directory file with multiple source files", () => {
   expect(srcDir.contents[0].path).equals("~/projects/TestProject/src/Test1.cs");
   expect((srcDir.contents[0] as core.ContentOutputFile).contents)
     .toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass1;
-    }
+    namespace TestCode;
+    
+    public class TestClass1;
   `);
 
   expect(srcDir.contents[1].path).equals("~/projects/TestProject/src/Test2.cs");
   expect((srcDir.contents[1] as core.ContentOutputFile).contents)
     .toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass2;
-    }
+    namespace TestCode;
+    
+    public class TestClass2;
   `);
 });
 
@@ -82,6 +81,7 @@ it("defines a project directory file with multiple source files and a custom TFM
         </csharp.Namespace>
       </csharp.ProjectDirectory>
     </core.Output>,
+    { insertFinalNewLine: false },
   );
 
   const projDir = res.contents[0] as core.OutputDirectory;
@@ -106,18 +106,16 @@ it("defines a project directory file with multiple source files and a custom TFM
   expect(srcDir.contents[0].path).equals("~/projects/TestProject/src/Test1.cs");
   expect((srcDir.contents[0] as core.ContentOutputFile).contents)
     .toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass1;
-    }
+    namespace TestCode;
+    
+    public class TestClass1;
   `);
 
   expect(srcDir.contents[1].path).equals("~/projects/TestProject/src/Test2.cs");
   expect((srcDir.contents[1] as core.ContentOutputFile).contents)
     .toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass2;
-    }
+    namespace TestCode;
+    
+    public class TestClass2;
   `);
 });

package/test/using.test.tsx

@@ -2,7 +2,7 @@ import * as core from "@alloy-js/core";
 import * as coretest from "@alloy-js/core/testing";
 import { expect, it } from "vitest";
 import * as csharp from "../src/index.js";
-import { assertFileContents, findFile } from "./utils.jsx";
+import { findFile } from "./utils.jsx";
 
 it("uses a single namespace", () => {
   const res = core.render(
@@ -16,7 +16,9 @@ it("uses a single namespace", () => {
   expect(findFile(res, "Test1.cs").contents).toBe(coretest.d`
     using Foo;
 
-    namespace TestCode {}
+    namespace TestCode;
+    
+
   `);
 });
 
@@ -33,7 +35,9 @@ it("uses multiple namespaces", () => {
     using Bar.Baz;
     using Foo;
 
-    namespace TestCode {}
+    namespace TestCode;
+
+
   `);
 });
 
@@ -49,7 +53,7 @@ it("adds using statement across namespaces", () => {
     },
   ];
 
-  const res = core.render(
+  expect(
     <core.Output namePolicy={csharp.createCSharpNamePolicy()}>
       <csharp.Namespace name="Models">
         <csharp.SourceFile path="Models.cs">
@@ -86,33 +90,29 @@ it("adds using statement across namespaces", () => {
         </csharp.SourceFile>
       </csharp.Namespace>
     </core.Output>,
-  );
-
-  assertFileContents(res, {
+  ).toRenderTo({
     "Models.cs": coretest.d`
-      namespace Models
+      namespace Models;
+
+      public class Input;
+      public class Output;
+      public enum TestEnum
       {
-          public class Input;
-          public class Output;
-          public enum TestEnum
-          {
-              One,
-              Two
-          }
+          One,
+          Two
       }
     `,
     "Client.cs": coretest.d`
       using Models;
       using System;
 
-      namespace Client
+      namespace Client;
+      
+      public class Client
       {
-          public class Client
-          {
-              public Output MethodOne(Input bodyParam) {}
-          }
-          TestEnum.Two;
+          public Output MethodOne(Input bodyParam) {}
       }
+      TestEnum.Two;
     `,
   });
 });

package/test/utils.tsx

@@ -8,7 +8,7 @@ export function TestNamespace(props: {
 }): core.Children {
   return (
     <core.Output namePolicy={csharp.createCSharpNamePolicy()}>
-      <csharp.Namespace name="TestCode">{props.children}</csharp.Namespace>
+      <csharp.SourceFile path="Test.cs">{props.children}</csharp.SourceFile>
     </core.Output>
   );
 }
@@ -19,6 +19,7 @@ export function toSourceText(c: core.Children): string {
         <csharp.SourceFile path="Test.cs">{c}</csharp.SourceFile>
       </csharp.Namespace>
     </core.Output>,
+    { insertFinalNewLine: false },
   );
 
   const file = findFile(res, "Test.cs");

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"],

package/tsdoc-metadata.json

@@ -5,7 +5,7 @@
   "toolPackages": [
     {
       "packageName": "@microsoft/api-extractor",
-      "packageVersion": "7.52.8"
+      "packageVersion": "7.52.9"
     }
   ]
 }

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

@@ -1 +0,0 @@
-{"version":3,"file":"EnumDeclaration.d.ts","sourceRoot":"","sources":["../../../src/components/EnumDeclaration.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EACL,eAAe,EAGhB,MAAM,iBAAiB,CAAC;AAOzB,MAAM,WAAW,oBAAqB,SAAQ,eAAe;IAC3D,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;IACrB,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;CAC1B;AAED;;;;;;;;;;;;;;;;;;;GAmBG;AACH,wBAAgB,eAAe,CAAC,KAAK,EAAE,oBAAoB,iBAgC1D;AAGD,MAAM,WAAW,eAAe;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC;CACtB;AAGD,wBAAgB,UAAU,CAAC,KAAK,EAAE,eAAe,iBAmBhD"}

package/dist/src/components/EnumDeclaration.js

@@ -1,85 +0,0 @@
-import { createComponent as _$createComponent, memo as _$memo } from "@alloy-js/core/jsx-runtime";
-import * as core from "@alloy-js/core";
-import { computeModifiersPrefix, getAccessModifier } from "../modifiers.js";
-import { useCSharpNamePolicy } from "../name-policy.js";
-import { CSharpOutputSymbol } from "../symbols/csharp-output-symbol.js";
-import { CSharpMemberScope, useCSharpScope } from "../symbols/scopes.js";
-import { Name } from "./Name.js";
-
-// properties for creating an enum
-
-/**
- * A C# enum declaration
- * @example
- * ```tsx
- * <EnumDeclaration public name="Color">
- *   <EnumMember name="Red" />
- *   <EnumMember name="Green" />
- *   <EnumMember name="Blue" />
- * </EnumDeclaration>
- * ```
- * This will produce:
- * ```csharp
- * public enum Color
- * {
- *   Red,
- *   Green,
- *   Blue
- * }
- * ```
- */
-export function EnumDeclaration(props) {
-  const name = useCSharpNamePolicy().getName(props.name, "enum");
-  const scope = useCSharpScope();
-  const thisEnumSymbol = new CSharpOutputSymbol(name, {
-    scope,
-    refkeys: props.refkey ?? core.refkey(props.name)
-  });
-
-  // this creates a new scope for the enum definition.
-  // members will automatically "inherit" this scope so
-  // that refkeys to them will produce the fully-qualified
-  // name e.g. Foo.Bar.
-  const thisEnumScope = new CSharpMemberScope("enum-decl", {
-    parent: scope,
-    owner: thisEnumSymbol
-  });
-  const modifiers = computeModifiersPrefix([getAccessModifier(props)]);
-  if (thisEnumScope.owner) return _$createComponent(core.Declaration, {
-    symbol: thisEnumSymbol,
-    get children() {
-      return [modifiers, "enum ", _$createComponent(Name, {}), _$memo(() => !props.children && ";"), _$memo(() => _$memo(() => !!props.children)() && _$createComponent(core.Scope, {
-        value: thisEnumScope,
-        get children() {
-          return _$createComponent(core.Block, {
-            newline: true,
-            get children() {
-              return props.children;
-            }
-          });
-        }
-      }))];
-    }
-  });
-}
-
-// properties for creating a C# enum member
-
-// a member within a C# enum
-export function EnumMember(props) {
-  const scope = useCSharpScope();
-  if (scope.kind === "member" && scope.name !== "enum-decl") {
-    throw new Error("can't define an enum member outside of an enum-decl scope");
-  }
-  const name = useCSharpNamePolicy().getName(props.name, "enum-member");
-  const thisEnumValueSymbol = new CSharpOutputSymbol(name, {
-    scope,
-    refkeys: props.refkey ?? core.refkey(props.name)
-  });
-  return _$createComponent(core.Declaration, {
-    symbol: thisEnumValueSymbol,
-    get children() {
-      return _$createComponent(Name, {});
-    }
-  });
-}

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

@@ -1,11 +0,0 @@
-import * as core from "@alloy-js/core";
-export interface NamespaceContext {
-    name: string;
-}
-export declare function useNamespace(): NamespaceContext | undefined;
-export interface NamespaceProps {
-    name: string;
-    children?: core.Children;
-}
-export declare function Namespace(props: NamespaceProps): core.Children;
-//# sourceMappingURL=Namespace.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"Namespace.d.ts","sourceRoot":"","sources":["../../../src/components/Namespace.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAIvC,MAAM,WAAW,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC;CACd;AAKD,wBAAgB,YAAY,IAAI,gBAAgB,GAAG,SAAS,CAE3D;AAGD,MAAM,WAAW,cAAc;IAC7B,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC;CAC1B;AAGD,wBAAgB,SAAS,CAAC,KAAK,EAAE,cAAc,iBAY9C"}

package/dist/src/components/Namespace.js

@@ -1,33 +0,0 @@
-import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import * as core from "@alloy-js/core";
-import { CSharpNamespaceScope } from "../symbols/scopes.js";
-
-// contains the info for the current namespace
-
-const NamespaceContext = core.createContext();
-
-// returns the current namespace
-export function useNamespace() {
-  return core.useContext(NamespaceContext);
-}
-
-// properties for creating a C# namespace
-
-// a C# namespace. contains one or more source files
-export function Namespace(props) {
-  const scope = new CSharpNamespaceScope(props.name);
-  const namespaceCtx = {
-    name: props.name
-  };
-  return _$createComponent(NamespaceContext.Provider, {
-    value: namespaceCtx,
-    get children() {
-      return _$createComponent(core.Scope, {
-        value: scope,
-        get children() {
-          return props.children;
-        }
-      });
-    }
-  });
-}

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

@@ -1,14 +0,0 @@
-import * as core from "@alloy-js/core";
-export interface SourceFileContext {
-    addUsing(namespace: string): void;
-}
-export declare function useSourceFile(): SourceFileContext | undefined;
-export interface SourceFileProps {
-    /** Path of the source file */
-    path: string;
-    /** A list of namespaces to use */
-    using?: Array<string>;
-    children?: core.Children;
-}
-export declare function SourceFile(props: SourceFileProps): core.Children;
-//# sourceMappingURL=SourceFile.d.ts.map

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

@@ -1 +0,0 @@
-{"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"}

package/dist/src/components/SourceFile.js

@@ -1,69 +0,0 @@
-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 { 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, {
-    get path() {
-      return props.path;
-    },
-    filetype: "cs",
-    reference: Reference,
-    tabWidth: 4,
-    printWidth: 120,
-    get children() {
-      return _$createComponent(SourceFileContext.Provider, {
-        value: sourceFileCtx,
-        get children() {
-          return _$createComponent(core.Scope, {
-            get name() {
-              return props.path;
-            },
-            kind: "source-file",
-            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,
-                get children() {
-                  return props.children;
-                }
-              })];
-            }
-          });
-        }
-      });
-    }
-  });
-}

package/dist/src/symbols/csharp-output-symbol.d.ts

@@ -1,8 +0,0 @@
-import * as core from "@alloy-js/core";
-import { CSharpOutputScope } from "./scopes.js";
-export declare class CSharpOutputSymbol extends core.OutputSymbol {
-    get scope(): CSharpOutputScope;
-    set scope(value: CSharpOutputScope);
-    constructor(name: string, options?: core.OutputSymbolOptions);
-}
-//# sourceMappingURL=csharp-output-symbol.d.ts.map

package/dist/src/symbols/csharp-output-symbol.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"csharp-output-symbol.d.ts","sourceRoot":"","sources":["../../../src/symbols/csharp-output-symbol.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAEvC,OAAO,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAIhD,qBAAa,kBAAmB,SAAQ,IAAI,CAAC,YAAY;IACvD,IAAI,KAAK,IAGQ,iBAAiB,CADjC;IACD,IAAI,KAAK,CAAC,KAAK,EAAE,iBAAiB,EAEjC;gBAEW,IAAI,EAAE,MAAM,EAAE,OAAO,CAAC,EAAE,IAAI,CAAC,mBAAmB;CAO7D"}

package/dist/src/symbols/csharp-output-symbol.js

@@ -1,19 +0,0 @@
-import * as core from "@alloy-js/core";
-import { useNamespace } from "../components/Namespace.js";
-// represents a symbol from a .cs file. Class, enum, interface etc.
-
-export class CSharpOutputSymbol extends core.OutputSymbol {
-  get scope() {
-    return super.scope;
-  }
-  set scope(value) {
-    super.scope = value;
-  }
-  constructor(name, options) {
-    const namespaceCtx = useNamespace();
-    if (!namespaceCtx) {
-      throw new Error("symbol must be declared inside a namespace");
-    }
-    super(name, options);
-  }
-}

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

@@ -1,14 +0,0 @@
-import * as core from "@alloy-js/core";
-import { CSharpOutputSymbol } from "./csharp-output-symbol.js";
-export declare class CSharpNamespaceScope extends core.OutputScope {
-    get kind(): string;
-}
-export type CSharpMemberScopeName = "class-decl" | "constructor-decl" | "enum-decl" | "method-decl";
-export declare class CSharpMemberScope extends core.OutputScope {
-    get kind(): string;
-    get name(): CSharpMemberScopeName;
-    get owner(): CSharpOutputSymbol;
-}
-export type CSharpOutputScope = CSharpMemberScope | CSharpNamespaceScope;
-export declare function useCSharpScope(): CSharpOutputScope;
-//# sourceMappingURL=scopes.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"scopes.d.ts","sourceRoot":"","sources":["../../../src/symbols/scopes.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,2BAA2B,CAAC;AAG/D,qBAAa,oBAAqB,SAAQ,IAAI,CAAC,WAAW;IACxD,IAAI,IAAI,WAEP;CACF;AAGD,MAAM,MAAM,qBAAqB,GAC7B,YAAY,GACZ,kBAAkB,GAClB,WAAW,GACX,aAAa,CAAC;AAKlB,qBAAa,iBAAkB,SAAQ,IAAI,CAAC,WAAW;IACrD,IAAI,IAAI,WAEP;IAED,IAAI,IAAI,IACe,qBAAqB,CAC3C;IAED,IAAI,KAAK,IACe,kBAAkB,CACzC;CACF;AAGD,MAAM,MAAM,iBAAiB,GAAG,iBAAiB,GAAG,oBAAoB,CAAC;AAGzE,wBAAgB,cAAc,IAAI,iBAAiB,CAElD"}

package/dist/src/symbols/scopes.js

@@ -1,31 +0,0 @@
-import * as core from "@alloy-js/core";
-// indicates that the scope for a symbols is at the namespace level
-export class CSharpNamespaceScope extends core.OutputScope {
-  get kind() {
-    return "namespace";
-  }
-}
-
-// the kind of member scope. i.e. are we in an enum, class, etc
-
-// indicates that the scope for a symbol resides within a type
-// e.g. for an enum value, class field etc, these would have
-// member scope where the owner is the containing type.
-export class CSharpMemberScope extends core.OutputScope {
-  get kind() {
-    return "member";
-  }
-  get name() {
-    return super.name;
-  }
-  get owner() {
-    return super.owner;
-  }
-}
-
-// contains the possible scopes where a declaration can reside
-
-// returns the current C# scope
-export function useCSharpScope() {
-  return core.useScope();
-}

package/dist/test/enum.test.d.ts

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

package/dist/test/enum.test.d.ts.map

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