JavaScript: AddImport now checks the es6ImportExportBraces style

Author: knutwannheden

rewrite-javascript/rewrite/src/javascript/add-import.ts

@@ -3,6 +3,7 @@ import {emptySpace, J, rightPadded, singleSpace, space, Statement, Type} from ".
 import {JS} from "./tree";
 import {randomId} from "../uuid";
 import {emptyMarkers, markers} from "../markers";
+import {getStyle, SpacesStyle, StyleKind} from "./style";
 
 export enum ImportStyle {
     ES6Named,      // import { x } from 'module'
@@ -1083,7 +1084,15 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
             };
         } else {
             // Named import: import { member } from 'module'
+
+            // Get the spaces style for brace spacing
+            const spacesStyle = getStyle(StyleKind.SpacesStyle, compilationUnit) as SpacesStyle;
+            const braceSpace = spacesStyle.within.es6ImportExportBraces ? singleSpace : emptySpace;
+
             const importSpec = this.createImportSpecifier();
+            // Apply brace spacing: the space after { is in the specifier's prefix,
+            // and the space before } is in the rightPadded's after
+            const importSpecWithSpacing = {...importSpec, prefix: braceSpace};
 
             const namedImports: JS.NamedImports = {
                 id: randomId(),
@@ -1093,7 +1102,7 @@ export class AddImport<P> extends JavaScriptVisitor<P> {
                 elements: {
                     kind: J.Kind.Container,
                     before: emptySpace,
-                    elements: [rightPadded(importSpec, emptySpace)],
+                    elements: [rightPadded(importSpecWithSpacing, braceSpace)],
                     markers: emptyMarkers
                 }
             };

rewrite-javascript/rewrite/test/javascript/add-import.test.ts

@@ -20,18 +20,24 @@ import {fromVisitor, RecipeSpec} from "../../src/test";
 import {
     AddImport,
     ImportStyle,
+    IntelliJ,
     javascript,
     JavaScriptVisitor,
     JS,
     maybeAddImport,
     npm,
     packageJson,
     RemoveImport,
+    SpacesStyle,
     Template,
     tsx,
     typescript
 } from "../../src/javascript";
 import {emptySpace, J} from "../../src/java";
+import {MarkersKind} from "../../src/markers";
+import {randomId} from "../../src/uuid";
+import {NamedStyles} from "../../src/style";
+import {produce} from "immer";
 import {withDir} from "tmp-promise";
 
 /**
@@ -1701,4 +1707,74 @@ describe('AddImport visitor', () => {
             );
         });
     });
+
+    describe('style options', () => {
+        /**
+         * Helper function to create a visitor that:
+         * 1. Adds a NamedStyles marker to the compilation unit with es6ImportExportBraces: true
+         * 2. Then uses AddImport to add an import statement
+         */
+        function createAddImportWithBraceSpacingVisitor(
+            module: string,
+            member?: string,
+            alias?: string
+        ): JavaScriptVisitor<any> {
+            return new class extends JavaScriptVisitor<any> {
+                override async visitJsCompilationUnit(cu: JS.CompilationUnit, p: any): Promise<J | undefined> {
+                    // Create a SpacesStyle with es6ImportExportBraces: true using produce
+                    const spacesStyle: SpacesStyle = produce(IntelliJ.TypeScript.spaces(), draft => {
+                        draft.within.es6ImportExportBraces = true;
+                    });
+
+                    // Create a NamedStyles marker
+                    const namedStyles: NamedStyles = {
+                        kind: MarkersKind.NamedStyles,
+                        id: randomId(),
+                        name: "test-style",
+                        displayName: "Test Style",
+                        tags: [],
+                        styles: [spacesStyle]
+                    };
+
+                    // Add the NamedStyles marker to the compilation unit
+                    let result: JS.CompilationUnit = {
+                        ...cu,
+                        markers: {
+                            ...cu.markers,
+                            markers: [...cu.markers.markers, namedStyles]
+                        }
+                    };
+
+                    // Then add the import
+                    const addImport = new AddImport({
+                        module,
+                        member,
+                        alias,
+                        onlyIfReferenced: false
+                    });
+                    result = await addImport.visit(result, p) as JS.CompilationUnit;
+
+                    return result;
+                }
+            };
+        }
+
+        test('should add spaces inside braces when es6ImportExportBraces style is true', async () => {
+            const spec = new RecipeSpec();
+            spec.recipe = fromVisitor(createAddImportWithBraceSpacingVisitor('fs', 'readFile'));
+
+            await spec.rewriteRun(
+                typescript(
+                    `
+                        const x = 1;
+                    `,
+                    `
+                        import { readFile } from 'fs';
+
+                        const x = 1;
+                    `
+                )
+            );
+        });
+    });
 });