prettier-plugin-sql-cst 0.8.1 → 0.8.3

package/README.md

@@ -3,6 +3,10 @@
 A [Prettier][] plugin for SQL that uses [sql-parser-cst][] and the
 actual [Prettier formatting algorithm][wadler-prettier].
 
+**Note:** This plugin only works with Prettier 2.x. It doesn't yet support the latest Prettier 3.x.
+
+**[Try it live!][live]**
+
 Like Prettier for JavaScript,
 this plugin formats SQL expressions differently depending on their length.
 A short SQL query will be formatted on a single line:
@@ -26,15 +30,15 @@ SELECT
   client.id,
   client.name AS client_name,
   organization.name AS org_name,
-  count(order.id) AS nr_of_orders
+  count(orders.id) AS nr_of_orders
 FROM
   client
   LEFT JOIN organization ON client.organization_id = organization.id
-  LEFT JOIN order ON order.client_id = client.id
+  LEFT JOIN orders ON orders.client_id = client.id
 WHERE
   client.status = 'active'
   AND client.id IN (28, 214, 457)
-  AND order.status IN ('active', 'pending', 'processing')
+  AND orders.status IN ('active', 'pending', 'processing')
 GROUP BY client.id
 ORDER BY client.name
 LIMIT 100;
@@ -109,6 +113,7 @@ The specifics of the [SQL formatting style][STYLE_GUIDE] are still very much sub
 Though the general principles should be mostly in place by now.
 
 [prettier]: https://prettier.io/
+[live]: https://nene.github.io/prettier-sql-playground/
 [printWidth]: https://prettier.io/docs/en/options.html#print-width
 [tabWidth]: https://prettier.io/docs/en/options.html#tab-width
 [useTabs]: https://prettier.io/docs/en/options.html#tabs

package/dist/syntax/data_type.js

@@ -2,12 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.dataTypeMap = void 0;
 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) {
         return ((0, utils_1.isArray)(node.nameKw) ? print.spaced : print)(["nameKw", "params"]);
     },
-    generic_type_params: function (print) { return ["<", print("params"), ">"]; },
+    generic_type_params: function (print) {
+        return (0, print_utils_1.group)(["<", (0, print_utils_1.indent)([print_utils_1.softline, print("params")]), print_utils_1.softline, ">"]);
+    },
     array_type_param: function (print) { return print.spaced(["dataType", "constraints"]); },
     struct_type_param: function (print) {
         return print.spaced(["name", "dataType", "constraints"]);

package/dist/syntax/delete.js

@@ -4,5 +4,5 @@ exports.deleteMap = void 0;
 var print_utils_1 = require("../print_utils");
 exports.deleteMap = {
     delete_stmt: function (print) { return (0, print_utils_1.join)(print_utils_1.hardline, print("clauses")); },
-    delete_clause: function (print) { return print.spaced(["deleteKw", "fromKw", "table"]); },
+    delete_clause: function (print) { return print.spaced(["deleteKw", "fromKw", "tables"]); },
 };

package/dist/syntax/expr.js

@@ -103,19 +103,22 @@ exports.exprMap = {
             return (0, print_utils_1.group)((0, print_utils_1.join)(" ", __spreadArray([fnCall], extras, true)));
         }
     },
-    func_args: function (print) { return print.spaced(["distinctKw", "args"]); },
+    func_args: function (print) { return print.spaced(["distinctKw", "args", "having"]); },
     filter_arg: function (print) { return print.spaced(["filterKw", "where"]); },
     over_arg: function (print) { return print.spaced(["overKw", "window"]); },
+    having_arg: function (print) { return print.spaced(["havingKw", "minMaxKw", "expr"]); },
     cast_expr: function (print) { return print(["castKw", "args"]); },
     cast_arg: function (print) { return print.spaced(["expr", "asKw", "dataType", "format"]); },
     cast_format: function (print) { return print.spaced(["formatKw", "string", "timezone"]); },
     cast_format_timezone: function (print) { return print.spaced(["atTimeZoneKw", "timezone"]); },
     raise_expr: function (print) { return print(["raiseKw", "args"]); },
     raise_expr_type: function (print) { return print("typeKw"); },
+    extract_expr: function (print) { return print(["extractKw", "args"]); },
+    extract_from: function (print) { return print.spaced(["unit", "fromKw", "expr"]); },
+    week_expr: function (print) { return print(["weekKw", "args"]); },
     interval_expr: function (print) { return print.spaced(["intervalKw", "expr", "unit"]); },
-    interval_unit_range: function (print) {
-        return print.spaced(["fromUnitKw", "toKw", "toUnitKw"]);
-    },
+    interval_unit_range: function (print) { return print.spaced(["fromUnit", "toKw", "toUnit"]); },
+    interval_unit: function (print) { return print("unitKw"); },
     array_expr: function (print) {
         return (0, print_utils_1.group)(["[", (0, print_utils_1.indent)([print_utils_1.softline, print("expr")]), print_utils_1.softline, "]"]);
     },

package/dist/syntax/select.js

@@ -17,7 +17,7 @@ exports.selectMap = {
             (0, print_utils_1.indent)([print_utils_1.line, print("tables")]),
         ]);
     },
-    common_table_expression: function (print) { return [
+    common_table_expr: function (print) { return [
         print(["table", "columns"]),
         " ",
         print.spaced(["asKw", "materializedKw", "expr"]),

package/dist/syntax/update.js

@@ -5,7 +5,7 @@ var print_utils_1 = require("../print_utils");
 exports.updateMap = {
     update_stmt: function (print) { return (0, print_utils_1.join)(print_utils_1.hardline, print("clauses")); },
     update_clause: function (print) {
-        return print.spaced(["updateKw", "options", "orAction", "tables"]);
+        return print.spaced(["updateKw", "hints", "orAction", "tables"]);
     },
     set_clause: function (print, node) {
         if (node.assignments.items.length > 1) {

package/package.json

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