Fix

Author: mauriciogardini

packages/python/src/components/DataclassDeclaration.tsx

@@ -1,4 +1,5 @@
 import { For, Show, childrenArray, computed } from "@alloy-js/core";
+import { snakeCase } from "change-case";
 import { dataclassesModule } from "../builtins/python.js";
 import { usePythonScope } from "../symbols/scopes.js";
 import { Atom } from "./Atom.jsx";
@@ -30,13 +31,9 @@ function validateDataclassMemberConflicts(kwargs: DataclassDecoratorKwargs) {
   if (!owner) return;
 
   const hasMemberNamed = (name: string): boolean => {
-    for (const sym of owner.instanceMembers as Iterable<any>) {
-      if (sym.originalName === name) return true;
-    }
-    for (const sym of owner.staticMembers as Iterable<any>) {
-      if (sym.originalName === name) return true;
-    }
-    return false;
+    const instanceNames: Set<string> | undefined = (owner.instanceMembers as any)?.symbolNames;
+    const staticNames: Set<string> | undefined = (owner.staticMembers as any)?.symbolNames;
+    return Boolean(instanceNames?.has(name) || staticNames?.has(name));
   };
 
   if (kwargs.order === true) {
@@ -100,6 +97,9 @@ export const dataclassDecoratorKeys = [
   "slots",
   "weakrefSlot",
 ] as const;
+export const dataclassDecoratorKeySet = new Set<string>(
+  dataclassDecoratorKeys as unknown as string[],
+);
 export type DataclassDecoratorKey = (typeof dataclassDecoratorKeys)[number];
 export type DataclassDecoratorKwargs = Partial<
   Record<DataclassDecoratorKey, boolean>
@@ -110,7 +110,7 @@ export interface DataclassDeclarationProps
     DataclassDecoratorKwargs {}
 
 /**
- * Renders a Python dataclass. Uses ClassDeclaration component internally.
+ * Renders a Python dataclass.
  *
  * Example:
  * ```tsx
@@ -138,38 +138,20 @@ export interface DataclassDeclarationProps
  * ```
  */
 export function DataclassDeclaration(props: DataclassDeclarationProps) {
-  const decoratorKeys: (keyof DataclassDecoratorKwargs)[] = [
-    ...dataclassDecoratorKeys,
-  ];
-  const validKeySet = new Set<string>(decoratorKeys as unknown as string[]);
   // Collect flags from props in the order they appear (preserves emission order)
-  const orderedKwargs: Array<[keyof DataclassDecoratorKwargs, any]> = [];
+  const decoratorEntries: Array<[string, any]> = [];
+  const kwargs = {} as DataclassDecoratorKwargs;
   for (const key of Object.keys(props)) {
     // Only include known flags; skip undefined values
-    if (validKeySet.has(key)) {
+    if (dataclassDecoratorKeySet.has(key)) {
       const value = (props as any)[key];
-      if (value !== undefined)
-        orderedKwargs.push([key as keyof DataclassDecoratorKwargs, value]);
+      if (value !== undefined) {
+        (kwargs as any)[key] = value;
+        decoratorEntries.push([snakeCase(key), value]);
+      }
     }
   }
-  // Materialize ordered entries into an object for validation/rendering
-  const kwargs = orderedKwargs.reduce((acc, [k, v]) => {
-    (acc as any)[k] = v;
-    return acc;
-  }, {} as DataclassDecoratorKwargs);
-  const hasDecoratorArgs = orderedKwargs.length > 0;
-  const toSnakeCase = (s: string): string =>
-    s
-      .replace(/([a-z\d])([A-Z])/g, "$1_$2")
-      .replace(/([A-Z]+)([A-Z][a-z])/g, "$1_$2")
-      .toLowerCase();
-  const decoratorEntries = orderedKwargs.map(([k, v]) => {
-    const pyKey = toSnakeCase(k as unknown as string);
-    return [pyKey, v] as const;
-  });
-  const hasBodyChildren = computed(() =>
-    childrenArray(() => props.children).some(Boolean),
-  );
+  const hasDecoratorArgs = decoratorEntries.length > 0;
 
   if (hasDecoratorArgs) {
     validateDataclassDecoratorArgs(kwargs);
@@ -180,14 +162,6 @@ export function DataclassDeclaration(props: DataclassDeclarationProps) {
     return null;
   }
 
-  const classBody =
-    hasBodyChildren.value ?
-      <>
-        <StatementList>{props.children}</StatementList>
-        <RunSymbolValidation />
-      </>
-    : undefined;
-
   return (
     <>
       {"@"}
@@ -205,7 +179,8 @@ export function DataclassDeclaration(props: DataclassDeclarationProps) {
       </Show>
       <hbr />
       <ClassDeclaration name={props.name} bases={props.bases} doc={props.doc}>
-        {classBody}
+        <StatementList>{props.children}</StatementList>
+        <RunSymbolValidation />
       </ClassDeclaration>
     </>
   );

packages/python/src/components/PropertyDeclaration.tsx

@@ -94,8 +94,7 @@ export function PropertyDeclaration(props: PropertyDeclarationProps) {
     }
   };
 
-  const childrenComputed = computed(() => childrenArray(() => props.children));
-  const children = childrenComputed.value;
+  const children = childrenArray(() => props.children);
   const setterComponent =
     findKeyedChild(children, PropertyDeclaration.Setter.tag) ?? undefined;
   const deleterComponent =

packages/python/src/components/PyDoc.tsx

@@ -6,6 +6,8 @@ import {
   Prose,
   Show,
   childrenArray,
+  computed,
+  isKeyedChild,
 } from "@alloy-js/core";
 import { ParameterDescriptor } from "../parameter-descriptor.js";
 import { Atom } from "./Atom.jsx";
@@ -244,11 +246,12 @@ export interface PyDocProps {
  * linebreaks. This is useful for creating PyDoc comments with multiple paragraphs.
  */
 export function PyDoc(props: PyDocProps) {
+  const children = childrenArray(() => props.children);
   return (
     <>
       {'"""'}
       <hbr />
-      <List doubleHardline>{children(() => props.children)}</List>
+      <List doubleHardline>{children}</List>
       <hbr />
       {'"""'}
       <hbr />
@@ -264,25 +267,48 @@ export interface PyDocExampleProps {
  * Create a PyDoc example, which is prepended by \>\>.
  */
 export function PyDocExample(props: PyDocExampleProps) {
-  const getLines = () => {
-    const childrenList = childrenArray(() => props.children);
-    if (childrenList.length === 1 && typeof childrenList[0] === "string") {
-      // Split, trim each line, and filter out empty lines
-      return childrenList[0]
+  const lines = computed(() => {
+    const kids = childrenArray(() => props.children, { preserveFragments: true });
+    const out: Children[] = [];
+
+    const isBr = (node: any): boolean => {
+      if (node == null) return false;
+      const keyed = isKeyedChild(node as any);
+      const tag = keyed ? (node as any).tag : (node as any)?.tag;
+      const kind = (node as any)?.kind;
+      // Consider only <br /> as a line splitter (not rendered as content).
+      return tag === "br" || kind === "br";
+    };
+
+    // Handles a single string child: split on newlines to produce lines.
+    const splitAndTrim = (s: string): string[] =>
+      s
         .split(/\r?\n/)
-        .map((s) => s.trim())
-        .filter((s) => s.length > 0);
+        .map((x) => x.trim())
+        .filter((x) => x.length > 0);
+
+    if (kids.length === 1 && typeof kids[0] === "string") {
+      return splitAndTrim(kids[0] as string);
+    }
+
+    // Handles mixed children: each child becomes a line, string children
+    // may include embedded newlines, and <br /> acts as a line split.
+    for (const child of kids) {
+      if (child == null || isBr(child)) continue;
+      if (typeof child === "string") {
+        // String children: split on newlines to produce lines.
+        for (const seg of splitAndTrim(child)) out.push(seg);
+      } else {
+        // Non-string child (component/fragment) are preserved as their own doctest line.
+        out.push(child);
+      }
     }
-    // For non-string children, filter out empty/whitespace-only strings
-    return childrenList
-      .map((c) => (typeof c === "string" ? c : ""))
-      .map((s) => s.trim())
-      .filter((s) => s.length > 0);
-  };
+    return out;
+  });
 
   return (
     <>
-      <For each={getLines}>
+      <For each={lines.value}>
         {(line) => (
           <>
             {">> "}
@@ -299,12 +325,33 @@ export interface SimpleCommentBlockProps {
 }
 
 export function SimpleCommentBlock(props: SimpleCommentBlockProps) {
+  const children = childrenArray(() => props.children);
+  let content: Children;
+  if (children.length === 1 && typeof children[0] === "string") {
+    const raw = children[0] as string;
+    if (raw.includes("\n") || raw.includes("\\n")) {
+      const parts = raw.split(/\r?\n|\\n/);
+      content = (
+        <>
+          {parts.map((p, i) => (
+            <>
+              <Prose>{p}</Prose>
+              {i < parts.length - 1 && <hbr />}
+            </>
+          ))}
+        </>
+      );
+    } else {
+      content = <Prose>{props.children}</Prose>;
+    }
+  } else {
+    content = <Prose>{props.children}</Prose>;
+  }
+
   return (
     <>
       #{" "}
-      <align string="# ">
-        <Prose>{props.children}</Prose>
-      </align>
+      <align string="# ">{content}</align>
     </>
   );
 }

packages/python/src/utils.ts

@@ -5,15 +5,7 @@ import {
   isComponentCreator,
   splitProps,
 } from "@alloy-js/core";
-import { ClassMethodDeclaration } from "./components/ClassMethodDeclaration.js";
-import { DunderMethodDeclaration } from "./components/DunderMethodDeclaration.js";
-import { FunctionDeclaration } from "./components/FunctionDeclaration.js";
-import {
-  BaseDeclarationProps,
-  CallSignatureProps,
-} from "./components/index.js";
-import { MethodDeclaration } from "./components/MethodDeclaration.js";
-import { StaticMethodDeclaration } from "./components/StaticMethodDeclaration.js";
+import { CallSignatureProps } from "./components/index.js";
 
 /**
  * Extract only the call signature props from a props object which extends
@@ -37,35 +29,3 @@ export function getCallSignatureProps(
 
   return defaultProps(callSignatureProps, defaults);
 }
-
-/**
- * Find the first function-like child declaration whose name matches one of the
- * provided method names. Returns the method name when found.
- */
-export function findMethodDeclaration(
-  children: Children[],
-  methodNames: string[],
-): string | undefined {
-  const creators = [
-    MethodDeclaration,
-    FunctionDeclaration,
-    ClassMethodDeclaration,
-    StaticMethodDeclaration,
-    DunderMethodDeclaration,
-  ];
-  for (const child of children) {
-    if (creators.some((creator) => isComponentCreator(child, creator))) {
-      const rawName = (child as ComponentCreator<BaseDeclarationProps>).props
-        ?.name;
-      const candidateName =
-        typeof rawName === "string" ? rawName : rawName?.name;
-      if (
-        typeof candidateName === "string" &&
-        methodNames.includes(candidateName)
-      ) {
-        return candidateName;
-      }
-    }
-  }
-  return undefined;
-}

packages/python/test/pydocs.test.tsx

@@ -104,11 +104,7 @@ describe("PyDocExample", () => {
         <py.PyDoc>
           <Prose>This is an example of a docstring with a code sample.</Prose>
           <py.PyDocExample>
-            print("Hello world!")
-            <br />
-            x = "Hello"
-            <br />
-            print(x)
+            {`print("Hello world!")\nx = "Hello"\nprint(x)`}
           </py.PyDocExample>
         </py.PyDoc>,
       ],
@@ -136,12 +132,13 @@ describe("SimpleCommentBlock", () => {
   it("renders simple comment block", () => {
     const res = toSourceText([
       <py.SimpleCommentBlock>
-        This is a simple comment block that spans multiple lines.
+        This is a simple comment block that spans multiple lines and should be split automatically.
       </py.SimpleCommentBlock>,
     ]);
     expect(res).toRenderTo(
       d`
-          # This is a simple comment block that spans multiple lines.
+          # This is a simple comment block that spans multiple lines and should be split
+          # automatically.
           
           `,
     );
@@ -150,14 +147,13 @@ describe("SimpleCommentBlock", () => {
   it("renders comment block with line breaks", () => {
     const res = toSourceText([
       <py.SimpleCommentBlock>
-        First line of comment.
-        <br />
-        Second line of comment.
+        First line of comment.\nSecond line of comment.
       </py.SimpleCommentBlock>,
     ]);
     expect(res).toRenderTo(
       d`
-          # First line of comment. Second line of comment.
+          # First line of comment.
+          # Second line of comment.
           
           `,
     );
@@ -877,9 +873,7 @@ describe("New Documentation Components", () => {
             Generators have a Yields section instead of a Returns section.
           </Prose>,
           <py.PyDocExample>
-            print([i for i in example_generator(4)])
-            <br />
-            [0, 1, 2, 3]
+            {`print([i for i in example_generator(4)])\n[0, 1, 2, 3]`}
           </py.PyDocExample>,
         ]}
         parameters={[
@@ -928,11 +922,7 @@ describe("Full example", () => {
             We will also render another paragraph after this one.
           </Prose>,
           <py.PyDocExample>
-            print("Hello world!")
-            <br />
-            x = "Hello"
-            <br />
-            print(x)
+            {`print("Hello world!")\nx = "Hello"\nprint(x)`}
           </py.PyDocExample>,
         ]}
         attributes={[
@@ -1050,11 +1040,7 @@ describe("Full example", () => {
             We will also render another paragraph after this one.
           </Prose>,
           <py.PyDocExample>
-            print("Hello world!")
-            <br />
-            x = "Hello"
-            <br />
-            print(x)
+            {`print("Hello world!")\nx = "Hello"\nprint(x)`}
           </py.PyDocExample>,
         ]}
         parameters={[