@alloy-js/csharp 0.18.0-dev.5 → 0.18.0-dev.7

package/dist/src/components/interface/property.test.js

@@ -0,0 +1,141 @@
+import { memo as _$memo, createComponent as _$createComponent, mergeProps as _$mergeProps } from "@alloy-js/core/jsx-runtime";
+import { describe, expect, it } from "vitest";
+import { TestNamespace } from "../../../test/utils.js";
+import { InterfaceDeclaration } from "./declaration.js";
+import { InterfaceProperty } from "./property.js";
+const Wrapper = props => _$createComponent(TestNamespace, {
+  get children() {
+    return _$createComponent(InterfaceDeclaration, {
+      "public": true,
+      name: "TestInterface",
+      get children() {
+        return props.children;
+      }
+    });
+  }
+});
+describe("modifiers", () => {
+  describe("access modifiers", () => {
+    it.each(["public", "private", "protected", "internal"])("%s", accessModifier => {
+      expect(_$createComponent(Wrapper, {
+        get children() {
+          return _$createComponent(InterfaceProperty, _$mergeProps({
+            [accessModifier]: true
+          }, {
+            name: "TestProp",
+            type: "string",
+            get: true
+          }));
+        }
+      })).toRenderTo(`
+        public interface TestInterface
+        {
+          ${accessModifier} string TestProp { get; }
+        }
+      `);
+    });
+  });
+  describe("method modifiers", () => {
+    it.each(["new"])("%s", methodModifier => {
+      expect(_$createComponent(Wrapper, {
+        get children() {
+          return _$createComponent(InterfaceProperty, _$mergeProps({
+            [methodModifier]: true
+          }, {
+            name: "TestProp",
+            type: "string",
+            get: true
+          }));
+        }
+      })).toRenderTo(`
+        public interface TestInterface
+        {
+          ${methodModifier} string TestProp { get; }
+        }
+      `);
+    });
+  });
+  it("combine modifiers", () => {
+    expect(_$createComponent(Wrapper, {
+      get children() {
+        return _$createComponent(InterfaceProperty, {
+          "public": true,
+          "new": true,
+          name: "TestProp",
+          type: "string",
+          get: true
+        });
+      }
+    })).toRenderTo(`
+        public interface TestInterface
+        {
+          public new string TestProp { get; }
+        }
+      `);
+  });
+});
+it("applies PascalCase naming policy", () => {
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(InterfaceProperty, {
+        name: "test_prop",
+        type: "string",
+        get: true
+      });
+    }
+  })).toRenderTo(`
+    public interface TestInterface
+    {
+      string TestProp { get; }
+    }
+`);
+});
+it("has getter only", () => {
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(InterfaceProperty, {
+        name: "TestProp",
+        type: "string",
+        get: true
+      });
+    }
+  })).toRenderTo(`
+    public interface TestInterface
+    {
+      string TestProp { get; }
+    }
+  `);
+});
+it("has setter only", () => {
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(InterfaceProperty, {
+        name: "TestProp",
+        type: "string",
+        set: true
+      });
+    }
+  })).toRenderTo(`
+    public interface TestInterface
+    {
+      string TestProp { set; }
+    }
+  `);
+});
+it("has getter and setter", () => {
+  expect(_$createComponent(Wrapper, {
+    get children() {
+      return _$createComponent(InterfaceProperty, {
+        name: "TestProp",
+        type: "string",
+        get: true,
+        set: true
+      });
+    }
+  })).toRenderTo(`
+    public interface TestInterface
+    {
+      string TestProp { get; set; }
+    }
+  `);
+});

package/dist/src/components/stc/index.d.ts

@@ -1,10 +1,10 @@
 import * as core from "@alloy-js/core";
 import * as base from "../index.js";
-export declare const ClassDeclaration: core.StcSignature<base.ClassProps>;
+export declare const ClassDeclaration: core.StcSignature<base.ClassDeclarationProps>;
 export declare const ClassConstructor: core.StcSignature<base.ClassConstructorProps>;
 export declare const ClassMember: core.StcSignature<base.ClassMemberProps>;
 export declare const ClassMethod: core.StcSignature<base.ClassMethodProps>;
-export declare const EnumDeclaration: core.StcSignature<base.EnumProps>;
+export declare const EnumDeclaration: core.StcSignature<base.EnumDeclarationProps>;
 export declare const EnumMember: core.StcSignature<base.EnumMemberProps>;
 export declare const Parameter: core.StcSignature<base.ParameterProps>;
 export declare const Parameters: core.StcSignature<base.ParametersProps>;

