Avoid initial new line when using custom group separator (#29)

IanVS · Jun 9, 2022 · d7d2894 · d7d2894
1 parent 3b72a60
commit d7d2894
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/utils/get-sorted-nodes-by-import-order.ts b/src/utils/get-sorted-nodes-by-import-order.ts
@@ -70,8 +70,13 @@ export const getSortedNodesByImportOrder: GetSortedNodes = (nodes, options) => {
     for (const group of importOrder) {
         // If it's a custom separator, all we need to do is add a newline
         if (isCustomGroupSeparator(group)) {
+            const lastNode = finalNodes[finalNodes.length - 1];
+            // Avoid empty new line if first group is empty
+            if (!lastNode) {
+                continue;
+            }
             // Don't add multiple newlines
-            if (isLastNodeANewline(finalNodes)) {
+            if (isNodeANewline(lastNode)) {
                 continue;
             }
             finalNodes.push(newLineNode);
@@ -111,7 +116,6 @@ function isCustomGroupSeparator(pattern: string) {
     return pattern.trim() === '';
 }
 
-function isLastNodeANewline(nodes: ImportOrLine[]) {
-    const lastNode = nodes[nodes.length - 1];
-    return lastNode?.type === 'ExpressionStatement';
+function isNodeANewline(node: ImportOrLine) {
+    return node.type === 'ExpressionStatement';
 }
diff --git a/tests/ImportsSeparatedByEmptyRegex/__snapshots__/ppsi.spec.js.snap b/tests/ImportsSeparatedByEmptyRegex/__snapshots__/ppsi.spec.js.snap
@@ -241,7 +241,6 @@ import fourLevelRelativePath from "../../../../fourLevelRelativePath";
 import something from "@server/something";
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 // I am top level comment
-
 import abc from "@core/abc";
 import otherthing from "@core/otherthing";
 import something from "@server/something";