Remove extra linebreak from core Block and python PythonBlock components

.chronus/changes/block-closer-2025-8-4-19-4-17.md

@@ -0,0 +1,7 @@
+---
+changeKind: feature
+packages:
+  - "@alloy-js/core"
+---
+
+The `<Block>` component no longer emits an empty line when the `closer` prop is `false.

.chronus/changes/block-closer-2025-8-4-19-6-12.md

@@ -0,0 +1,7 @@
+---
+changeKind: feature
+packages:
+  - "@alloy-js/python"
+---
+
+The `<PythonBlock>` component no longer emits an empty line after it. Use an explicit `<hbr />` or `<List doubleHardline>` to recover the old formatting.

packages/core/src/components/Block.tsx

@@ -10,9 +10,10 @@ export interface BlockProps {
   opener?: string;
 
   /**
-   * The closing punctuation of the block. Defaults to "\}".
+   * The closing punctuation of the block. Defaults to "\}". When passed `false`,
+   * no closing punctuation will be added and there will be no trailing newline.
    */
-  closer?: string;
+  closer?: string | boolean;
 
   /**
    * Whether the block starts on a new line. When true, a hardline is added
@@ -41,7 +42,7 @@ export function Block(props: BlockProps) {
       <Indent
         line={props.inline && childCount.value > 0}
         softline={childCount.value === 0}
-        trailingBreak
+        trailingBreak={props.closer !== false}
       >
         {props.children}
       </Indent>

packages/core/test/components/block.test.tsx

@@ -46,3 +46,34 @@ it("renders properly with newline and no children", () => {
     }
   `);
 });
+
+it("takes a custom closer and opener", () => {
+  const template = (
+    <>
+      <Block opener="[" closer="]">
+        Contents!!!
+      </Block>
+      following content
+    </>
+  );
+  expect(template).toRenderTo(`
+    [
+      Contents!!!
+    ]following content
+  `);
+});
+
+it("takes a false closer", () => {
+  const template = (
+    <>
+      <Block opener="(" closer={false}>
+        Contents!!!
+      </Block>
+      following content
+    </>
+  );
+  expect(template).toRenderTo(`
+    (
+      Contents!!!following content
+  `);
+});

packages/python/src/components/PythonBlock.tsx

@@ -24,7 +24,7 @@ export interface PythonBlockProps {
  */
 export function PythonBlock(props: PythonBlockProps) {
   return (
-    <Block opener={props.opener ?? ""} closer="">
+    <Block opener={props.opener ?? ""} closer={false}>
       {props.children}
     </Block>
   );

packages/python/src/components/SourceFile.tsx

@@ -2,7 +2,6 @@ import {
   ComponentContext,
   SourceFile as CoreSourceFile,
   createNamedContext,
-  List,
   Scope,
   Show,
   SourceDirectoryContext,
@@ -84,9 +83,7 @@ export function SourceFile(props: SourceFileProps) {
         <hbr />
       </Show>
       <PythonSourceFileContext.Provider value={sfContext}>
-        <Scope value={scope}>
-          <List doubleHardline>{props.children}</List>
-        </Scope>
+        <Scope value={scope}>{props.children}</Scope>
       </PythonSourceFileContext.Provider>
     </CoreSourceFile>
   );

packages/python/test/classdeclarations.test.tsx

@@ -14,8 +14,6 @@ describe("Python Class", () => {
     expect(result).toRenderTo(d`
       class Foo:
           pass
-
-
     `);
   });
 
@@ -26,8 +24,6 @@ describe("Python Class", () => {
     expect(result).toRenderTo(d`
       class Foo:
           pass
-
-
     `);
   });
 
@@ -38,8 +34,6 @@ describe("Python Class", () => {
     expect(result).toRenderTo(d`
       class Bar:
           print('hi')
-
-
     `);
   });
 
@@ -57,14 +51,10 @@ describe("Python Class", () => {
     const expected = d`
       class Base1:
           pass
-
       class Base2:
           pass
-
       class Baz(Base1, Base2):
           pass
-
-
     `;
     expect(result).toRenderTo(expected);
   });
@@ -75,11 +65,9 @@ describe("Python Class", () => {
         print('hello')
       </py.ClassDeclaration>,
     ]);
-    expect(result).toRenderTo(d`
+    expect(result).toRenderTo(`
       class Qux(Base):
           print('hello')
-
-
     `);
   });
 
@@ -102,24 +90,18 @@ describe("Python Class", () => {
     const mod1Expected = d`
       class A:
           pass
-
-
     `;
     const mod2Expected = d`
       from mod1 import A
 
       class B(A):
           pass
-
-
     `;
     const mod3Expected = d`
       from folder.mod2 import B
 
       class C(B):
           pass
-
-
     `;
     assertFileContents(result, { "mod1.py": mod1Expected });
     assertFileContents(result, { "folder/mod2.py": mod2Expected });
@@ -141,12 +123,9 @@ describe("Python Class", () => {
     const expected = d`
       class A:
           pass
-
       class B:
           bar: A
           foo: str
-
-
     `;
     expect(result).toRenderTo(expected);
   });
@@ -184,10 +163,8 @@ describe("Python Class", () => {
     const expected = d`
       class A:
           foo: str
-
       class B:
           foo: str
-
       A.foo
       B.foo
     `;
@@ -229,14 +206,11 @@ describe("Python Class - VariableDeclaration", () => {
     const expected = d`
       class Base:
           pass
-
       class A:
           just_name = None
           name_and_type: number = None
           name_type_and_value: number = 12
           class_based: Base = None
-
-
     `;
     expect(result).toRenderTo(expected);
   });
@@ -293,8 +267,6 @@ describe("Python Class - VariableDeclaration", () => {
             instance_prop = 42
             def instance_method(self) -> int:
                 pass
-
-
       `,
     });
   });