package/dist/src/components/stc/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/stc/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAEpC,eAAO,MAAM,gBAAgB,oCAAkC,CAAC;AAChE,eAAO,MAAM,gBAAgB,+CAAkC,CAAC;AAChE,eAAO,MAAM,WAAW,0CAA6B,CAAC;AACtD,eAAO,MAAM,WAAW,0CAA6B,CAAC;AACtD,eAAO,MAAM,eAAe,mCAAiC,CAAC;AAC9D,eAAO,MAAM,UAAU,yCAA4B,CAAC;AACpD,eAAO,MAAM,SAAS,wCAA2B,CAAC;AAClD,eAAO,MAAM,UAAU,yCAA4B,CAAC;AACpD,eAAO,MAAM,gBAAgB,+CAAkC,CAAC;AAChE,eAAO,MAAM,cAAc,6CAAgC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/components/stc/index.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AACvC,OAAO,KAAK,IAAI,MAAM,aAAa,CAAC;AAEpC,eAAO,MAAM,gBAAgB,+CAAkC,CAAC;AAChE,eAAO,MAAM,gBAAgB,+CAAkC,CAAC;AAChE,eAAO,MAAM,WAAW,0CAA6B,CAAC;AACtD,eAAO,MAAM,WAAW,0CAA6B,CAAC;AACtD,eAAO,MAAM,eAAe,8CAAiC,CAAC;AAC9D,eAAO,MAAM,UAAU,yCAA4B,CAAC;AACpD,eAAO,MAAM,SAAS,wCAA2B,CAAC;AAClD,eAAO,MAAM,UAAU,yCAA4B,CAAC;AACpD,eAAO,MAAM,gBAAgB,+CAAkC,CAAC;AAChE,eAAO,MAAM,cAAc,6CAAgC,CAAC"}

package/dist/src/modifiers.d.ts

@@ -6,16 +6,9 @@ export interface AccessModifiers {
     readonly internal?: boolean;
     readonly file?: boolean;
 }
-export declare function getAccessModifier(data: AccessModifiers): string;
-/** Method modifiers. Can only be one. */
-export interface MethodModifiers {
-    readonly abstract?: boolean;
-    readonly sealed?: boolean;
-    readonly static?: boolean;
-    readonly virtual?: boolean;
-}
-export declare function getMethodModifier(data: MethodModifiers): string;
+export declare const getAccessModifier: (data: AccessModifiers) => string;
 export declare function getAsyncModifier(async?: boolean): string;
 /** Resolve the modifier prefix */
 export declare function computeModifiersPrefix(modifiers: Array<string | undefined>): string;
+export declare function makeModifiers<T>(obj: Array<keyof T>): (data: T) => string;
 //# sourceMappingURL=modifiers.d.ts.map

package/dist/src/modifiers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"modifiers.d.ts","sourceRoot":"","sources":["../../src/modifiers.ts"],"names":[],"mappings":"AAGA,yBAAyB;AACzB,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAU/D;AAED,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;AAED,wBAAgB,iBAAiB,CAAC,IAAI,EAAE,eAAe,GAAG,MAAM,CAS/D;AAED,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAExD;AAED,kCAAkC;AAClC,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,GACnC,MAAM,CAGR"}
+{"version":3,"file":"modifiers.d.ts","sourceRoot":"","sources":["../../src/modifiers.ts"],"names":[],"mappings":"AAGA,yBAAyB;AACzB,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,MAAM,CAAC,EAAE,OAAO,CAAC;IAC1B,QAAQ,CAAC,SAAS,CAAC,EAAE,OAAO,CAAC;IAC7B,QAAQ,CAAC,OAAO,CAAC,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC;IAC5B,QAAQ,CAAC,IAAI,CAAC,EAAE,OAAO,CAAC;CACzB;AAED,eAAO,MAAM,iBAAiB,mCAM5B,CAAC;AAEH,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,MAAM,CAExD;AAED,kCAAkC;AAClC,wBAAgB,sBAAsB,CACpC,SAAS,EAAE,KAAK,CAAC,MAAM,GAAG,SAAS,CAAC,GACnC,MAAM,CAGR;AAED,wBAAgB,aAAa,CAAC,CAAC,EAAE,GAAG,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,IAC1C,MAAM,CAAC,YAMhB"}

package/dist/src/modifiers.js

@@ -3,15 +3,7 @@
 
 /** Access modifiers.  */
 
-export function getAccessModifier(data) {
-  return [data.public && "public", data.protected && "protected", data.private && "private", data.internal && "internal", data.file && "file"].filter(x => x).join(" ");
-}
-
-/** Method modifiers. Can only be one. */
-
-export function getMethodModifier(data) {
-  return [data.abstract && "abstract", data.sealed && "sealed", data.static && "static", data.virtual && "virtual"].filter(x => x).join(" ");
-}
+export const getAccessModifier = makeModifiers(["public", "protected", "private", "internal", "file"]);
 export function getAsyncModifier(async) {
   return async ? "async" : "";
 }
