prettier-plugin-sql-cst 0.10.0 → 0.10.1

package/dist/syntax/alias.js

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.aliasMap = void 0;
 exports.aliasMap = {
-    alias: function (print) { return print.spaced(["expr", "asKw", "alias"]); },
+    alias: function (print) { return print.spaced(["expr", "asKw", "alias", "columnAliases"]); },
 };

package/dist/syntax/constraint.js

@@ -24,7 +24,7 @@ exports.constraintMap = {
     },
     constraint_default: function (print) { return (0, print_utils_1.group)(print.spaced(["defaultKw", "expr"])); },
     constraint_primary_key: function (print) {
-        return (0, print_utils_1.group)(print.spaced(["primaryKeyKw", "orderKw", "columns", "onConflict"]));
+        return (0, print_utils_1.group)(print.spaced(["primaryKeyKw", "direction", "columns", "onConflict"]));
     },
     constraint_unique: function (print) {
         return (0, print_utils_1.group)(print.spaced(["uniqueKw", "columns", "onConflict"]));

package/dist/syntax/delete.js

@@ -5,6 +5,6 @@ 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", "hints", "fromKw", "tables"]);
+        return print.spaced(["deleteKw", "modifiers", "fromKw", "tables"]);
     },
 };

package/dist/syntax/{bigquery.d.ts → dialects/bigquery.d.ts}

@@ -1,3 +1,3 @@
 import { AllBigqueryNodes } from "sql-parser-cst";
-import { CstToDocMap } from "../CstToDocMap";
+import { CstToDocMap } from "../../CstToDocMap";
 export declare const bigqueryMap: CstToDocMap<AllBigqueryNodes>;

package/dist/syntax/{bigquery.js → dialects/bigquery.js}

@@ -10,7 +10,7 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.bigqueryMap = void 0;
-var print_utils_1 = require("../print_utils");
+var print_utils_1 = require("../../print_utils");
 exports.bigqueryMap = {
     bigquery_options: function (print) { return print.spaced(["optionsKw", "options"]); },
     bigquery_option_default_collate: function (print) {

package/dist/syntax/{mysql.d.ts → dialects/mysql.d.ts}

@@ -1,3 +1,3 @@
 import { AllMysqlNodes } from "sql-parser-cst";
-import { CstToDocMap } from "../CstToDocMap";
+import { CstToDocMap } from "../../CstToDocMap";
 export declare const mysqlMap: CstToDocMap<AllMysqlNodes>;

package/dist/syntax/{mysql.js → dialects/mysql.js}

@@ -2,5 +2,5 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mysqlMap = void 0;
 exports.mysqlMap = {
-    mysql_hint: function (print) { return print.spaced("hintKw"); },
+    mysql_modifier: function (print) { return print.spaced("modifierKw"); },
 };

package/dist/syntax/dialects/postgresql.d.ts

@@ -0,0 +1,3 @@
+import { AllPostgresqlNodes } from "sql-parser-cst";
+import { CstToDocMap } from "../../CstToDocMap";
+export declare const postgresqlMap: Partial<CstToDocMap<AllPostgresqlNodes>>;

package/dist/syntax/dialects/postgresql.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.postgresqlMap = void 0;
+exports.postgresqlMap = {
+    postgresql_operator_expr: function (print) { return print(["operatorKw", "expr"]); },
+    postgresql_operator: function (print) { return print("operator"); },
+};

package/dist/syntax/{sqlite.d.ts → dialects/sqlite.d.ts}

@@ -1,3 +1,3 @@
 import { AllSqliteNodes } from "sql-parser-cst";
-import { CstToDocMap } from "../CstToDocMap";
+import { CstToDocMap } from "../../CstToDocMap";
 export declare const sqliteMap: CstToDocMap<AllSqliteNodes>;

package/dist/syntax/{sqlite.js → dialects/sqlite.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sqliteMap = void 0;
-var print_utils_1 = require("../print_utils");
+var print_utils_1 = require("../../print_utils");
 exports.sqliteMap = {
     attach_database_stmt: function (print) {
         return print.spaced(["attachKw", "databaseKw", "file", "asKw", "schema"]);

package/dist/syntax/expr.d.ts

@@ -1,3 +1,3 @@
 import { AllExprNodes } from "sql-parser-cst";
 import { CstToDocMap } from "../CstToDocMap";
-export declare const exprMap: Partial<CstToDocMap<AllExprNodes>>;
+export declare const exprMap: CstToDocMap<AllExprNodes>;

package/dist/syntax/insert.js

@@ -6,7 +6,7 @@ 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", "hints", "orAction", "intoKw", "table"]),
+            print.spaced(["insertKw", "modifiers", "orAction", "intoKw", "table"]),
             node.columns ? (0, print_utils_1.indent)([print_utils_1.hardline, print("columns")]) : [],
         ]);
     },

package/dist/syntax/select.js

@@ -27,19 +27,51 @@ exports.selectMap = {
             (0, print_utils_1.indent)([print_utils_1.line, print("tables")]),
         ]);
     },
