@alloy-js/python 0.2.0-dev.0 → 0.2.0-dev.1

package/src/components/EnumDeclaration.tsx

@@ -7,7 +7,7 @@ import {
 import { enumModule } from "../builtins/python.js";
 import { createPythonSymbol } from "../symbol-creation.js";
 import { BaseDeclarationProps } from "./Declaration.js";
-import { EnumMember } from "./EnumMember.js";
+import { EnumMember, EnumMemberProps } from "./EnumMember.js";
 import { SimpleCommentBlock } from "./index.js";
 import { MemberScope } from "./MemberScope.jsx";
 import { PythonBlock } from "./PythonBlock.jsx";
@@ -21,12 +21,7 @@ export interface EnumProps extends BaseDeclarationProps {
   /**
    * Members of the enum as an array of objects.
    */
-  members?: Array<{
-    name: string;
-    value?: Children;
-    jsValue?: string | number;
-    doc?: string;
-  }>;
+  members?: Array<EnumMemberProps>;
   /**
    * The enum style: 'classic' (default), 'auto', or 'functional'.
    */
@@ -226,13 +221,7 @@ export function ClassEnumDeclaration(props: EnumProps) {
     },
     "enum",
   );
-  let memberList: Array<{
-    name: string;
-    value?: Children;
-    jsValue?: string | number;
-    auto?: boolean;
-    doc?: string;
-  }> = (props.members ?? []).map((m) =>
+  let memberList: Array<EnumMemberProps> = (props.members ?? []).map((m) =>
     m.value === undefined ? { ...m, auto: false } : m,
   );
   if (props.style === "auto") {

package/src/components/EnumMember.tsx

@@ -1,4 +1,4 @@
-import { Children, Refkey, Show } from "@alloy-js/core";
+import { Children, Namekey, Refkey, Show } from "@alloy-js/core";
 import { enumModule } from "../builtins/python.js";
 import { createPythonSymbol } from "../symbol-creation.js";
 import { PythonOutputSymbol } from "../symbols/index.js";
@@ -9,7 +9,7 @@ export interface EnumMemberProps {
   /**
    * The name of the enum member.
    */
-  name: string;
+  name: string | Namekey;
 
   /**
    * Refkey for the enum member symbol. If the refkey is not provided, a symbol

package/src/components/FunctionDeclaration.tsx

@@ -1,10 +1,10 @@
-import { emitSymbol, Name, Show } from "@alloy-js/core";
+import { emitSymbol, Name, namekey, Show } from "@alloy-js/core";
 import { createPythonSymbol } from "../symbol-creation.js";
 import { getCallSignatureProps } from "../utils.js";
 import { CallSignature, CallSignatureProps } from "./CallSignature.jsx";
 import { BaseDeclarationProps, Declaration } from "./Declaration.js";
 import { PythonBlock } from "./PythonBlock.jsx";
-import { LexicalScope, NoNamePolicy } from "./index.js";
+import { LexicalScope } from "./index.js";
 
 export interface FunctionDeclarationProps
   extends BaseDeclarationProps,
@@ -91,13 +91,11 @@ export interface InitFunctionDeclarationProps
  */
 export function InitFunctionDeclaration(props: InitFunctionDeclarationProps) {
   return (
-    <NoNamePolicy>
-      <FunctionDeclaration
-        {...props}
-        name="__init__"
-        instanceFunction={true}
-        classFunction={false}
-      />
-    </NoNamePolicy>
+    <FunctionDeclaration
+      {...props}
+      name={namekey("__init__", { ignoreNamePolicy: true })}
+      instanceFunction={true}
+      classFunction={false}
+    />
   );
 }

package/src/components/index.ts

@@ -11,7 +11,6 @@ export * from "./ImportStatement.js";
 export * from "./LexicalScope.js";
 export * from "./MemberExpression.js";
 export * from "./MemberScope.jsx";
-export * from "./NoNamePolicy.js";
 export * from "./PyDoc.js";
 export * from "./PythonBlock.js";
 export * from "./Reference.js";

package/src/parameter-descriptor.ts

@@ -1,4 +1,4 @@
-import type { Children, Refkey } from "@alloy-js/core";
+import type { Children, Namekey, Refkey } from "@alloy-js/core";
 
 /**
  * Information for a Python function parameter.
@@ -7,7 +7,7 @@ export interface ParameterDescriptor {
   /**
    * The name of the parameter.
    */
-  readonly name: string;
+  readonly name: string | Namekey;
 
   /**
    * The type of the parameter.

package/src/symbol-creation.ts

@@ -1,4 +1,5 @@
 import {
+  Namekey,
   OutputScopeOptions,
   OutputSpace,
   useBinder,
@@ -21,19 +22,11 @@ interface CreatePythonSymbolOptions extends PythonOutputSymbolOptions {
  * Creates a symbol for a python declaration in the current scope.
  */
 export function createPythonSymbol(
-  name: string,
+  name: string | Namekey,
   options: CreatePythonSymbolOptions = {},
   kind?: PythonElements,
 ): PythonOutputSymbol {
-  let processedName = name;
   const sfContext = useContext(PythonSourceFileContext);
-  // Only apply the name policy if a kind is provided and name policy context is available
-  if (kind) {
-    const namePolicy = usePythonNamePolicy();
-    if (namePolicy) {
-      processedName = namePolicy.getName(name, kind);
-    }
-  }
   const currentScope = usePythonScope();
   let targetSpace = options.space ?? undefined;
   if (!options.space && currentScope) {
@@ -55,13 +48,14 @@ export function createPythonSymbol(
 
   const binder = options.binder ?? currentScope?.binder ?? useBinder();
 
-  return new PythonOutputSymbol(processedName, targetSpace, {
+  return new PythonOutputSymbol(name, targetSpace, {
     binder: binder,
     aliasTarget: options.aliasTarget,
     refkeys: options.refkeys,
     metadata: options.metadata,
     module: sfContext?.module,
     type: options.type,
+    namePolicy: usePythonNamePolicy().for(kind),
   });
 }
 

package/src/symbols/python-output-symbol.ts

@@ -1,4 +1,9 @@
-import { OutputSpace, OutputSymbol, OutputSymbolOptions } from "@alloy-js/core";
+import {
+  Namekey,
+  OutputSpace,
+  OutputSymbol,
+  OutputSymbolOptions,
+} from "@alloy-js/core";
 
 export interface PythonOutputSymbolOptions extends OutputSymbolOptions {
   module?: string;
@@ -16,7 +21,7 @@ export class PythonOutputSymbol extends OutputSymbol {
   static readonly memberSpaces = ["static", "instance"] as const;
 
   constructor(
-    name: string,
+    name: string | Namekey,
     spaces: OutputSpace[] | OutputSpace | undefined,
     options: PythonOutputSymbolOptions,
   ) {

package/temp/api.json

@@ -345,7 +345,12 @@
                 },
                 {
                   "kind": "Content",
-                  "text": "string"
+                  "text": "string | "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Namekey",
+                  "canonicalReference": "@alloy-js/core!Namekey:interface"
                 },
                 {
                   "kind": "Content",
@@ -358,7 +363,7 @@
               "name": "name",
               "propertyTypeTokenRange": {
                 "startIndex": 1,
-                "endIndex": 2
+                "endIndex": 3
               }
             },
             {
@@ -1546,7 +1551,7 @@
         {
           "kind": "Function",
           "canonicalReference": "@alloy-js/python!Declaration:function(1)",
-          "docComment": "/**\n * A Python declaration, which can be a class, function, variable, etc.\n *\n * @remarks\n *\n *\n * This component is used to create a declaration with a symbol that can be\n * referenced in the code. It can also be used to create a member scope for\n * member containers.\n *\n */\n",
+          "docComment": "/**\n * A Python declaration, which can be a class, function, variable, etc.\n *\n * @remarks\n *\n *\n * This component is used to create a declaration with a symbol that can be\n * referenced in the code.\n */\n",
           "excerptTokens": [
             {
               "kind": "Content",
@@ -1638,7 +1643,12 @@
                 },
                 {
                   "kind": "Content",
-                  "text": "string"
+                  "text": "string | "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Namekey",
+                  "canonicalReference": "@alloy-js/core!Namekey:interface"
                 },
                 {
                   "kind": "Content",
@@ -1651,7 +1661,7 @@
               "name": "name",
               "propertyTypeTokenRange": {
                 "startIndex": 1,
-                "endIndex": 2
+                "endIndex": 3
               }
             },
             {
@@ -1947,7 +1957,12 @@
                 },
                 {
                   "kind": "Content",
-                  "text": "string"
+                  "text": "string | "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Namekey",
+                  "canonicalReference": "@alloy-js/core!Namekey:interface"
                 },
                 {
                   "kind": "Content",
@@ -1960,7 +1975,7 @@
               "name": "name",
               "propertyTypeTokenRange": {
                 "startIndex": 1,
-                "endIndex": 2
+                "endIndex": 3
               }
             },
             {
@@ -2154,16 +2169,16 @@
                 },
                 {
                   "kind": "Content",
-                  "text": "<{\n        name: string;\n        value?: "
+                  "text": "<"
                 },
                 {
                   "kind": "Reference",
-                  "text": "Children",
-                  "canonicalReference": "@alloy-js/core!Children:type"
+                  "text": "EnumMemberProps",
+                  "canonicalReference": "@alloy-js/python!EnumMemberProps:interface"
                 },
                 {
                   "kind": "Content",
-                  "text": ";\n        jsValue?: string | number;\n        doc?: string;\n    }>"
+                  "text": ">"
                 },
                 {
                   "kind": "Content",
@@ -4975,99 +4990,6 @@
             "endIndex": 6
           }
         },
-        {
-          "kind": "Function",
-          "canonicalReference": "@alloy-js/python!NoNamePolicy:function(1)",
-          "docComment": "/**\n * A wrapper component that disables name policy transformation for its children.\n *\n * This is useful for components that need to preserve exact names without applying\n * naming conventions, such as Python dunder methods like `__init__`, `__str__`, etc.\n *\n * @example\n * ```tsx\n * <NoNamePolicy>\n *   <FunctionDeclaration name=\"__init__\" instanceFunction>\n *     // Function content\n *   </FunctionDeclaration>\n * </NoNamePolicy>\n * ```\n *\n *\n * This ensures `__init__` stays as `__init__` without name policy transformation.\n */\n",
-          "excerptTokens": [
-            {
-              "kind": "Content",
-              "text": "export declare function NoNamePolicy(props: "
-            },
-            {
-              "kind": "Reference",
-              "text": "NoNamePolicyProps",
-              "canonicalReference": "@alloy-js/python!NoNamePolicyProps:interface"
-            },
-            {
-              "kind": "Content",
-              "text": "): "
-            },
-            {
-              "kind": "Reference",
-              "text": "Children",
-              "canonicalReference": "@alloy-js/core!Children:type"
-            },
-            {
-              "kind": "Content",
-              "text": ";"
-            }
-          ],
-          "fileUrlPath": "src/components/NoNamePolicy.tsx",
-          "returnTypeTokenRange": {
-            "startIndex": 3,
-            "endIndex": 4
-          },
-          "releaseTag": "Public",
-          "overloadIndex": 1,
-          "parameters": [
-            {
-              "parameterName": "props",
-              "parameterTypeTokenRange": {
-                "startIndex": 1,
-                "endIndex": 2
-              },
-              "isOptional": false
-            }
-          ],
-          "name": "NoNamePolicy"
-        },
-        {
-          "kind": "Interface",
-          "canonicalReference": "@alloy-js/python!NoNamePolicyProps:interface",
-          "docComment": "",
-          "excerptTokens": [
-            {
-              "kind": "Content",
-              "text": "export interface NoNamePolicyProps "
-            }
-          ],
-          "fileUrlPath": "src/components/NoNamePolicy.tsx",
-          "releaseTag": "Public",
-          "name": "NoNamePolicyProps",
-          "preserveMemberOrder": false,
-          "members": [
-            {
-              "kind": "PropertySignature",
-              "canonicalReference": "@alloy-js/python!NoNamePolicyProps#children:member",
-              "docComment": "",
-              "excerptTokens": [
-                {
-                  "kind": "Content",
-                  "text": "children: "
-                },
-                {
-                  "kind": "Reference",
-                  "text": "Children",
-                  "canonicalReference": "@alloy-js/core!Children:type"
-                },
-                {
-                  "kind": "Content",
-                  "text": ";"
-                }
-              ],
-              "isReadonly": false,
-              "isOptional": false,
-              "releaseTag": "Public",
-              "name": "children",
-              "propertyTypeTokenRange": {
-                "startIndex": 1,
-                "endIndex": 2
-              }
-            }
-          ],
-          "extendsTokenRanges": []
-        },
         {
           "kind": "Interface",
           "canonicalReference": "@alloy-js/python!ParameterDescriptor:interface",
@@ -5150,7 +5072,12 @@
                 },
                 {
                   "kind": "Content",
-                  "text": "string"
+                  "text": "string | "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Namekey",
+                  "canonicalReference": "@alloy-js/core!Namekey:interface"
                 },
                 {
                   "kind": "Content",
@@ -5163,7 +5090,7 @@
               "name": "name",
               "propertyTypeTokenRange": {
                 "startIndex": 1,
-                "endIndex": 2
+                "endIndex": 3
               }
             },
             {
@@ -6051,7 +5978,12 @@
                 },
                 {
                   "kind": "Content",
-                  "text": "string"
+                  "text": "string | "
+                },
+                {
+                  "kind": "Reference",
+                  "text": "Namekey",
+                  "canonicalReference": "@alloy-js/core!Namekey:interface"
                 },
                 {
                   "kind": "Content",
@@ -6097,23 +6029,23 @@
                   "parameterName": "name",
                   "parameterTypeTokenRange": {
                     "startIndex": 1,
-                    "endIndex": 2
+                    "endIndex": 3
                   },
                   "isOptional": false
                 },
                 {
                   "parameterName": "spaces",
                   "parameterTypeTokenRange": {
-                    "startIndex": 3,
-                    "endIndex": 7
+                    "startIndex": 4,
+                    "endIndex": 8
                   },
                   "isOptional": false
                 },
                 {
                   "parameterName": "options",
                   "parameterTypeTokenRange": {
-                    "startIndex": 8,
-                    "endIndex": 9
+                    "startIndex": 9,
+                    "endIndex": 10
                   },
                   "isOptional": false
                 }

package/test/classdeclarations.test.tsx

@@ -1,4 +1,4 @@
-import { memberRefkey, refkey } from "@alloy-js/core";
+import { memberRefkey, namekey, refkey } from "@alloy-js/core";
 import { d } from "@alloy-js/core/testing";
 import { describe, expect, it } from "vitest";
 import * as py from "../src/index.js";
@@ -19,6 +19,18 @@ describe("Python Class", () => {
     `);
   });
 
+  it("takes a namekey", () => {
+    const result = toSourceText([
+      <py.ClassDeclaration name={namekey("Foo")} />,
+    ]);
+    expect(result).toRenderTo(d`
+      class Foo:
+          pass
+
+
+    `);
+  });
+
   it("renders a class with a body", () => {
     const result = toSourceText([
       <py.ClassDeclaration name="Bar">print('hi')</py.ClassDeclaration>,

package/test/functiondeclaration.test.tsx

@@ -1,4 +1,4 @@
-import { refkey } from "@alloy-js/core";
+import { namekey, refkey } from "@alloy-js/core";
 import { d } from "@alloy-js/core/testing";
 import { describe, expect, it } from "vitest";
 import * as py from "../src/index.js";
@@ -19,6 +19,18 @@ describe("Function Declaration", () => {
     `);
   });
 
+  it("takes a namekey", () => {
+    const result = toSourceText([
+      <py.FunctionDeclaration name={namekey("foo-bar")} />,
+    ]);
+    expect(result).toRenderTo(d`
+      def foo_bar():
+          pass
+
+
+    `);
+  });
+
   it("renders a function with no body as 'pass' with return type", () => {
     const result = toSourceText([
       <py.FunctionDeclaration name="foo" returnType="int" />,

package/test/variables.test.tsx

@@ -1,4 +1,4 @@
-import { code, refkey } from "@alloy-js/core";
+import { code, namekey, refkey } from "@alloy-js/core";
 import { d } from "@alloy-js/core/testing";
 import { describe, expect, it } from "vitest";
 import * as py from "../src/index.js";
@@ -16,6 +16,17 @@ describe("Python Variable", () => {
     expect(res).toBe(`my_var: int = 42`);
   });
 
+  it("takes a namekey", () => {
+    const res = toSourceText([
+      <py.VariableDeclaration
+        name={namekey("my-var")}
+        type="int"
+        initializer={42}
+      />,
+    ]);
+    expect(res).toBe(`my_var: int = 42`);
+  });
+
   it("declares a python variable without value", () => {
     const res = toSourceText([
       <py.VariableDeclaration name="myVar" type="int" omitNone />,

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

@@ -1,23 +0,0 @@
-import { Children } from "@alloy-js/core/jsx-runtime";
-export interface NoNamePolicyProps {
-    children: Children;
-}
-/**
- * A wrapper component that disables name policy transformation for its children.
- *
- * This is useful for components that need to preserve exact names without applying
- * naming conventions, such as Python dunder methods like `__init__`, `__str__`, etc.
- *
- * @example
- * ```tsx
- * <NoNamePolicy>
- *   <FunctionDeclaration name="__init__" instanceFunction>
- *     // Function content
- *   </FunctionDeclaration>
- * </NoNamePolicy>
- * ```
- *
- * This ensures `__init__` stays as `__init__` without name policy transformation.
- */
-export declare function NoNamePolicy(props: NoNamePolicyProps): Children;
-//# sourceMappingURL=NoNamePolicy.d.ts.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"NoNamePolicy.d.ts","sourceRoot":"","sources":["../../../src/components/NoNamePolicy.tsx"],"names":[],"mappings":"AACA,OAAO,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;AAEtD,MAAM,WAAW,iBAAiB;IAChC,QAAQ,EAAE,QAAQ,CAAC;CACpB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,wBAAgB,YAAY,CAAC,KAAK,EAAE,iBAAiB,YAMpD"}

package/dist/src/components/NoNamePolicy.js

@@ -1,28 +0,0 @@
-import { memo as _$memo, createComponent as _$createComponent } from "@alloy-js/core/jsx-runtime";
-import { NamePolicyContext } from "@alloy-js/core";
-/**
- * A wrapper component that disables name policy transformation for its children.
- *
- * This is useful for components that need to preserve exact names without applying
- * naming conventions, such as Python dunder methods like `__init__`, `__str__`, etc.
- *
- * @example
- * ```tsx
- * <NoNamePolicy>
- *   <FunctionDeclaration name="__init__" instanceFunction>
- *     // Function content
- *   </FunctionDeclaration>
- * </NoNamePolicy>
- * ```
- *
- * This ensures `__init__` stays as `__init__` without name policy transformation.
- */
-export function NoNamePolicy(props) {
-  return _$createComponent(NamePolicyContext.Provider, {
-    value: undefined,
-    get children() {
-      return props.children;
-    }
-  });
-}
-//# sourceMappingURL=NoNamePolicy.js.map

package/dist/src/components/NoNamePolicy.js.map

@@ -1 +0,0 @@
-{"version":3,"names":["NamePolicyContext","NoNamePolicy","props","_$createComponent","Provider","value","undefined","children"],"sources":["../../../src/components/NoNamePolicy.tsx"],"sourcesContent":[null],"mappings":";AAAA,SAASA,iBAAiB,QAAQ,gBAAgB;AAOlD;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA;AACA,OAAO,SAASC,YAAYA,CAACC,KAAwB,EAAE;EACrD,OAAAC,iBAAA,CACGH,iBAAiB,CAACI,QAAQ;IAACC,KAAK,EAAEC,SAAS;IAAA,IAAAC,SAAA;MAAA,OACzCL,KAAK,CAACK,QAAQ;IAAA;EAAA;AAGrB","ignoreList":[]}

package/src/components/NoNamePolicy.tsx

@@ -1,31 +0,0 @@
-import { NamePolicyContext } from "@alloy-js/core";
-import { Children } from "@alloy-js/core/jsx-runtime";
-
-export interface NoNamePolicyProps {
-  children: Children;
-}
-
-/**
- * A wrapper component that disables name policy transformation for its children.
- *
- * This is useful for components that need to preserve exact names without applying
- * naming conventions, such as Python dunder methods like `__init__`, `__str__`, etc.
- *
- * @example
- * ```tsx
- * <NoNamePolicy>
- *   <FunctionDeclaration name="__init__" instanceFunction>
- *     // Function content
- *   </FunctionDeclaration>
- * </NoNamePolicy>
- * ```
- *
- * This ensures `__init__` stays as `__init__` without name policy transformation.
- */
-export function NoNamePolicy(props: NoNamePolicyProps) {
-  return (
-    <NamePolicyContext.Provider value={undefined}>
-      {props.children}
-    </NamePolicyContext.Provider>
-  );
-}