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

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

@@ -9,6 +9,9 @@ export interface MethodModifiers {
     readonly sealed?: boolean;
     readonly static?: boolean;
     readonly virtual?: boolean;
+    readonly override?: boolean;
+    readonly extern?: boolean;
+    readonly readonly?: boolean;
 }
 export interface MethodProps extends AccessModifiers, MethodModifiers {
     name: string;

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

@@ -1 +1 @@
-{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../src/components/method/method.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAKhB,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,yCAAyC;AACzC,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;CAC5B;AAUD,MAAM,WAAW,WAAY,SAAQ,eAAe,EAAE,eAAe;IACnE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;IAEjD;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAGD,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,YAuDxC"}
+{"version":3,"file":"method.d.ts","sourceRoot":"","sources":["../../../../src/components/method/method.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,QAAQ,EAGR,MAAM,EAEP,MAAM,gBAAgB,CAAC;AACxB,OAAO,EACL,eAAe,EAKhB,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,yCAAyC;AACzC,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;CAC7B;AAaD,MAAM,WAAW,WAAY,SAAQ,eAAe,EAAE,eAAe;IACnE,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,QAAQ,CAAC;IACpB,UAAU,CAAC,EAAE,KAAK,CAAC,cAAc,CAAC,CAAC;IACnC,OAAO,CAAC,EAAE,QAAQ,CAAC;IAEnB;;OAEG;IACH,KAAK,CAAC,EAAE,OAAO,CAAC;IAEhB,kBAAkB;IAClB,GAAG,CAAC,EAAE,QAAQ,CAAC;IAEf;;;;;;;;;;;OAWG;IACH,cAAc,CAAC,EAAE,CAAC,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC;IAEjD;;;;;;;;;;;;;;;OAeG;IACH,UAAU,CAAC,EAAE,cAAc,CAAC;IAE5B;;;;;;;;;;;;OAYG;IACH,UAAU,CAAC,EAAE,OAAO,CAAC;CACtB;AAGD,wBAAgB,MAAM,CAAC,KAAK,EAAE,WAAW,YAoDxC"}

package/dist/src/components/method/method.js

@@ -12,7 +12,7 @@ import { TypeParameters } from "../type-parameters/type-parameters.js";
 
 /** Method modifiers. Can only be one. */
 
-const getMethodModifier = makeModifiers(["abstract", "sealed", "static", "virtual"]);
+const getMethodModifier = makeModifiers(["abstract", "sealed", "static", "virtual", "override", "extern", "readonly"]);
 
 // properties for creating a method
 
@@ -62,7 +62,11 @@ export function Method(props) {
             get parameters() {
               return props.typeParameters;
             }
-          })), _$memo(() => _$memo(() => !!props.abstract)() ? ";" : _$memo(() => !!props.expression)() ? [" => ", _$memo(() => props.children)] : _$createComponent(Block, {
+          })), _$memo(() => _$memo(() => !!props.abstract)() ? ";" : _$memo(() => !!props.expression)() ? _$createComponent(ExpressionBody, {
+            get children() {
+              return props.children;
+            }
+          }) : _$createComponent(Block, {
             newline: true,
             get children() {
               return props.children;
@@ -72,4 +76,7 @@ export function Method(props) {
       });
     }
   });
-}
+}
+const ExpressionBody = props => {
+  return [" => ", _$memo(() => props.children), ";"];
+};

package/dist/src/components/method/method.test.js

@@ -169,7 +169,7 @@ it("use expression body form", () => {
             name: "Method",
             doc: "This is a test",
             expression: true,
-            children: "this.MyProperty.Value;"
+            children: "this.MyProperty.Value"
           });
         }
       });

package/dist/test/class-declaration.test.js

@@ -9,6 +9,7 @@ import { Constructor } from "../src/components/stc/index.js";
 import * as csharp from "../src/index.js";
 import { ClassDeclaration, Property, SourceFile } from "../src/index.js";
 import * as utils from "./utils.js";