-    common_table_expr: function (print) { return [
+    common_table_expr: function (print, node) { return [
         print(["table", "columns"]),
         " ",
         print.spaced(["asKw", "materializedKw", "expr"]),
+        (0, print_utils_1.group)([
+            node.search || node.cycle
+                ? (0, print_utils_1.indent)([print_utils_1.line, (0, print_utils_1.join)(print_utils_1.line, print(["search", "cycle"]))])
+                : [],
+        ]),
     ]; },
+    cte_search_clause: function (print) {
+        return (0, print_utils_1.group)((0, print_utils_1.join)(print_utils_1.line, [
+            [print.spaced("searchKw"), (0, print_utils_1.group)((0, print_utils_1.indent)([print_utils_1.line, print("columns")]))],
+            print.spaced(["setKw", "resultColumn"]),
+        ]));
+    },
+    cte_cycle_clause: function (print, node) {
+        return (0, print_utils_1.group)((0, print_utils_1.join)(print_utils_1.line, [
+            [print("cycleKw"), (0, print_utils_1.group)((0, print_utils_1.indent)([print_utils_1.line, print("columns")]))],
+            print.spaced(["setKw", "resultColumn"]),
+            node.values ? print("values") : undefined,
+            print.spaced(["usingKw", "pathColumn"]),
+        ].filter(utils_1.isDefined)));
+    },
+    cte_cycle_clause_values: function (print) {
+        return (0, print_utils_1.join)(print_utils_1.line, [
+            print.spaced(["toKw", "markValue"]),
+            print.spaced(["defaultKw", "defaultValue"]),
+        ]);
+    },
     // SELECT clause
     select_clause: function (print, node, path, opts) {
         return (0, print_utils_1.group)([
-            print.spaced(["selectKw", "distinctKw", "hints", "asStructOrValueKw"]),
+            print.spaced(["selectKw", "modifiers"]),
             node.columns ? (0, print_utils_1.indent)([print_utils_1.line, print("columns")]) : [],
             (0, print_utils_1.containsNewline)(node, opts) ? print_utils_1.breakParent : [],
         ]);
     },
+    select_all: function (print) { return print.spaced(["allKw"]); },
+    select_distinct: function (print) { return print.spaced(["distinctKw"]); },
+    select_distinct_on: function (print) {
+        return (0, print_utils_1.group)([print.spaced(["distinctOnKw", "columns"])]);
+    },
+    select_as_struct: function (print) { return print.spaced(["asStructKw"]); },
+    select_as_value: function (print) { return print.spaced(["asValueKw"]); },
     except_columns: function (print) { return print.spaced(["expr", "exceptKw", "columns"]); },
     replace_columns: function (print) { return print.spaced(["expr", "replaceKw", "columns"]); },
     // FROM clause
@@ -68,6 +100,8 @@ exports.selectMap = {
     },
     join_on_specification: function (print) { return (0, print_utils_1.group)(print.spaced(["onKw", "expr"])); },
     join_using_specification: function (print) { return (0, print_utils_1.group)(print.spaced(["usingKw", "expr"])); },
+    table_with_inheritance: function (print) { return [print("table"), " ", "*"]; },
+    table_without_inheritance: function (print) { return print.spaced(["onlyKw", "table"]); },
     indexed_table: function (print) { return print.spaced(["table", "indexedByKw", "index"]); },
     not_indexed_table: function (print) { return print.spaced(["table", "notIndexedKw"]); },
     unnest_expr: function (print) { return print(["unnestKw", "expr"]); },
@@ -97,9 +131,15 @@ exports.selectMap = {
         ]));
     },
     tablesample_expr: function (print) {
-        return (0, print_utils_1.group)([print("left"), print_utils_1.line, print.spaced(["tablesampleKw", "args"])]);
+        return (0, print_utils_1.group)([
+            print("left"),
+            print_utils_1.line,
+            print.spaced(["tablesampleKw", "method", "args", "repeatable"]),
+        ]);
     },
