prettier-plugin-sql-cst 0.9.0 → 0.9.2

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { Node } from "sql-parser-cst";
 import { Parser, Printer, SupportLanguage } from "prettier";
 export { options } from "./options";
+export type { SqlPluginOptions } from "./options";
 export declare const languages: SupportLanguage[];
 export declare const parsers: Record<string, Parser<Node>>;
 export declare const printers: Record<string, Printer>;

package/dist/syntax/data_type.js

@@ -5,7 +5,7 @@ var utils_1 = require("../utils");
 var print_utils_1 = require("../print_utils");
 exports.dataTypeMap = {
     // print single-word types as `TYPE(10)` and multi-word types as `MY TYPE (10)`
-    data_type: function (print, node) {
+    named_data_type: function (print, node) {
         return ((0, utils_1.isArray)(node.nameKw) ? print.spaced : print)(["nameKw", "params"]);
     },
     generic_type_params: function (print) {

package/dist/syntax/insert.js

@@ -3,13 +3,30 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.insertMap = void 0;
 var print_utils_1 = require("../print_utils");
 exports.insertMap = {
-    insert_stmt: function (print) { return (0, print_utils_1.join)(print_utils_1.hardline, print("clauses")); },
-    insert_clause: function (print, node) {
-        return (0, print_utils_1.group)([
-            print.spaced(["insertKw", "orAction", "intoKw", "table"]),
-            node.columns ? (0, print_utils_1.indent)([print_utils_1.hardline, print("columns")]) : [],
-        ]);
+    insert_stmt: function (print, node) {
+        // When there's a columns clause, we want to indent it,
+        // but that only works when there's a newline inside it.
+        // So we have to avoid adding a newline before columns clause.
+        var columnsClauseIndex = node.clauses.findIndex(function (clause) { return clause.type === "insert_columns_clause"; });
+        if (columnsClauseIndex !== -1) {
+            var printedClauses = print("clauses");
+            var before = printedClauses.slice(0, columnsClauseIndex);
+            var columnsClause = printedClauses[columnsClauseIndex];
+            var after = printedClauses.slice(columnsClauseIndex + 1);
+            return [
+                (0, print_utils_1.join)(print_utils_1.hardline, before),
+                columnsClause,
+                after.length > 0 ? [print_utils_1.hardline, (0, print_utils_1.join)(print_utils_1.hardline, after)] : [],
+            ];
+        }
+        else {
+            return (0, print_utils_1.join)(print_utils_1.hardline, print("clauses"));
+        }
     },
+    insert_clause: function (print) {
+        return (0, print_utils_1.group)([print.spaced(["insertKw", "orAction", "intoKw", "table"])]);
+    },
+    insert_columns_clause: function (print) { return (0, print_utils_1.indent)([print_utils_1.hardline, print("columns")]); },
     values_clause: function (print) {
         return (0, print_utils_1.group)([print("valuesKw"), (0, print_utils_1.indent)([print_utils_1.hardline, print("values")])]);
     },

package/dist/syntax/truncate.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.truncateMap = void 0;
 exports.truncateMap = {
-    truncate_stmt: function (print) { return print.spaced(["truncateTableKw", "table"]); },
+    truncate_stmt: function (print) { return print.spaced(["truncateKw", "tableKw", "table"]); },
 };

package/dist/transform/stripTrailingCommas.js

@@ -9,7 +9,7 @@ var stripTrailingCommas = function (cst) {
     // Trailing comma is represented as an empty element at the end of column list
     var removeLastEmptyColumn = (0, sql_parser_cst_1.cstVisitor)({
         select_clause: function (node) {
-            if ((0, node_utils_1.isEmpty)((0, utils_1.last)(node.columns.items))) {
+            if (node.columns && (0, node_utils_1.isEmpty)((0, utils_1.last)(node.columns.items))) {
                 node.columns.items = node.columns.items.slice(0, -1);
             }
         },

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-sql-cst",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "Prettier plugin for SQL",
   "author": "Rene Saarsoo <nene@triin.net>",
   "license": "GPL-3.0-or-later",
@@ -31,7 +31,7 @@
   ],
   "dependencies": {
     "prettier": "^3.0.3",
-    "sql-parser-cst": "^0.17.1"
+    "sql-parser-cst": "^0.19.0"
   },
   "devDependencies": {
     "@types/jest": "^29.2.5",