@alloy-js/csharp 0.19.0-dev.7 → 0.19.0-dev.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alloy-js/csharp",
-  "version": "0.19.0-dev.7",
+  "version": "0.19.0-dev.9",
   "description": "",
   "exports": {
     ".": {
@@ -14,7 +14,7 @@
   "author": "jhendrix@microsoft.com",
   "license": "MIT",
   "dependencies": {
-    "@alloy-js/core": "~0.18.2 || >= 0.19.0-dev.3",
+    "@alloy-js/core": "~0.18.2 || >= 0.19.0-dev.12",
     "change-case": "^5.4.4",
     "marked": "^15.0.12",
     "pathe": "^2.0.3"

package/src/components/method/method.test.tsx

@@ -146,7 +146,7 @@ it("use expression body form", () => {
     <TestNamespace>
       <ClassDeclaration name="Test">
         <Method name="Method" doc="This is a test" expression>
-          this.MyProperty.Value;
+          this.MyProperty.Value
         </Method>
       </ClassDeclaration>
     </TestNamespace>,

package/src/components/method/method.tsx

@@ -29,6 +29,9 @@ export interface MethodModifiers {
   readonly sealed?: boolean;
   readonly static?: boolean;
   readonly virtual?: boolean;
+  readonly override?: boolean;
+  readonly extern?: boolean;
+  readonly readonly?: boolean;
 }
 
 const getMethodModifier = makeModifiers<MethodModifiers>([
@@ -36,6 +39,9 @@ const getMethodModifier = makeModifiers<MethodModifiers>([
   "sealed",
   "static",
   "virtual",
+  "override",
+  "extern",
+  "readonly",
 ]);
 
 // properties for creating a method
@@ -150,12 +156,18 @@ export function Method(props: MethodProps) {
         {props.abstract ?
           ";"
         : props.expression ?
-          <>
-            {" => "}
-            {props.children}
-          </>
+          <ExpressionBody>{props.children}</ExpressionBody>
         : <Block newline>{props.children}</Block>}
       </Scope>
     </MemberDeclaration>
   );
 }
+
+const ExpressionBody = (props: { children?: Children }) => {
+  return (
+    <>
+      {" => "}
+      {props.children};
+    </>
+  );
+};

package/temp/api.json

@@ -5778,6 +5778,87 @@
                 "endIndex": 2
               }
             },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!MethodModifiers#extern:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "readonly extern?: "
+                },
+                {
+                  "kind": "Content",
+                  "text": "boolean"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": true,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "extern",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!MethodModifiers#override:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "readonly override?: "
+                },
+                {
+                  "kind": "Content",
+                  "text": "boolean"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": true,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "override",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!MethodModifiers#readonly:member",
+              "docComment": "",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "readonly readonly?: "
+                },
+                {
+                  "kind": "Content",
+                  "text": "boolean"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": true,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "readonly",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
             {
               "kind": "PropertySignature",
               "canonicalReference": "@alloy-js/csharp!MethodModifiers#sealed:member",

package/test/class-declaration.test.tsx

@@ -9,6 +9,7 @@ import { TypeParameterProps } from "../src/components/type-parameters/type-param
 import * as csharp from "../src/index.js";
 import { ClassDeclaration, Property, SourceFile } from "../src/index.js";
 import * as utils from "./utils.jsx";
+import { findFile } from "./utils.jsx";
 
 it("declares class with no members", () => {
   expect(
@@ -195,7 +196,7 @@ it("uses refkeys for members, params, and return type", () => {
     </core.Output>,
   );
 
-  expect(res.contents[0].contents).toBe(coretest.d`
+  expect(findFile(res, "Test.cs").contents).toBe(coretest.d`
     namespace TestCode
     {
         public enum TestEnum

package/test/enum.test.tsx

@@ -3,6 +3,7 @@ import * as coretest from "@alloy-js/core/testing";
 import { expect, it } from "vitest";
 import * as csharp from "../src/index.js";
 import * as utils from "./utils.js";
+import { findFile } from "./utils.js";
 
 it("declares enum with no members", () => {
   const res = utils.toSourceText(
@@ -77,7 +78,7 @@ it("can reference things by refkey", () => {
     </core.Output>,
   );
 
-  expect(res.contents[0].contents).toBe(coretest.d`
+  expect(findFile(res, "Test.cs").contents).toBe(coretest.d`
     namespace TestCode
     {
         public enum TestEnum
@@ -120,8 +121,7 @@ it("can reference things by refkey across files", () => {
     </core.Output>,
   );
 
-  expect(res.contents[0].path).toBe("Test.cs");
-  expect(res.contents[0].contents).toBe(coretest.d`
+  expect(findFile(res, "Test.cs").contents).toBe(coretest.d`
     namespace TestCode
     {
         public enum TestEnum
@@ -134,8 +134,7 @@ it("can reference things by refkey across files", () => {
     }
   `);
 
-  expect(res.contents[1].path).toBe("Other.cs");
-  expect(res.contents[1].contents).toBe(coretest.d`
+  expect(findFile(res, "Other.cs").contents).toBe(coretest.d`
     namespace TestCode
     {
         public enum OtherEnum

package/test/namespace.test.tsx

@@ -1,7 +1,8 @@
 import * as core from "@alloy-js/core";
 import * as coretest from "@alloy-js/core/testing";
-import { expect, it } from "vitest";
+import { it } from "vitest";
 import * as csharp from "../src/index.js";
+import { assertFileContents } from "./utils.jsx";
 
 it("defines multiple namespaces and source files with unique content", () => {
   const res = core.render(
@@ -25,35 +26,30 @@ it("defines multiple namespaces and source files with unique content", () => {
     </core.Output>,
   );
 
-  expect(res.contents[0].path).equals("Model1.cs");
-  expect(res.contents[0].contents).toBe(coretest.d`
-    namespace Namespace1
-    {
-        public class Model1;
-    }
-  `);
-
-  expect(res.contents[1].path).equals("Model2.cs");
-  expect(res.contents[1].contents).toBe(coretest.d`
-    namespace Namespace1
-    {
-        public class Model2;
-    }
-  `);
-
-  expect(res.contents[2].path).equals("Model3.cs");
-  expect(res.contents[2].contents).toBe(coretest.d`
-    namespace Namespace2
-    {
-        public class Model3;
-    }
-  `);
-
-  expect(res.contents[3].path).equals("Model4.cs");
-  expect(res.contents[3].contents).toBe(coretest.d`
-    namespace Namespace2
-    {
-        public class Model4;
-    }
-  `);
+  assertFileContents(res, {
+    "Model1.cs": coretest.d`
+      namespace Namespace1
+      {
+          public class Model1;
+      }
+    `,
+    "Model2.cs": coretest.d`
+      namespace Namespace1
+      {
+          public class Model2;
+      }
+    `,
+    "Model3.cs": coretest.d`
+      namespace Namespace2
+      {
+          public class Model3;
+      }
+    `,
+    "Model4.cs": coretest.d`
+      namespace Namespace2
+      {
+          public class Model4;
+      }
+    `,
+  });
 });

package/test/project-directory.test.tsx

@@ -30,7 +30,8 @@ it("defines a project directory file with multiple source files", () => {
   expect(projDir.contents[0].path).equals(
     "~/projects/TestProject/TestProject.csproj",
   );
-  expect(projDir.contents[0].contents).toBe(coretest.d`
+  expect((projDir.contents[0] as core.ContentOutputFile).contents)
+    .toBe(coretest.d`
     <Project Sdk="Microsoft.NET.Sdk">
       <PropertyGroup>
         <Version>0.1.0</Version>
@@ -43,7 +44,8 @@ it("defines a project directory file with multiple source files", () => {
   const srcDir = projDir.contents[1] as core.OutputDirectory;
 
   expect(srcDir.contents[0].path).equals("~/projects/TestProject/src/Test1.cs");
-  expect(srcDir.contents[0].contents).toBe(coretest.d`
+  expect((srcDir.contents[0] as core.ContentOutputFile).contents)
+    .toBe(coretest.d`
     namespace TestCode
     {
         public class TestClass1;
@@ -51,7 +53,8 @@ it("defines a project directory file with multiple source files", () => {
   `);
 
   expect(srcDir.contents[1].path).equals("~/projects/TestProject/src/Test2.cs");
-  expect(srcDir.contents[1].contents).toBe(coretest.d`
+  expect((srcDir.contents[1] as core.ContentOutputFile).contents)
+    .toBe(coretest.d`
     namespace TestCode
     {
         public class TestClass2;
@@ -87,7 +90,8 @@ it("defines a project directory file with multiple source files and a custom TFM
   expect(projDir.contents[0].path).equals(
     "~/projects/TestProject/TestProject.csproj",
   );
-  expect(projDir.contents[0].contents).toBe(coretest.d`
+  expect((projDir.contents[0] as core.ContentOutputFile).contents)
+    .toBe(coretest.d`
     <Project Sdk="Microsoft.NET.Sdk">
       <PropertyGroup>
         <Version>0.1.0</Version>
@@ -100,7 +104,8 @@ it("defines a project directory file with multiple source files and a custom TFM
   const srcDir = projDir.contents[1] as core.OutputDirectory;
 
   expect(srcDir.contents[0].path).equals("~/projects/TestProject/src/Test1.cs");
-  expect(srcDir.contents[0].contents).toBe(coretest.d`
+  expect((srcDir.contents[0] as core.ContentOutputFile).contents)
+    .toBe(coretest.d`
     namespace TestCode
     {
         public class TestClass1;
@@ -108,7 +113,8 @@ it("defines a project directory file with multiple source files and a custom TFM
   `);
 
   expect(srcDir.contents[1].path).equals("~/projects/TestProject/src/Test2.cs");
-  expect(srcDir.contents[1].contents).toBe(coretest.d`
+  expect((srcDir.contents[1] as core.ContentOutputFile).contents)
+    .toBe(coretest.d`
     namespace TestCode
     {
         public class TestClass2;

package/test/sourcefile.test.tsx

@@ -2,6 +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 } from "./utils.jsx";
 
 it("defines multiple source files with unique content", () => {
   const res = core.render(
@@ -17,21 +18,20 @@ it("defines multiple source files with unique content", () => {
     </core.Output>,
   );
 
-  expect(res.contents[0].path).equals("Test1.cs");
-  expect(res.contents[0].contents).toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass1;
-    }
-  `);
-
-  expect(res.contents[1].path).equals("Test2.cs");
-  expect(res.contents[1].contents).toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass2;
-    }
-  `);
+  assertFileContents(res, {
+    "Test1.cs": coretest.d`
+      namespace TestCode
+      {
+          public class TestClass1;
+      }
+    `,
+    "Test2.cs": coretest.d`
+      namespace TestCode
+      {
+          public class TestClass2;
+      }
+    `,
+  });
 });
 
 it("throws when declaring a source file outside a namespace", () => {

package/test/using.test.tsx

@@ -2,6 +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";
 
 it("uses a single namespace", () => {
   const res = core.render(
@@ -12,7 +13,7 @@ it("uses a single namespace", () => {
     </core.Output>,
   );
 
-  expect(res.contents[0].contents).toBe(coretest.d`
+  expect(findFile(res, "Test1.cs").contents).toBe(coretest.d`
     using Foo;
 
     namespace TestCode {}
@@ -28,7 +29,7 @@ it("uses multiple namespaces", () => {
     </core.Output>,
   );
 
-  expect(res.contents[0].contents).toBe(coretest.d`
+  expect(findFile(res, "Test1.cs").contents).toBe(coretest.d`
     using Bar.Baz;
     using Foo;
 
@@ -87,30 +88,31 @@ it("adds using statement across namespaces", () => {
     </core.Output>,
   );
 
-  expect(res.contents[0].contents).toBe(coretest.d`
-    namespace Models
-    {
-        public class Input;
-        public class Output;
-        public enum TestEnum
-        {
-            One,
-            Two
-        }
-    }
-  `);
-
-  expect(res.contents[1].contents).toBe(coretest.d`
-    using Models;
-    using System;
+  assertFileContents(res, {
+    "Models.cs": coretest.d`
+      namespace Models
+      {
+          public class Input;
+          public class Output;
+          public enum TestEnum
+          {
+              One,
+              Two
+          }
+      }
+    `,
+    "Client.cs": coretest.d`
+      using Models;
+      using System;
 
-    namespace Client
-    {
-        public class Client
-        {
-            public Output MethodOne(Input bodyParam) {}
-        }
-        TestEnum.Two;
-    }
-  `);
+      namespace Client
+      {
+          public class Client
+          {
+              public Output MethodOne(Input bodyParam) {}
+          }
+          TestEnum.Two;
+      }
+    `,
+  });
 });

package/test/utils.tsx

@@ -36,13 +36,13 @@ export function testRender(c: core.Children): core.OutputDirectory {
 export function findFile(
   res: core.OutputDirectory,
   path: string,
-): core.OutputFile {
+): core.ContentOutputFile {
   const result = findFileWorker(res, path);
 
   if (!result) {
     throw new Error("Expected to find file " + path);
   }
-  return result;
+  return result as core.ContentOutputFile;
 
   function findFileWorker(
     res: core.OutputDirectory,