prettier-plugin-sql-cst 0.12.2 → 0.12.3

package/dist/print_utils.js

@@ -1,4 +1,13 @@
 "use strict";
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.hasEmptyLineBetweenNodes = exports.containsNewline = exports.join = exports.stripTrailingHardline = exports.breakParent = exports.ifBreak = exports.lineSuffix = exports.group = exports.indent = exports.softline = exports.hardline = exports.line = void 0;
@@ -21,9 +30,39 @@ var containsNewline = function (node, opts) {
 };
 exports.containsNewline = containsNewline;
 var hasEmptyLineBetweenNodes = function (node1, node2, opts) {
+    var _a, _b;
     if (!node1.range || !node2.range) {
         throw new Error("emptyLineBetweenNodes() expects Nodes with range info");
     }
-    return /\n[ \t]*\r?\n/.test(opts.originalText.slice(node1.range[1], node2.range[0]));
+    var start = node1.range[1];
+    var end = node2.range[0];
+    var indexes = emptyLineIndexes(opts.originalText.slice(start, end)).map(function (i) { return start + i; });
+    // when no empty lines between nodes, we can return early
+    if (indexes.length === 0) {
+        return false;
+    }
+    // otherwise we need to check whether the empty line happens to be
+    // inside a comment or between comments
+    var comments = __spreadArray(__spreadArray([], ((_a = node1.trailing) !== null && _a !== void 0 ? _a : []), true), ((_b = node2.leading) !== null && _b !== void 0 ? _b : []), true);
+    return (indexes.filter(function (index) { return !isIndexInsideOrBetweenComments(index, comments); })
+        .length > 0);
 };
 exports.hasEmptyLineBetweenNodes = hasEmptyLineBetweenNodes;
+function emptyLineIndexes(text) {
+    var indexes = [];
+    var re = /\n[ \t]*\r?\n/g;
+    var match;
+    while ((match = re.exec(text))) {
+        indexes.push(match.index);
+    }
+    return indexes;
+}
+function isIndexInsideOrBetweenComments(index, comments) {
+    if (comments.length === 0) {
+        return false;
+    }
+    // Assume all nodes have range info
+    var start = comments[0].range[0];
+    var end = comments[comments.length - 1].range[1];
+    return start <= index && index <= end;
+}

package/dist/syntax/policy.d.ts

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

package/dist/syntax/policy.js

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.policyMap = void 0;
+var print_utils_1 = require("../print_utils");
+exports.policyMap = {
+    create_policy_stmt: function (print, node) {
+        return (0, print_utils_1.group)([
+            print.spaced(["createPolicyKw", "name", "onKw", "table"]),
+            node.clauses.length > 0 ? print.dynamicLine() : [],
+            (0, print_utils_1.join)(print.dynamicLine(), print("clauses")),
+        ]);
+    },
+    policy_permissive_clause: function (print) {
+        return (0, print_utils_1.group)(print.spaced(["asKw", "permissiveKw"]));
+    },
+    policy_restrictive_clause: function (print) {
+        return (0, print_utils_1.group)(print.spaced(["asKw", "restrictiveKw"]));
+    },
+    policy_command_clause: function (print) { return (0, print_utils_1.group)(print.spaced(["forKw", "commandKw"])); },
+    policy_roles_clause: function (print) { return (0, print_utils_1.group)(print.spaced(["toKw", "roles"])); },
+    policy_using_clause: function (print) { return (0, print_utils_1.group)(print.spaced(["usingKw", "expr"])); },
+    policy_check_clause: function (print) {
+        return (0, print_utils_1.group)(print.spaced(["withKw", "checkKw", "expr"]));
+    },
+    alter_policy_stmt: function (print) {
+        return (0, print_utils_1.group)([
+            print.spaced(["alterPolicyKw", "name", "onKw", "table"]),
+            print.dynamicLine(),
+            (0, print_utils_1.join)(print.dynamicLine(), print("actions")),
+        ]);
+    },
+    drop_policy_stmt: function (print) {
+        return (0, print_utils_1.group)(print.spaced([
+            "dropPolicyKw",
+            "ifExistsKw",
+            "name",
+            "onKw",
+            "table",
+            "behaviorKw",
+        ]));
+    },
+};

package/dist/syntax/transformMap.js