+import { findFile } from "./utils.js";
 it("declares class with no members", () => {
   expect(_$createComponent(utils.TestNamespace, {
     get children() {
@@ -234,7 +235,7 @@ it("uses refkeys for members, params, and return type", () => {
       });
     }
   }));
-  expect(res.contents[0].contents).toBe(coretest.d`
+  expect(findFile(res, "Test.cs").contents).toBe(coretest.d`
     namespace TestCode
     {
         public enum TestEnum

package/dist/test/enum.test.js

@@ -4,6 +4,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(_$createComponent(csharp.EnumDeclaration, {
     "public": true,
@@ -92,7 +93,7 @@ it("can reference things by refkey", () => {
       });
     }
   }));
-  expect(res.contents[0].contents).toBe(coretest.d`
+  expect(findFile(res, "Test.cs").contents).toBe(coretest.d`
     namespace TestCode
     {
         public enum TestEnum
@@ -150,8 +151,7 @@ it("can reference things by refkey across files", () => {
       });
     }
   }));
-  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
@@ -163,8 +163,7 @@ it("can reference things by refkey across files", () => {
         OtherEnum.Bar;
     }
   `);
-  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/dist/test/namespace.test.js

@@ -1,8 +1,9 @@
 import { createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
 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.js";
 it("defines multiple namespaces and source files with unique content", () => {
   const res = core.render(_$createComponent(core.Output, {
     get children() {
@@ -51,32 +52,30 @@ it("defines multiple namespaces and source files with unique content", () => {
       })];
     }
   }));
-  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/dist/test/sourcefile.test.js

@@ -3,6 +3,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.js";
 it("defines multiple source files with unique content", () => {
   const res = core.render(_$createComponent(core.Output, {
     get children() {
@@ -30,20 +31,20 @@ it("defines multiple source files with unique content", () => {
       });
     }
   }));
-  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", () => {
   const decl = _$createComponent(core.Output, {

package/dist/test/using.test.js

@@ -3,6 +3,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.js";
 it("uses a single namespace", () => {
   const res = core.render(_$createComponent(core.Output, {
     get children() {
@@ -17,7 +18,7 @@ it("uses a single namespace", () => {
       });
     }
   }));
-  expect(res.contents[0].contents).toBe(coretest.d`
+  expect(findFile(res, "Test1.cs").contents).toBe(coretest.d`
     using Foo;
 
     namespace TestCode {}
@@ -37,7 +38,7 @@ it("uses multiple namespaces", () => {
       });
     }
   }));
-  expect(res.contents[0].contents).toBe(coretest.d`
+  expect(findFile(res, "Test1.cs").contents).toBe(coretest.d`
     using Bar.Baz;
     using Foo;
 
@@ -111,29 +112,31 @@ it("adds using statement across namespaces", () => {
       })];
     }
   }));
-  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/dist/test/utils.d.ts

@@ -4,6 +4,6 @@ export declare function TestNamespace(props: {
 }): core.Children;
 export declare function toSourceText(c: core.Children): string;
 export declare function testRender(c: core.Children): core.OutputDirectory;
-export declare function findFile(res: core.OutputDirectory, path: string): core.OutputFile;
+export declare function findFile(res: core.OutputDirectory, path: string): core.ContentOutputFile;
 export declare function assertFileContents(res: core.OutputDirectory, expectedFiles: Record<string, string>): void;
 //# sourceMappingURL=utils.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../test/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAKvC,wBAAgB,aAAa,CAAC,KAAK,EAAE;IACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC;CACzB,GAAG,IAAI,CAAC,QAAQ,CAMhB;AACD,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,MAAM,CAWrD;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,CAMjE;AAED,wBAAgB,QAAQ,CACtB,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,IAAI,EAAE,MAAM,GACX,IAAI,CAAC,UAAU,CA2BjB;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,IAAI,CAKN"}
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../test/utils.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAKvC,wBAAgB,aAAa,CAAC,KAAK,EAAE;IACnC,QAAQ,EAAE,IAAI,CAAC,QAAQ,CAAC;CACzB,GAAG,IAAI,CAAC,QAAQ,CAMhB;AACD,wBAAgB,YAAY,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,MAAM,CAWrD;AAED,wBAAgB,UAAU,CAAC,CAAC,EAAE,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,eAAe,CAMjE;AAED,wBAAgB,QAAQ,CACtB,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,IAAI,EAAE,MAAM,GACX,IAAI,CAAC,iBAAiB,CA2BxB;AAED,wBAAgB,kBAAkB,CAChC,GAAG,EAAE,IAAI,CAAC,eAAe,EACzB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,GACpC,IAAI,CAKN"}