prettier-plugin-sql-cst 0.18.0 → 0.19.1

package/dist/transform/canonicKeywords.js

@@ -1,12 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.canonicKeywords = void 0;
-var sql_parser_cst_1 = require("sql-parser-cst");
-var transformUtils_1 = require("./transformUtils");
-var canonicKeywords = function (cst) {
-    (0, sql_parser_cst_1.cstVisitor)({
+import { cstVisitor } from "sql-parser-cst";
+import { keyword } from "./transformUtils";
+export const canonicKeywords = (cst) => {
+    cstVisitor({
         // Replaces TEMP with TEMPORARY
-        relation_kind: function (node) {
+        relation_kind: (node) => {
             if (Array.isArray(node.kindKw)) {
                 // TODO...
             }
@@ -18,14 +15,14 @@ var canonicKeywords = function (cst) {
             }
         },
         // Replaces MySQL SELECT DISTINCTROW with SELECT DISTINCT
-        select_distinct: function (node) {
+        select_distinct: (node) => {
             if (node.distinctKw.name === "DISTINCTROW") {
                 node.distinctKw.name = "DISTINCT";
                 node.distinctKw.text = "DISTINCT";
             }
         },
         // Replaces RENAME & RENAME AS with RENAME TO
-        alter_action_rename: function (node) {
+        alter_action_rename: (node) => {
             if (Array.isArray(node.renameKw)) {
                 if (node.renameKw[1].name === "AS") {
                     node.renameKw[1].name = "TO";
@@ -33,34 +30,33 @@ var canonicKeywords = function (cst) {
                 }
             }
             else {
-                node.renameKw = [node.renameKw, (0, transformUtils_1.keyword)("TO")];
+                node.renameKw = [node.renameKw, keyword("TO")];
             }
         },
         // Replaces INSERT with INSERT INTO
-        insert_clause: function (node) {
+        insert_clause: (node) => {
             if (!node.intoKw) {
-                node.intoKw = (0, transformUtils_1.keyword)("INTO");
+                node.intoKw = keyword("INTO");
             }
         },
         // Replaces MERGE with MERGE INTO
-        merge_clause: function (node) {
+        merge_clause: (node) => {
             if (!node.intoKw) {
-                node.intoKw = (0, transformUtils_1.keyword)("INTO");
+                node.intoKw = keyword("INTO");
             }
         },
         // Replaces DELETE with DELETE FROM
-        delete_clause: function (node) {
+        delete_clause: (node) => {
             if (!node.fromKw) {
-                node.fromKw = (0, transformUtils_1.keyword)("FROM");
+                node.fromKw = keyword("FROM");
             }
         },
         // Replaces TRUNCATE with TRUNCATE TABLE
-        truncate_stmt: function (node) {
+        truncate_stmt: (node) => {
             if (!node.tableKw) {
-                node.tableKw = (0, transformUtils_1.keyword)("TABLE");
+                node.tableKw = keyword("TABLE");
             }
         },
     })(cst);
     return cst;
 };
-exports.canonicKeywords = canonicKeywords;

package/dist/transform/canonicOperators.js

@@ -1,11 +1,8 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.canonicOperators = void 0;
-var sql_parser_cst_1 = require("sql-parser-cst");
-var transformUtils_1 = require("./transformUtils");
-var canonicOperators = function (cst, originalText, options) {
-    (0, sql_parser_cst_1.cstVisitor)({
-        binary_expr: function (node) {
+import { cstVisitor } from "sql-parser-cst";
+import { keyword } from "./transformUtils";
+export const canonicOperators = (cst, originalText, options) => {
+    cstVisitor({
+        binary_expr: (node) => {
             // Replaces <> operator with !=
             if (node.operator === "<>") {
                 node.operator = "!=";
@@ -13,15 +10,15 @@ var canonicOperators = function (cst, originalText, options) {
             // Replace MySQL && and || operators with AND and OR
             if (options.parser === "mysql" || options.parser === "mariadb") {
                 if (node.operator === "&&") {
-                    node.operator = (0, transformUtils_1.keyword)("AND");
+                    node.operator = keyword("AND");
                 }
                 if (node.operator === "||") {
-                    node.operator = (0, transformUtils_1.keyword)("OR");
+                    node.operator = keyword("OR");
                 }
             }
         },
         // Replaces PostgreSQL deprecated := operator with =>
-        named_arg: function (node) {
+        named_arg: (node) => {
             if (node.operator === ":=") {
                 node.operator = "=>";
             }
@@ -29,4 +26,3 @@ var canonicOperators = function (cst, originalText, options) {
     })(cst);
     return cst;
 };
-exports.canonicOperators = canonicOperators;

package/dist/transform/comments.js

@@ -1,27 +1,4 @@
-"use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
-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));
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.moveCommentsToRoot = void 0;
-var visitAllNodes_1 = require("../visitAllNodes");
+import { visitAllNodes } from "../visitAllNodes";
 /**
  * Gathers comments from .leading and .trailing fields of all nodes
  * into a single .comments field in root Program node.
@@ -30,14 +7,16 @@ var visitAllNodes_1 = require("../visitAllNodes");
  * 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) });
+export const moveCommentsToRoot = (cst) => {
+    return {
+        ...cst,
+        comments: extractComments(cst),
+    };
 };
-exports.moveCommentsToRoot = moveCommentsToRoot;
-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));
+const extractComments = (cst) => {
+    const comments = [];
+    visitAllNodes(cst, (node) => {
+        comments.push(...(node.leading || []), ...(node.trailing || []));
     });
     return comments;
 };

package/dist/transform/stripTrailingCommas.js

@@ -1,19 +1,15 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.stripTrailingCommas = void 0;
-var sql_parser_cst_1 = require("sql-parser-cst");
-var node_utils_1 = require("../node_utils");
-var utils_1 = require("../utils");
+import { cstVisitor } from "sql-parser-cst";
+import { isEmpty } from "../node_utils";
+import { last } from "../utils";
 // Removes trailing comma from SELECT clauses
-var stripTrailingCommas = function (cst) {
+export const stripTrailingCommas = (cst) => {
     // Trailing comma is represented as an empty element at the end of column list
-    (0, sql_parser_cst_1.cstVisitor)({
-        select_clause: function (node) {
-            if (node.columns && (0, node_utils_1.isEmpty)((0, utils_1.last)(node.columns.items))) {
+    cstVisitor({
+        select_clause: (node) => {
+            if (node.columns && isEmpty(last(node.columns.items))) {
                 node.columns.items = node.columns.items.slice(0, -1);
             }
         },
     })(cst);
     return cst;
 };
-exports.stripTrailingCommas = stripTrailingCommas;

package/dist/transform/transformCst.js

@@ -1,25 +1,21 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.transformCst = void 0;
-var comments_1 = require("./comments");
-var aliasAs_1 = require("./aliasAs");
-var stripTrailingCommas_1 = require("./stripTrailingCommas");
-var addFinalSemicolon_1 = require("./addFinalSemicolon");
-var canonicKeywords_1 = require("./canonicKeywords");
-var canonicOperators_1 = require("./canonicOperators");
-var transformCst = function (cst, originalText, options) {
-    var transforms = [
+import { moveCommentsToRoot } from "./comments";
+import { processAliasAs } from "./aliasAs";
+import { stripTrailingCommas } from "./stripTrailingCommas";
+import { addFinalSemicolon } from "./addFinalSemicolon";
+import { canonicKeywords } from "./canonicKeywords";
+import { canonicOperators } from "./canonicOperators";
+export const transformCst = (cst, originalText, options) => {
+    const transforms = [
         // Note that we first perform moveCommentsToRoot transform,
         // so we don't need to worry about comments interfering with other transforms
-        comments_1.moveCommentsToRoot,
-        stripTrailingCommas_1.stripTrailingCommas,
+        moveCommentsToRoot,
+        stripTrailingCommas,
     ];
     if (options.sqlFinalSemicolon) {
-        transforms.push(addFinalSemicolon_1.addFinalSemicolon);
+        transforms.push(addFinalSemicolon);
     }
     if (options.sqlCanonicalSyntax) {
-        transforms.push(aliasAs_1.processAliasAs, canonicOperators_1.canonicOperators, canonicKeywords_1.canonicKeywords);
+        transforms.push(processAliasAs, canonicOperators, canonicKeywords);
     }
-    return transforms.reduce(function (cst, transform) { return transform(cst, originalText, options); }, cst);
+    return transforms.reduce((cst, transform) => transform(cst, originalText, options), cst);
 };
-exports.transformCst = transformCst;

package/dist/transform/transformUtils.js

@@ -1,7 +1,3 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.keyword = void 0;
-function keyword(name) {
-    return { type: "keyword", name: name, text: name };
+export function keyword(name) {
+    return { type: "keyword", name, text: name };
 }
-exports.keyword = keyword;

package/dist/utils.js

@@ -1,30 +1,9 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.last = exports.arrayWrap = exports.isNode = exports.isEmptyArray = exports.isArray = exports.isObject = exports.isString = exports.isDefined = void 0;
-var isDefined = function (value) {
-    return value !== undefined;
-};
-exports.isDefined = isDefined;
-var isString = function (value) {
-    return typeof value === "string";
-};
-exports.isString = isString;
-var isObject = function (x) {
-    return typeof x === "object" && x !== null && !(x instanceof Array);
-};
-exports.isObject = isObject;
-var isArray = function (x) { return Array.isArray(x); };
-exports.isArray = isArray;
-var isEmptyArray = function (x) { return (0, exports.isArray)(x) && x.length === 0; };
-exports.isEmptyArray = isEmptyArray;
-var isNode = function (value) {
-    return (0, exports.isObject)(value) && (0, exports.isString)(value.type) && !isCommentType(value.type);
-};
-exports.isNode = isNode;
-var isCommentType = function (type) {
-    return type === "block_comment" || type === "line_comment";
-};
-var arrayWrap = function (x) { return ((0, exports.isArray)(x) ? x : [x]); };
-exports.arrayWrap = arrayWrap;
-var last = function (arr) { return arr[arr.length - 1]; };
-exports.last = last;
+export const isDefined = (value) => value !== undefined;
+export const isString = (value) => typeof value === "string";
+export const isObject = (x) => typeof x === "object" && x !== null && !(x instanceof Array);
+export const isArray = (x) => Array.isArray(x);
+export const isEmptyArray = (x) => isArray(x) && x.length === 0;
+export const isNode = (value) => isObject(value) && isString(value.type) && !isCommentType(value.type);
+const isCommentType = (type) => type === "block_comment" || type === "line_comment";
+export const arrayWrap = (x) => (isArray(x) ? x : [x]);
+export const last = (arr) => arr[arr.length - 1];

package/dist/visitAllNodes.js

@@ -1,21 +1,16 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.visitAllNodes = void 0;
-var utils_1 = require("./utils");
+import { isArray, isNode } from "./utils";
 /* Executes a function with all nodes in syntax tree */
-var visitAllNodes = function (node, visit) {
+export const visitAllNodes = (node, visit) => {
     visit(node);
     // Visit all children
-    for (var _i = 0, _a = Object.values(node); _i < _a.length; _i++) {
-        var child = _a[_i];
-        if ((0, utils_1.isNode)(child)) {
-            (0, exports.visitAllNodes)(child, visit);
+    for (const child of Object.values(node)) {
+        if (isNode(child)) {
+            visitAllNodes(child, visit);
         }
-        else if ((0, utils_1.isArray)(child)) {
+        else if (isArray(child)) {
             child
-                .filter(utils_1.isNode)
-                .forEach(function (childNode) { return (0, exports.visitAllNodes)(childNode, visit); });
+                .filter(isNode)
+                .forEach((childNode) => visitAllNodes(childNode, visit));
         }
     }
 };
-exports.visitAllNodes = visitAllNodes;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-sql-cst",
-  "version": "0.18.0",
+  "version": "0.19.1",
   "description": "Prettier plugin for SQL",
   "contributors": [
     "Barna Magyarkuti <bmagyarkuti@gmail.com>",
@@ -25,11 +25,11 @@
   "scripts": {
     "prepublishOnly": "yarn analyze-field-access && yarn test && yarn build",
     "clean": "rm -rf dist",
-    "build": "yarn clean && tsc",
+    "build": "yarn clean && tsc -p tsconfig.build.json",
     "test": "yarn node --experimental-vm-modules $(yarn bin jest)",
     "pretty": "prettier -w src/ test/",
     "ts:check": "tsc --noEmit",
-    "analyze-field-access": "ts-node scripts/analyze-field-access.ts src/index.ts"
+    "analyze-field-access": "tsx scripts/analyze-field-access.ts src/index.ts"
   },
   "keywords": [
     "prettier",
@@ -38,16 +38,17 @@
   ],
   "dependencies": {
     "prettier": "^3.0.3",
-    "sql-parser-cst": "^0.38.2"
+    "sql-parser-cst": "^0.39.0"
   },
   "devDependencies": {
-    "@types/jest": "^29.2.5",
+    "@types/jest": "^30.0.0",
     "@types/node": "^22.9.0",
     "chalk": "^4.1.2",
     "dedent-js": "^1.0.1",
-    "jest": "^29.7.0",
-    "ts-jest": "^29.1.1",
+    "jest": "^30.3.0",
+    "ts-jest": "^29.4.9",
     "ts-node": "^10.9.2",
-    "typescript": "^4.9.4"
+    "tsx": "^4.21.0",
+    "typescript": "^5.9.3"
   }
 }