+    tablesample_method: function (print) { return print.spaced(["methodKw"]); },
     tablesample_percent: function (print) { return print.spaced(["percent", "percentKw"]); },
+    tablesample_repeatable: function (print) { return print.spaced(["repeatableKw", "seed"]); },
     for_system_time_as_of_expr: function (print) {
         return (0, print_utils_1.group)([print("left"), print_utils_1.line, print.spaced(["forSystemTimeAsOfKw", "expr"])]);
     },
@@ -108,6 +148,11 @@ exports.selectMap = {
     },
     dual_table: function (print) { return print("dualKw"); },
     lateral_derived_table: function (print) { return print.spaced(["lateralKw", "expr"]); },
+    rows_from_expr: function (print) { return print.spaced(["rowsFromKw", "expr"]); },
+    with_ordinality_expr: function (print) { return print.spaced(["expr", "withOrdinalityKw"]); },
+    func_call_with_column_definitions: function (print) {
+        return print.spaced(["funcCall", "asKw", "columns"]);
+    },
     // WHERE clause
     where_clause: function (print) {
         return (0, print_utils_1.group)([print("whereKw"), (0, print_utils_1.indent)([print_utils_1.line, print("expr")])]);
@@ -125,7 +170,12 @@ exports.selectMap = {
         ]);
     },
     sort_specification: function (print) {
-        return print.spaced(["expr", "orderKw", "nullHandlingKw"]);
+        return print.spaced(["expr", "direction", "nullHandlingKw"]);
+    },
+    sort_direction_asc: function (print) { return print("ascKw"); },
+    sort_direction_desc: function (print) { return print("descKw"); },
+    sort_direction_using_operator: function (print) {
+        return print.spaced(["usingKw", "operator"]);
     },
     // GROUP BY clause
     group_by_clause: function (print, node) {
@@ -140,6 +190,10 @@ exports.selectMap = {
         ]);
     },
     group_by_rollup: function (print) { return print(["rollupKw", "columns"]); },
