prettier-plugin-sql-cst 0.12.3 → 0.13.0

package/dist/options.d.ts

@@ -4,6 +4,7 @@ export interface SqlPluginOptions {
     sqlKeywordCase: "preserve" | "upper" | "lower";
     sqlParamTypes: NonNullable<CstParserOptions["paramTypes"]>;
     sqlCanonicalSyntax: boolean;
+    sqlFinalSemicolon: boolean;
     sqlAcceptUnsupportedGrammar: boolean;
 }
 export type AllPrettierOptions<T = Node> = ParserOptions<T> & SqlPluginOptions;

package/dist/options.js

@@ -41,6 +41,13 @@ exports.options = {
         description: "Enforces one true style of SQL syntax (adds and removes keywords)",
         // Since 0.11.0
     },
+    sqlFinalSemicolon: {
+        type: "boolean",
+        category: "SQL",
+        default: true,
+        description: "Enforces a semicolon at the end of last SQL statement",
+        // Since 0.13.0
+    },
     sqlAcceptUnsupportedGrammar: {
         type: "boolean",
         category: "SQL",

package/dist/syntax/expr.js

@@ -45,7 +45,9 @@ exports.exprMap = {
             return print("expr");
         }
         var parent = path.getParentNode();
-        var lineStyle = (0, node_utils_1.isCreateTableStmt)(parent) ? print_utils_1.hardline : print_utils_1.softline;
+        var lineStyle = (0, node_utils_1.isCreateTableStmt)(parent) && print.dynamicLine() === print_utils_1.hardline
+            ? print_utils_1.hardline
+            : print_utils_1.softline;
         return (0, print_utils_1.group)(["(", (0, print_utils_1.indent)([lineStyle, print("expr")]), lineStyle, ")"]);
     },
     binary_expr: function (print, node) {

package/dist/syntax/program.js

@@ -5,7 +5,9 @@ var print_utils_1 = require("../print_utils");
 exports.programMap = {
     program: function (print, node, path, options) {
         return print("statements").map(function (doc, i) {
-            return printStatement(doc, i, node.statements, options);
+            return i === node.statements.length - 1
+                ? printFinalStatement(doc, i, node.statements, options)
+                : printStatement(doc, i, node.statements, options);
         });
     },
 };
@@ -27,3 +29,18 @@ var printStatement = function (doc, i, statements, options) {
         return [";", print_utils_1.hardline, doc];
     }
 };
+var printFinalStatement = function (doc, i, statements, options) {
+    var stmtDoc = printStatement(doc, i, statements, options);
+    if (statements[i].type === "empty") {
+        // When the final statement is an empty statement,
+        // this means we have inserted a semicolon and newline before it.
+        // So nothing else is needed.
+        return stmtDoc;
+    }
+    else {
+        // If the last statement is not empty,
+        // this means sqlFinalSemicolon option is false,
+        // so we need to add an empty line after it.
+        return [stmtDoc, print_utils_1.hardline];
+    }
+};

package/dist/syntax/sequence.js

@@ -3,10 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sequenceMap = void 0;
 var print_utils_1 = require("../print_utils");
 exports.sequenceMap = {
-    create_sequence_stmt: function (print) {
+    create_sequence_stmt: function (print, node) {
         return (0, print_utils_1.group)([
             print.spaced(["createKw", "kind", "sequenceKw", "ifNotExistsKw", "name"]),
-            (0, print_utils_1.indent)([print.dynamicLine(), (0, print_utils_1.join)(print_utils_1.line, print("options"))]),
+            node.options.length > 0
+                ? (0, print_utils_1.indent)([print.dynamicLine(), (0, print_utils_1.join)(print_utils_1.line, print("options"))])
+                : [],
         ]);
     },
     alter_sequence_stmt: function (print) {

package/dist/transform/transformCst.js

@@ -13,8 +13,10 @@ var transformCst = function (cst, originalText, options) {
         // so we don't need to worry about comments interfering with other transforms
         comments_1.moveCommentsToRoot,
         stripTrailingCommas_1.stripTrailingCommas,
-        addFinalSemicolon_1.addFinalSemicolon,
     ];
+    if (options.sqlFinalSemicolon) {
+        transforms.push(addFinalSemicolon_1.addFinalSemicolon);
+    }
     if (options.sqlCanonicalSyntax) {
         transforms.push(aliasAs_1.processAliasAs, canonicOperators_1.canonicOperators, canonicKeywords_1.canonicKeywords);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-sql-cst",
-  "version": "0.12.3",
+  "version": "0.13.0",
   "description": "Prettier plugin for SQL",
   "contributors": [
     "Barna Magyarkuti <bmagyarkuti@gmail.com>",
@@ -37,7 +37,7 @@
   ],
   "dependencies": {
     "prettier": "^3.0.3",
-    "sql-parser-cst": "^0.33.0"
+    "sql-parser-cst": "^0.33.1"
   },
   "devDependencies": {
     "@types/jest": "^29.2.5",