@alloy-js/csharp 0.21.0-dev.18 → 0.21.0-dev.19

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alloy-js/csharp",
-  "version": "0.21.0-dev.18",
+  "version": "0.21.0-dev.19",
   "description": "Alloy components for CSharp language.",
   "exports": {
     ".": {

package/src/components/access-expression/access-expression.tsx

@@ -122,6 +122,12 @@ export interface AccessExpressionPartProps {
    * you provide a symbol or refkey and the symbol's nullable flag is set.
    */
   nullable?: boolean;
+
+  /**
+   * Wether this part is an attribute reference (used in an attribute context).
+   * In that case the "Attribute" suffix is trimmed from the name if present.
+   */
+  attribute?: boolean;
 }
 
 AccessExpression.Part = function (props: AccessExpressionPartProps) {

package/src/components/access-expression/part-descriptors.ts

@@ -128,9 +128,12 @@ function createPartDescriptorFromProps(
       } else if (first && partProps.refkey) {
         return partProps.refkey;
       } else if (partProps.id !== undefined) {
-        return partProps.id;
+        return normalizeIfAttribute(partProps.id, partProps.attribute);
       } else if (symbolSource.value) {
-        return escapeId(symbolSource.value.name);
+        return normalizeIfAttribute(
+          escapeId(symbolSource.value.name),
+          partProps.attribute,
+        );
       } else {
         return "<unresolved symbol>";
       }
@@ -173,3 +176,24 @@ function createPartDescriptorFromProps(
 function escapeId(id: string) {
   return id.replace(/"/g, '\\"');
 }
+
+function normalizeIfAttribute(id: string, isAttribute?: boolean) {
+  if (isAttribute) {
+    return normalizeAttributeName(id);
+  }
+  return id;
+}
+
+/**
+ * Normalize attribute name by removing the "Attribute" suffix if present.
+ * @example
+ * ```ts
+ * normalizeAttributeName("TestAttribute") // returns "Test"
+ * ```
+ */
+export function normalizeAttributeName(name: string) {
+  if (name !== undefined && name.endsWith("Attribute")) {
+    return name.substring(0, name.length - "Attribute".length);
+  }
+  return name;
+}

package/src/components/attributes/attributes.test.tsx

@@ -1,5 +1,8 @@
-import { namekey } from "@alloy-js/core";
-import { expect, it } from "vitest";
+import { ClassDeclaration } from "#components/class/declaration.jsx";
+import { createLibrary } from "#createLibrary";
+import { TestNamespace } from "#test/utils.jsx";
+import { List, namekey } from "@alloy-js/core";
+import { describe, expect, it } from "vitest";
 import { Attribute, AttributeList } from "./attributes.jsx";
 
 it("define attribute", () => {
@@ -8,13 +11,42 @@ it("define attribute", () => {
   `);
 });
 
-it("define attribute whose name ending with 'Attribute'", () => {
-  expect(<Attribute name="TestAttribute" />).toRenderTo(`
+describe("Attribute suffix trimming", () => {
+  it("define attribute whose name ending with 'Attribute'", () => {
+    expect(<Attribute name="TestAttribute" />).toRenderTo(`
       [Test]
-  `);
-  expect(<Attribute name={namekey("TestAttribute")} />).toRenderTo(`
+    `);
+  });
+
+  it("when using namekey", () => {
+    const key = namekey("TestAttribute");
+    expect(
+      <TestNamespace>
+        <List>
+          <Attribute name={key} />
+          <ClassDeclaration name={key} />
+        </List>
+      </TestNamespace>,
+    ).toRenderTo(`
       [Test]
-  `);
+      class TestAttribute;
+    `);
+  });
+
+  it("when referenced from library", () => {
+    const TestLib = createLibrary("TestLib", {
+      TestAttribute: { kind: "method", methodKind: "ordinary" },
+    });
+    expect(
+      <TestNamespace>
+        <Attribute name={TestLib.TestAttribute} />
+      </TestNamespace>,
+    ).toRenderTo(`
+      using TestLib;
+      
+      [Test]
+    `);
+  });
 });
 
 it("define attribute with single arg", () => {

package/src/components/attributes/attributes.tsx

@@ -1,16 +1,13 @@
+import { normalizeAttributeName } from "#components/access-expression/part-descriptors.js";
 import {
   Children,
   findKeyedChildren,
   For,
   Indent,
-  Refkey,
+  Refkeyable,
   taggedComponent,
 } from "@alloy-js/core";
-
-export interface AttributeItem {
-  name: string;
-  args?: string[];
-}
+import { ReferenceContext } from "../../contexts/reference-context.js";
 
 export type AttributesProp = Array<string | AttributeProps | Children>;
 
@@ -55,7 +52,7 @@ function renderAttribute(attr: string | AttributeProps | Children): Children {
 
 export interface AttributeProps {
   /** Attribute name */
-  name: string | Refkey;
+  name: string | Refkeyable;
 
   /** Argument */
   args?: Children[];
@@ -82,7 +79,8 @@ export const Attribute = taggedComponent(
   (props: AttributeProps) => {
     return (
       <group>
-        [{normalizeAttributeName(props.name)}
+        [
+        <AttributeName name={props.name} />
         {props.args && props.args.length > 0 && (
           <>
             (
@@ -100,14 +98,10 @@ export const Attribute = taggedComponent(
   },
 );
 
-function normalizeAttributeName(name: string | Refkey) {
-  const nameStr =
-    typeof name === "string" ? name
-    : typeof name === "object" && "name" in name ? name.name
-    : undefined;
-
-  if (nameStr !== undefined && nameStr.endsWith("Attribute")) {
-    return nameStr.substring(0, nameStr.length - "Attribute".length);
-  }
-  return name;
+function AttributeName(props: Pick<AttributeProps, "name">) {
+  return typeof props.name === "string" ?
+      normalizeAttributeName(props.name)
+    : <ReferenceContext.Provider value={"attribute"}>
+        {props.name}
+      </ReferenceContext.Provider>;
 }

package/src/contexts/reference-context.ts

@@ -0,0 +1,18 @@
+import { ComponentContext, createContext, useContext } from "@alloy-js/core";
+
+/** What kind of reference.
+ * - 'standard' Default reference nothing special.
+ * - 'attribute' means we are referencing an attribute and so the name should be trimmed of "Attribute" suffix.
+ */
+
+export type ReferenceContext = "standard" | "attribute";
+
+/**
+ * Provides scopes for instance and static private members.
+ */
+export const ReferenceContext: ComponentContext<ReferenceContext> =
+  createContext<ReferenceContext>();
+
+export function useReferenceContext(): "standard" | "attribute" {
+  return useContext(ReferenceContext) ?? "standard";
+}

package/src/symbols/reference.tsx

@@ -7,6 +7,7 @@ import {
   resolve,
   unresolvedRefkey,
 } from "@alloy-js/core";
+import { useReferenceContext } from "../contexts/reference-context.js";
 import { CSharpScope } from "../scopes/csharp.js";
 import { CSharpNamespaceScope } from "../scopes/namespace.js";
 import { useSourceFileScope } from "../scopes/source-file.js";
@@ -56,12 +57,19 @@ export function ref(
     }
 
     const parts = [];
+    const referenceContext = useReferenceContext();
 
     for (const nsScope of pathDown) {
       parts.push(<AccessExpression.Part symbol={nsScope.ownerSymbol!} />);
     }
 
-    parts.push(<AccessExpression.Part symbol={lexicalDeclaration} />);
+    parts.push(
+      <AccessExpression.Part
+        symbol={lexicalDeclaration}
+        attribute={referenceContext === "attribute"}
+      />,
+    );
+
     for (const member of memberPath) {
       parts.push(<AccessExpression.Part symbol={member} />);
     }

package/temp/api.json

@@ -995,6 +995,33 @@
                 "endIndex": 4
               }
             },
+            {
+              "kind": "PropertySignature",
+              "canonicalReference": "@alloy-js/csharp!AccessExpressionPartProps#attribute:member",
+              "docComment": "/**\n * Wether this part is an attribute reference (used in an attribute context).\n * In that case the \"Attribute\" suffix is trimmed from the name if present.\n */\n",
+              "excerptTokens": [
+                {
+                  "kind": "Content",
+                  "text": "attribute?: "
+                },
+                {
+                  "kind": "Content",
+                  "text": "boolean"
+                },
+                {
+                  "kind": "Content",
+                  "text": ";"
+                }
+              ],
+              "isReadonly": false,
+              "isOptional": true,
+              "releaseTag": "Public",
+              "name": "attribute",
+              "propertyTypeTokenRange": {
+                "startIndex": 1,
+                "endIndex": 2
+              }
+            },
             {
               "kind": "PropertySignature",
               "canonicalReference": "@alloy-js/csharp!AccessExpressionPartProps#children:member",
@@ -1577,78 +1604,6 @@
             "endIndex": 14
           }
         },
-        {
-          "kind": "Interface",
-          "canonicalReference": "@alloy-js/csharp!AttributeItem:interface",
-          "docComment": "",
-          "excerptTokens": [
-            {
-              "kind": "Content",
-              "text": "export interface AttributeItem "
-            }
-          ],
-          "fileUrlPath": "src/components/attributes/attributes.tsx",
-          "releaseTag": "Public",
-          "name": "AttributeItem",
-          "preserveMemberOrder": false,
-          "members": [
-            {
-              "kind": "PropertySignature",
-              "canonicalReference": "@alloy-js/csharp!AttributeItem#args:member",
-              "docComment": "",
-              "excerptTokens": [
-                {
-                  "kind": "Content",
-                  "text": "args?: "
-                },
-                {
-                  "kind": "Content",
-                  "text": "string[]"
-                },
-                {
-                  "kind": "Content",
-                  "text": ";"
-                }
-              ],
-              "isReadonly": false,
-              "isOptional": true,
-              "releaseTag": "Public",
-              "name": "args",
-              "propertyTypeTokenRange": {
-                "startIndex": 1,
-                "endIndex": 2
-              }
-            },
-            {
-              "kind": "PropertySignature",
-              "canonicalReference": "@alloy-js/csharp!AttributeItem#name:member",
-              "docComment": "",
-              "excerptTokens": [
-                {
-                  "kind": "Content",
-                  "text": "name: "
-                },
-                {
-                  "kind": "Content",
-                  "text": "string"
-                },
-                {
-                  "kind": "Content",
-                  "text": ";"
-                }
-              ],
-              "isReadonly": false,
-              "isOptional": false,
-              "releaseTag": "Public",
-              "name": "name",
-              "propertyTypeTokenRange": {
-                "startIndex": 1,
-                "endIndex": 2
-              }
-            }
-          ],
-          "extendsTokenRanges": []
-        },
         {
           "kind": "Function",
           "canonicalReference": "@alloy-js/csharp!AttributeList:function(1)",
@@ -1863,8 +1818,8 @@
                 },
                 {
                   "kind": "Reference",
-                  "text": "Refkey",
-                  "canonicalReference": "@alloy-js/core!Refkey:type"
+                  "text": "Refkeyable",
+                  "canonicalReference": "@alloy-js/core!Refkeyable:type"
                 },
                 {
                   "kind": "Content",