@@ -34,6 +34,7 @@ var merge_1 = require("./merge");
 var other_clauses_1 = require("./other_clauses");
 var rename_table_1 = require("./rename_table");
 var role_1 = require("./role");
+var policy_1 = require("./policy");
 var prepared_statements_1 = require("./prepared_statements");
 var procedural_language_1 = require("./procedural_language");
 var procedure_1 = require("./procedure");
@@ -53,4 +54,4 @@ 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(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, alias_1.aliasMap), alter_action_1.alterActionMap), 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), domain_1.domainMap), 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), other_clauses_1.otherClausesMap), prepared_statements_1.preparedStatementsMap), proc_clause_1.procClauseMap), procedural_language_1.proceduralLanguageMap), procedure_1.procedureMap), program_1.programMap), rename_table_1.renameTableMap), role_1.roleMap), schema_1.schemaMap), select_1.selectMap), sequence_1.sequenceMap), transaction_1.transactionMap), trigger_1.triggerMap), truncate_1.truncateMap), type_1.typeMap), unsupported_grammar_1.unsupportedGrammarMap), update_1.updateMap), view_1.viewMap), bigquery_1.bigqueryMap), mysql_1.mysqlMap), postgresql_1.postgresqlMap), sqlite_1.sqliteMap);
+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(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign(__assign({}, alias_1.aliasMap), alter_action_1.alterActionMap), 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), domain_1.domainMap), 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), other_clauses_1.otherClausesMap), policy_1.policyMap), prepared_statements_1.preparedStatementsMap), proc_clause_1.procClauseMap), procedural_language_1.proceduralLanguageMap), procedure_1.procedureMap), program_1.programMap), rename_table_1.renameTableMap), role_1.roleMap), schema_1.schemaMap), select_1.selectMap), sequence_1.sequenceMap), transaction_1.transactionMap), trigger_1.triggerMap), truncate_1.truncateMap), type_1.typeMap), unsupported_grammar_1.unsupportedGrammarMap), update_1.updateMap), view_1.viewMap), bigquery_1.bigqueryMap), mysql_1.mysqlMap), postgresql_1.postgresqlMap), sqlite_1.sqliteMap);

package/dist/transform/comments.d.ts

@@ -3,7 +3,9 @@ import { Program, Whitespace } from "sql-parser-cst";
  * Gathers comments from .leading and .trailing fields of all nodes
  * into a single .comments field in root Program node.
  *
- * Deletes the .leading and .trailing fields of all nodes.
+ * Previously this also deleted all .leading and .trailing fields,
+ * but we need this info to check whether the empty lines between nodes
+ * are perhaps inside comments (see hasEmptyLineBetweenNodes()).
  */
 export declare const moveCommentsToRoot: (cst: Program) => Program & {
     comments: Whitespace[];

package/dist/transform/comments.js

@@ -26,7 +26,9 @@ var visitAllNodes_1 = require("../visitAllNodes");
  * Gathers comments from .leading and .trailing fields of all nodes
  * into a single .comments field in root Program node.
  *
- * Deletes the .leading and .trailing fields of all nodes.
+ * Previously this also deleted all .leading and .trailing fields,
+ * but we need this info to check whether the empty lines between nodes
+ * are perhaps inside comments (see hasEmptyLineBetweenNodes()).
  */
 var moveCommentsToRoot = function (cst) {
     return __assign(__assign({}, cst), { comments: extractComments(cst) });
@@ -36,8 +38,6 @@ var extractComments = function (cst) {
     var comments = [];
     (0, visitAllNodes_1.visitAllNodes)(cst, function (node) {
         comments.push.apply(comments, __spreadArray(__spreadArray([], (node.leading || []), false), (node.trailing || []), false));
-        delete node.leading;
-        delete node.trailing;
     });
     return comments;
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-sql-cst",
-  "version": "0.12.2",
+  "version": "0.12.3",
   "description": "Prettier plugin for SQL",
   "contributors": [
     "Barna Magyarkuti <bmagyarkuti@gmail.com>",
@@ -37,7 +37,7 @@
   ],
   "dependencies": {
     "prettier": "^3.0.3",
-    "sql-parser-cst": "^0.32.0"
+    "sql-parser-cst": "^0.33.0"
   },
   "devDependencies": {
     "@types/jest": "^29.2.5",