prettier-plugin-sql-cst 0.21.0 → 0.22.1

package/README.md

@@ -119,6 +119,7 @@ The plugin provides the following parsers:
 - `sqlite`
 - `bigquery`
 - `postgresql` (**experimental! expect crashes**)
+- `plpgsql` (**experimental! expect crashes**)
 - `mysql` (**experimental! expect crashes**)
 - `mariadb` (**experimental! expect crashes**)
 
@@ -210,17 +211,6 @@ There are also several SQL-specific options:
 
   _Since 0.13.0_
 
-- **`sqlAcceptUnsupportedGrammar`**: `boolean` (default `false`)
-
-  Normally when the plugin encounters SQL syntax it doesn't support
-  it will throw an error and won't format anything at all.
-  With this option enabled, it will skip over SQL statements it doesn't recognize, leaving them as-is.
-
-  **Deprecated:** Use conditional comments `/* sql-parser-cst-disable */` and
-  `/* sql-parser-cst-enable */` instead.
-
-  _Since 0.12.0_
-
 - **`sqlExperimentalPlpgsql`**: `boolean` (default `false`)
 
   When enabled, the plugin will attempt to format PL/pgSQL function bodies.
@@ -269,6 +259,7 @@ Currently this plugin supports two SQL dialects:
 It also has experimental support for the following dialects:
 
 - PostgreSQL
+- PL/pgSQL
 - MySQL
 - MariaDB
 

package/dist/index.d.ts

@@ -10,7 +10,6 @@ interface SqlPluginOptions {
     sqlParamTypes: NonNullable<ParserOptions["paramTypes"]>;
     sqlCanonicalSyntax: boolean;
     sqlFinalSemicolon: boolean;
-    sqlAcceptUnsupportedGrammar: boolean;
     sqlExperimentalPlpgsql: boolean;
 }
 declare const options: SupportOptions;

package/dist/index.js

@@ -1082,6 +1082,11 @@ var otherClausesMap = {
   cluster_by_clause: (print) => group([print.spaced("clusterByKw"), indent([line, print("columns")])]),
   // RETURNING clause
   returning_clause: (print) => group([print("returningKw"), indent([line, print("columns")])]),
+  // INTO clause
+  into_variables_clause: (print) => group([
+    print.spaced(["intoKw", "strictKw"]),
+    indent([line, print("variables")])
+  ]),
   as_clause: (print, node) => {
     if (isStringLiteral(node.expr) || isDynamicallyLoadedFunction(node.expr)) {
       return group(print.spaced(["asKw", "expr"]));
@@ -1200,7 +1205,6 @@ var preparedStatementsMap = {
     print("executeKw"),
     indent([line, print.separated(line, ["expr", "using"])])
   ]),
-  execute_into_clause: (print) => print.spaced(["intoKw", "variables"]),
   execute_using_clause: (print) => group([print("usingKw"), indent([line, print("values")])]),
   // PREPARE
   prepare_stmt: (print) => group(
@@ -1227,11 +1231,8 @@ var proceduralLanguageMap = {
   chevron_label: (print) => ["<<", print("label"), ">>"],
   // BEGIN .. END
   block_stmt: (print, node) => group([
-    stripTrailingHardline(print("declareClause")),
-    [
-      node.declareClause ? hardline : [],
-      print.spaced(["beginKw", "atomicKw"])
-    ],
+    stripTrailingHardline(print("declare")),
+    [node.declare ? hardline : [], print.spaced(["beginKw", "atomicKw"])],
     node.program.statements.length > 0 ? indent([hardline, stripTrailingHardline(print("program"))]) : print("program"),
     node.exception ? [hardline, print("exception")] : [],
     hardline,
@@ -1247,6 +1248,7 @@ var proceduralLanguageMap = {
     ])
   ),
   declare_init: (print) => print.spaced(["operator", "expr"]),
+  declare_alias_stmt: (print) => group(print.spaced(["newName", "aliasForKw", "oldName"])),
   // EXCEPTION
   exception_clause: (print, node) => {
     if (node.clauses.length === 1) {
@@ -1707,7 +1709,6 @@ var selectMap = {
   },
   // INTO clause
   into_table_clause: (print) => print.spaced(["intoKw", "kind", "tableKw", "name"]),
-  into_variables_clause: (print) => group([print("intoKw"), indent([line, print("variables")])]),
   into_dumpfile_clause: (print) => print.spaced(["intoDumpfileKw", "filename"]),
   into_outfile_clause: (print, node) => {
     const hasOptions = node.charset || node.fields || node.lines;
@@ -1904,11 +1905,6 @@ var typeMap = {
   drop_type_stmt: (print) => group(print.spaced(["dropTypeKw", "ifExistsKw", "types", "behaviorKw"]))
 };
 
-// src/syntax/unsupported_grammar.ts
-var unsupportedGrammarMap = {
-  unsupported_grammar_stmt: (print) => group(print("text"))
-};
-
 // src/syntax/update.ts
 var updateMap = {
   update_stmt: (print) => group(join(print.dynamicLine(), print("clauses"))),
@@ -2142,7 +2138,6 @@ var transformMap = {
   ...triggerMap,
   ...truncateMap,
   ...typeMap,
-  ...unsupportedGrammarMap,
   ...updateMap,
   ...viewMap,
   ...bigqueryMap,
@@ -2204,10 +2199,10 @@ function printNode(path, options2, print) {
 var printComment = (path) => {
   const node = path.node;
   if (node.type === "line_comment") {
-    if (/^--[^ \t]/.test(node.text)) {
+    if (/^--[^ \t-]/.test(node.text)) {
       return node.text.replace(/^--/, "-- ");
     }
-    if (/^#[^ \t!]/.test(node.text)) {
+    if (/^#[^ \t!#]/.test(node.text)) {
       return node.text.replace(/^#/, "# ");
     }
   }
@@ -2648,13 +2643,6 @@ var options = {
     description: "Enforces a semicolon at the end of last SQL statement"
     // Since 0.13.0
   },
-  sqlAcceptUnsupportedGrammar: {
-    type: "boolean",
-    category: "SQL",
-    default: false,
-    description: "Skips formatting unsupported SQL statements instead of exiting with an error"
-    // Since 0.12.0
-  },
   sqlExperimentalPlpgsql: {
     type: "boolean",
     category: "SQL",
@@ -2704,8 +2692,7 @@ var createParser = (dialect) => ({
       includeRange: true,
       includeComments: true,
       filename: options2.filepath,
-      paramTypes: options2.sqlParamTypes,
-      acceptUnsupportedGrammar: options2.sqlAcceptUnsupportedGrammar
+      paramTypes: options2.sqlParamTypes
     }),
     text,
     options2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-sql-cst",
-  "version": "0.21.0",
+  "version": "0.22.1",
   "description": "Prettier plugin for SQL",
   "contributors": [
     "Barna Magyarkuti <bmagyarkuti@gmail.com>",
@@ -39,7 +39,7 @@
   ],
   "dependencies": {
     "prettier": "^3.0.3",
-    "sql-parser-cst": "^0.41.2"
+    "sql-parser-cst": "^0.42.0"
   },
   "devDependencies": {
     "@types/jest": "^30.0.0",