@@ -20,4 +12,9 @@ export function getAsyncModifier(async) {
 export function computeModifiersPrefix(modifiers) {
   const resolved = modifiers.filter(x => x);
   return resolved.length > 0 ? resolved.join(" ") + " " : "";
+}
+export function makeModifiers(obj) {
+  return data => {
+    return obj.map(key => data[key] ? key : undefined).filter(x => x).join(" ");
+  };
 }

package/dist/src/name-policy.d.ts

@@ -1,5 +1,5 @@
 import * as core from "@alloy-js/core";
-export type CSharpElements = "class" | "constant" | "enum" | "enum-member" | "function" | "interface" | "class-member-private" | "class-member-public" | "class-method" | "parameter" | "type-parameter";
+export type CSharpElements = "class" | "constant" | "enum" | "enum-member" | "function" | "interface" | "class-member-private" | "class-member-public" | "class-method" | "class-property" | "parameter" | "type-parameter";
 export declare function createCSharpNamePolicy(): core.NamePolicy<CSharpElements>;
 export declare function useCSharpNamePolicy(): core.NamePolicy<CSharpElements>;
 //# sourceMappingURL=name-policy.d.ts.map

package/dist/src/name-policy.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"name-policy.d.ts","sourceRoot":"","sources":["../../src/name-policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAIvC,MAAM,MAAM,cAAc,GACtB,OAAO,GACP,UAAU,GACV,MAAM,GACN,aAAa,GACb,UAAU,GACV,WAAW,GACX,sBAAsB,GACtB,qBAAqB,GACrB,cAAc,GACd,WAAW,GACX,gBAAgB,CAAC;AAGrB,wBAAgB,sBAAsB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAiBxE;AAGD,wBAAgB,mBAAmB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAErE"}
+{"version":3,"file":"name-policy.d.ts","sourceRoot":"","sources":["../../src/name-policy.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,IAAI,MAAM,gBAAgB,CAAC;AAIvC,MAAM,MAAM,cAAc,GACtB,OAAO,GACP,UAAU,GACV,MAAM,GACN,aAAa,GACb,UAAU,GACV,WAAW,GACX,sBAAsB,GACtB,qBAAqB,GACrB,cAAc,GACd,gBAAgB,GAChB,WAAW,GACX,gBAAgB,CAAC;AAGrB,wBAAgB,sBAAsB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAkBxE;AAGD,wBAAgB,mBAAmB,IAAI,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,CAErE"}

package/dist/src/name-policy.js

@@ -14,6 +14,7 @@ export function createCSharpNamePolicy() {
       case "class-member-public":
       case "class-method":
       case "type-parameter":
+      case "class-property":
         return changecase.pascalCase(name);
       case "constant":
         return changecase.constantCase(name);

package/dist/test/class.test.js

@@ -1,21 +1,63 @@
-import { createComponent as _$createComponent, createIntrinsic as _$createIntrinsic } from "@alloy-js/core/jsx-runtime";
+import { createComponent as _$createComponent, mergeProps as _$mergeProps, createIntrinsic as _$createIntrinsic } 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 { describe, expect, it } from "vitest";
 import * as csharp from "../src/index.js";
+import { ClassDeclaration } from "../src/index.js";
 import * as utils from "./utils.js";
 it("declares class with no members", () => {
-  const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
-    "public": true,
-    name: "TestClass"
-  }));
-  expect(res).toBe(coretest.d`
-    namespace TestCode
-    {
-        public class TestClass;
+  expect(_$createComponent(utils.TestNamespace, {
+    get children() {
+      return _$createComponent(ClassDeclaration, {
+        name: "TestClass"
+      });
     }
+  })).toRenderTo(`
+      class TestClass;
   `);
 });
+describe("modifiers", () => {
+  it.each(["public", "private"])("%s", mod => {
+    expect(_$createComponent(utils.TestNamespace, {
+      get children() {
+        return _$createComponent(ClassDeclaration, _$mergeProps({
+          [mod]: true
+        }, {
+          name: "TestClass"
+        }));
+      }
+    })).toRenderTo(`
+        ${mod} class TestClass;
+    `);
+  });
+  it.each(["partial", "abstract", "static", "sealed"])("%s", mod => {
+    expect(_$createComponent(utils.TestNamespace, {
+      get children() {
+        return _$createComponent(ClassDeclaration, _$mergeProps({
+          [mod]: true
+        }, {
+          name: "TestClass"
+        }));
+      }
+    })).toRenderTo(`
+        ${mod} class TestClass;
+    `);
+  });
+  it("combines modifiers", () => {
+    expect(_$createComponent(utils.TestNamespace, {
+      get children() {
+        return _$createComponent(ClassDeclaration, {
+          "public": true,
+          abstract: true,
+          partial: true,
+          name: "TestClass"
+        });
+      }
+    })).toRenderTo(`
+        public abstract partial class TestClass;
+    `);
+  });
+});
 it("declares class with some members", () => {
   const res = utils.toSourceText(_$createComponent(csharp.ClassDeclaration, {
     "public": true,