@@ -351,14 +323,10 @@ describe("Python Class - FunctionDeclaration", () => {
           b: int = None
           def my_method(self, a: int, b: int) -> int:
               return a + b
-
           def my_class_method(cls) -> int:
               pass
-
           def my_standalone_function() -> int:
               pass
-
-
       MyClass.my_class_method
       MyClass.my_standalone_function
     `;

packages/python/test/classinstantiations.test.tsx

@@ -24,7 +24,6 @@ it("declaration of class instance with variables", () => {
   const expected = d`
     class OneClass:
         pass
-
     OneClass("A name", 42, True)
   `;
   expect(result).toRenderTo(expected);
@@ -147,11 +146,9 @@ it("incorrect Class instantiation works", () => {
   const expected = d`
     MyClass(
         class NestedClass:
-            pass
-        ,
+            pass,
         def my_func():
-            pass
-        ,
+            pass,
         x = None
     )
   `;

packages/python/test/enums.test.tsx

@@ -28,8 +28,6 @@ describe("Python Enum", () => {
           RED = 1
           GREEN = 2
           BLUE = 3
-
-
     `;
     expect(result).toRenderTo(expected);
   });
@@ -56,8 +54,6 @@ describe("Python Enum", () => {
           RED = "1"
           GREEN = 2
           BLUE = "3"
-
-
     `;
     expect(result).toRenderTo(expected);
   });
@@ -85,15 +81,11 @@ describe("Python Enum", () => {
 
       class Dog:
           pass
-
       class Cat:
           pass
-
       class Animal(Enum):
           DOG = Dog
           CAT = Cat
-
-
     `;
     expect(result).toRenderTo(expected);
   });
@@ -117,8 +109,6 @@ describe("Python Enum", () => {
           DOG = auto()
           CAT = auto()
           RABBIT = auto()
-
-
     `;
     expect(result).toRenderTo(expected);
   });
@@ -148,8 +138,6 @@ describe("Python Enum", () => {
           READ = 1
           WRITE = auto()
           EXECUTE = auto()
-
-
     `;
     expect(result).toRenderTo(expected);
   });

packages/python/test/externals.test.tsx

@@ -98,14 +98,11 @@
         response = get(1)
         return response.json()
 
-
     def create_user(user_name: string) -> Response:
         response = post(1)
         return response.json()
-
-
   `;
   expect(result).toRenderTo(expected);
 });
 
 it("uses import from external library in multiple class methods", () => {
@@ -177,13 +174,9 @@
         def get_user(self, user_id: int) -> Response:
             response = get(self.some_var)
             return response.json()
-
         def create_user(self, user_name: string) -> Response:
             response = post(self.some_var)
             return response.json()
-
-
-
   `;
   expect(result).toRenderTo(expected);
 });

packages/python/test/functioncallexpressions.test.tsx

@@ -39,7 +39,6 @@ describe("FunctionCallExpression", () => {
     const expected = d`
       def run_func():
           pass
-
       run_func("A name", 42, True)
     `;
     expect(result).toRenderTo(expected);
@@ -79,7 +78,6 @@ describe("FunctionCallExpression", () => {
     const expected = d`
       def run_func(name: str, number: int, flag: bool) -> str:
           pass
-
       result: str = run_func("A name", 42, True)
     `;
     expect(result).toRenderTo(expected);