feat: support multiple statements

Author: rafaelrpinto

src/core/Formatter.js

@@ -71,6 +71,9 @@ export default class Formatter {
             else if (token.type === tokenTypes.PLACEHOLDER) {
                 formattedQuery = this.formatPlaceholder(token, formattedQuery);
             }
+            else if (token.type === tokenTypes.END_STATEMENT) {
+                formattedQuery = this.formatWithoutSpaces(token, formattedQuery);
+            }
             else if (token.value === ",") {
                 formattedQuery = this.formatComma(token, formattedQuery);
             }

src/core/Tokenizer.js

@@ -18,6 +18,7 @@ export default class Tokenizer {
      */
     constructor(cfg) {
         this.WHITESPACE_REGEX = /^(\s+)/;
+        this.END_STATEMENT_REGEX = /^(;\n)/;
         this.NUMBER_REGEX = /^((-\s*)?[0-9]+(\.[0-9]+)?|0x[0-9a-fA-F]+|0b[01]+)\b/;
         this.OPERATOR_REGEX = /^(!=|<>|==|<=|>=|!<|!>|\|\||::|->>|->|~~\*|~~|!~~\*|!~~|~\*|!~\*|!~|.)/;
 
@@ -133,6 +134,7 @@ export default class Tokenizer {
 
     getNextToken(input, previousToken) {
         return this.getWhitespaceToken(input) ||
+            this.getEndStatementToken(input) ||
             this.getCommentToken(input) ||
             this.getStringToken(input) ||
             this.getOpenParenToken(input) ||
@@ -152,6 +154,14 @@ export default class Tokenizer {
         });
     }
 
+    getEndStatementToken(input) {
+        return this.getTokenOnFirstMatch({
+            input,
+            type: tokenTypes.END_STATEMENT,
+            regex: this.END_STATEMENT_REGEX
+        });
+    }
+
     getCommentToken(input) {
         return this.getLineCommentToken(input) || this.getBlockCommentToken(input);
     }

src/core/tokenTypes.js

@@ -14,5 +14,6 @@ export default {
     LINE_COMMENT: "line-comment",
     BLOCK_COMMENT: "block-comment",
     NUMBER: "number",
-    PLACEHOLDER: "placeholder"
+    PLACEHOLDER: "placeholder",
+    END_STATEMENT: "end-statement"
 };

test/behavesLikeSqlFormatter.js

@@ -445,4 +445,25 @@ export default function behavesLikeSqlFormatter(language) {
         expect(format("foo !~* 'hello'")).toBe("foo !~* 'hello'");
         expect(format("foo !~~* 'hello'")).toBe("foo !~~* 'hello'");
     });
+
+    it("keeps separation between multiple statements", function() {
+        expect(format("foo;bar;")).toBe("foo;bar;");
+        expect(format("foo\n;bar;")).toBe("foo;bar;");
+        expect(format("foo;\nbar;\n\n\n")).toBe("foo;\nbar;");
+        expect(format("foo;\n\n\nbar;\n\n\n")).toBe("foo;\nbar;");
+
+        const result = format("SELECT count(*),Column1 FROM Table1;\nSELECT count(*),Column1 FROM Table2;");
+        expect(result).toBe(
+            "SELECT\n" +
+            "  count(*),\n" +
+            "  Column1\n" +
+            "FROM\n" +
+            "  Table1;\n" + 
+            "SELECT\n" +
+            "  count(*),\n" +
+            "  Column1\n" +
+            "FROM\n" +
+            "  Table2;"
+        );
+    });
 }