+    group_by_cube: function (print) { return print(["cubeKw", "columns"]); },
+    group_by_grouping_sets: function (print) {
+        return print.spaced(["groupingSetsKw", "columns"]);
+    },
     // PARTITION BY clause
     partition_by_clause: function (print) {
         return (0, print_utils_1.group)([

package/dist/syntax/transformMap.js

@@ -16,7 +16,6 @@ var alias_1 = require("./alias");
 var alter_table_1 = require("./alter_table");
 var analyze_1 = require("./analyze");
 var base_1 = require("./base");
-var bigquery_1 = require("./bigquery");
 var constraint_1 = require("./constraint");
 var create_table_1 = require("./create_table");
 var data_type_1 = require("./data_type");
@@ -30,7 +29,6 @@ var function_1 = require("./function");
 var index_1 = require("./index");
 var insert_1 = require("./insert");
 var merge_1 = require("./merge");
-var mysql_1 = require("./mysql");
 var prepared_statements_1 = require("./prepared_statements");
 var procedural_language_1 = require("./procedural_language");
 var procedure_1 = require("./procedure");
@@ -38,10 +36,13 @@ var proc_clause_1 = require("./proc_clause");
 var program_1 = require("./program");
 var schema_1 = require("./schema");
 var select_1 = require("./select");
-var sqlite_1 = require("./sqlite");
 var transaction_1 = require("./transaction");
 var trigger_1 = require("./trigger");
 var truncate_1 = require("./truncate");
 var update_1 = require("./update");
 var view_1 = require("./view");
-exports.transformMap = __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, alias_1.aliasMap), alter_table_1.alterTableMap), analyze_1.analyzeMap), base_1.baseMap), bigquery_1.bigqueryMap), constraint_1.constraintMap), create_table_1.createTableMap), data_type_1.dataTypeMap), dcl_1.dclMap), delete_1.deleteMap), drop_table_1.dropTableMap), explain_1.explainMap), expr_1.exprMap), frame_1.frameMap), function_1.functionMap), index_1.indexMap), insert_1.insertMap), merge_1.mergeMap), mysql_1.mysqlMap), prepared_statements_1.preparedStatementsMap), proc_clause_1.procClauseMap), procedural_language_1.proceduralLanguageMap), procedure_1.procedureMap), program_1.programMap), schema_1.schemaMap), select_1.selectMap), sqlite_1.sqliteMap), transaction_1.transactionMap), trigger_1.triggerMap), truncate_1.truncateMap), update_1.updateMap), view_1.viewMap);
+var bigquery_1 = require("./dialects/bigquery");
+var mysql_1 = require("./dialects/mysql");
+var sqlite_1 = require("./dialects/sqlite");
+var postgresql_1 = require("./dialects/postgresql");
+exports.transformMap = __assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, alias_1.aliasMap), alter_table_1.alterTableMap), analyze_1.analyzeMap), base_1.baseMap), constraint_1.constraintMap), create_table_1.createTableMap), data_type_1.dataTypeMap), dcl_1.dclMap), delete_1.deleteMap), drop_table_1.dropTableMap), explain_1.explainMap), expr_1.exprMap), frame_1.frameMap), function_1.functionMap), index_1.indexMap), insert_1.insertMap), merge_1.mergeMap), prepared_statements_1.preparedStatementsMap), proc_clause_1.procClauseMap), procedural_language_1.proceduralLanguageMap), procedure_1.procedureMap), program_1.programMap), schema_1.schemaMap), select_1.selectMap), transaction_1.transactionMap), trigger_1.triggerMap), truncate_1.truncateMap), update_1.updateMap), view_1.viewMap), bigquery_1.bigqueryMap), mysql_1.mysqlMap), postgresql_1.postgresqlMap), sqlite_1.sqliteMap);

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", "hints", "orAction", "tables"]);
+        return print.spaced(["updateKw", "modifiers", "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.10.0",
+  "version": "0.10.1",
   "description": "Prettier plugin for SQL",
   "author": "Rene Saarsoo <nene@triin.net>",
   "license": "GPL-3.0-or-later",
@@ -22,7 +22,8 @@
     "clean": "rm -rf dist",
     "build": "yarn clean && tsc",
     "test": "yarn node --experimental-vm-modules $(yarn bin jest)",
-    "pretty": "prettier -w src/ test/"
+    "pretty": "prettier -w src/ test/",
+    "ts:check": "tsc --noEmit"
   },
   "keywords": [
     "prettier",
@@ -31,7 +32,7 @@
   ],
   "dependencies": {
     "prettier": "^3.0.3",
-    "sql-parser-cst": "^0.20.0"
+    "sql-parser-cst": "^0.21.1"
   },
   "devDependencies": {
     "@types/jest": "^29.2.5",