prettier-plugin-sql-cst 0.5.0 → 0.6.0

package/README.md

@@ -49,7 +49,6 @@ LIMIT 100;
 
 Currently this plugin preserves most of the syntax elements
 and concentrates mainly on the layout of whitespace.
-For example it does not add/remove paratheses.
 
 See [STYLE_GUIDE][] for overview of the SQL formatting style used.
 

package/dist/node_utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isAsClause = exports.isArraySubscript = exports.isStringLiteral = exports.isJsonLiteral = exports.isEmpty = exports.isKeyword = exports.isCreateTableStmt = exports.isFuncCall = exports.isValuesClause = void 0;
+exports.isListExpr = exports.isParenExpr = exports.isAsClause = exports.isArraySubscript = exports.isStringLiteral = exports.isJsonLiteral = exports.isEmpty = exports.isKeyword = exports.isCreateTableStmt = exports.isFuncArgs = exports.isFuncCall = exports.isValuesClause = void 0;
 var utils_1 = require("./utils");
 var is = function (type) {
     return function (node) {
@@ -9,6 +9,7 @@ var is = function (type) {
 };
 exports.isValuesClause = is("values_clause");
 exports.isFuncCall = is("func_call");
+exports.isFuncArgs = is("func_args");
 exports.isCreateTableStmt = is("create_table_stmt");
 exports.isKeyword = is("keyword");
 exports.isEmpty = is("empty");
@@ -16,3 +17,5 @@ exports.isJsonLiteral = is("json_literal");
 exports.isStringLiteral = is("string_literal");
 exports.isArraySubscript = is("array_subscript");
 exports.isAsClause = is("as_clause");
+exports.isParenExpr = is("paren_expr");
+exports.isListExpr = is("list_expr");

package/dist/syntax/create_table.js

@@ -25,6 +25,7 @@ exports.createTableMap = {
                 "temporaryKw",
                 "externalKw",
                 "snapshotKw",
+                "virtualKw",
                 "tableKw",
                 "ifNotExistsKw",
                 "name",
@@ -44,6 +45,7 @@ exports.createTableMap = {
     with_partition_columns_clause: function (print) {
         return print.spaced(["withPartitionColumnsKw", "columns"]);
     },
+    create_table_using_clause: function (print) { return print.spaced(["usingKw", "module"]); },
 };
 var printClauses = function (print, node) {
     if (node.clauses.length === 1 && (0, node_utils_1.isAsClause)(node.clauses[0])) {

package/dist/syntax/expr.js

@@ -33,6 +33,15 @@ exports.exprMap = {
         }
     },
     paren_expr: function (print, node, path) {
+        // discard unnecessary nested ((parentheses))
+        if ((0, node_utils_1.isParenExpr)(node.expr)) {
+            return print("expr");
+        }
+        // Discard unnecessary parenthesis around function arguments
+        if ((0, node_utils_1.isListExpr)(path.getParentNode(0)) &&
+            (0, node_utils_1.isFuncArgs)(path.getParentNode(1))) {
+            return print("expr");
+        }
         var parent = path.getParentNode();
         var lineStyle = (0, node_utils_1.isCreateTableStmt)(parent) ? print_utils_1.hardline : print_utils_1.softline;
         return (0, print_utils_1.group)(["(", (0, print_utils_1.indent)([lineStyle, print("expr")]), lineStyle, ")"]);
@@ -84,8 +93,11 @@ exports.exprMap = {
     filter_arg: function (print) { return print.spaced(["filterKw", "where"]); },
     over_arg: function (print) { return print.spaced(["overKw", "window"]); },
     cast_expr: function (print) { return print(["castKw", "args"]); },
-    cast_arg: function (print) { return print.spaced(["expr", "asKw", "dataType"]); },
+    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"); },
     interval_expr: function (print) { return print.spaced(["intervalKw", "expr", "unit"]); },
     interval_unit_range: function (print) {
         return print.spaced(["fromUnitKw", "toKw", "toUnitKw"]);
@@ -109,6 +121,7 @@ exports.exprMap = {
     timestamp_literal: function (print) { return print.spaced(["timestampKw", "string"]); },
     json_literal: function (print) { return print.spaced(["jsonKw", "string"]); },
     identifier: function (print) { return print("text"); },
+    variable: function (print) { return print("text"); },
 };
 var isBooleanOp = function (_a) {
     var name = _a.name;

package/dist/syntax/sqlite.js

@@ -16,10 +16,4 @@ exports.sqliteMap = {
     pragma_stmt: function (print) { return print.spaced(["pragmaKw", "pragma"]); },
     pragma_assignment: function (print) { return (0, print_utils_1.join)(" = ", print(["name", "value"])); },
     pragma_func_call: function (print) { return print(["name", "args"]); },
-    create_virtual_table_stmt: function (print) {
-        return (0, print_utils_1.join)(print_utils_1.hardline, [
-            print.spaced(["createVirtualTableKw", "ifNotExistsKw", "name"]),
-            print.spaced(["usingKw", "module"]),
-        ]);
-    },
 };

package/dist/syntax/trigger.js

@@ -21,15 +21,20 @@ exports.triggerMap = {
                 "ifNotExistsKw",
                 "name",
             ]),
-            (0, print_utils_1.group)([print("event"), (0, print_utils_1.indent)([print_utils_1.line, print.spaced(["onKw", "table"])])])
+            print("event")
         ], (node.forEachRowKw ? [print.spaced(["forEachRowKw"])] : []), true), (node.condition ? [print(["condition"])] : []), true), [
             print("body"),
         ], false));
     },
-    trigger_event: function (print, node) { return [
-        print.spaced(["timeKw", "eventKw", "ofKw"]),
-        node.columns ? (0, print_utils_1.indent)([print_utils_1.line, print("columns")]) : [],
-    ]; },
+    trigger_event: function (print) {
+        return (0, print_utils_1.group)([
+            print.spaced(["timeKw", "eventKw", "ofKw"]),
+            (0, print_utils_1.indent)([
+                print_utils_1.line,
+                (0, print_utils_1.join)(print_utils_1.line, __spreadArray(__spreadArray([], print(["columns"]), true), [print.spaced(["onKw", "table"])], false)),
+            ]),
+        ]);
+    },
     trigger_condition: function (print) {
         return (0, print_utils_1.group)([print("whenKw"), (0, print_utils_1.indent)([print_utils_1.line, print("expr")])]);
     },

package/package.json

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