prettier-plugin-sql-cst 0.8.3 → 0.9.1

package/README.md

@@ -3,8 +3,6 @@
 A [Prettier][] plugin for SQL that uses [sql-parser-cst][] and the
 actual [Prettier formatting algorithm][wadler-prettier].
 
-**Note:** This plugin only works with Prettier 2.x. It doesn't yet support the latest Prettier 3.x.
-
 **[Try it live!][live]**
 
 Like Prettier for JavaScript,

package/dist/embedJs.js

@@ -10,31 +10,77 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.embedJs = void 0;
 var node_utils_1 = require("./node_utils");
 var print_utils_1 = require("./print_utils");
-var embedJs = function (path, print, textToDoc, options) {
-    var node = path.getValue();
+var embedJs = function (path, options) {
+    var node = path.getValue(); // TODO: Don't use deprecated method
     var parent = path.getParentNode(0);
     var grandParent = path.getParentNode(1);
     if ((0, node_utils_1.isStringLiteral)(node) &&
         (0, node_utils_1.isAsClause)(parent) &&
         (0, node_utils_1.isCreateFunctionStmt)(grandParent) &&
         grandParent.clauses.some(isJavaScriptLanguageClause)) {
-        var quotes = detectQuotes(node.value);
-        if (!quotes) {
-            // Give up for now. Don't format JavaScript inside the string.
-            // Perhaps tackle this corner-case in the future.
-            return null;
-        }
-        var js = textToDoc(node.value, __assign(__assign({}, options), { parser: "babel" }));
-        return [
-            quotes[0],
-            (0, print_utils_1.indent)([print_utils_1.hardline, (0, print_utils_1.stripTrailingHardline)(js)]),
-            print_utils_1.hardline,
-            quotes[1],
-        ];
+        return function (textToDoc) { return __awaiter(void 0, void 0, void 0, function () {
+            var quotes, js;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        quotes = detectQuotes(node.value);
+                        if (!quotes) {
+                            // Give up for now. Don't format JavaScript inside the string.
+                            // Perhaps tackle this corner-case in the future.
+                            return [2 /*return*/, undefined];
+                        }
+                        return [4 /*yield*/, textToDoc(node.value, __assign(__assign({}, options), { parser: "babel" }))];
+                    case 1:
+                        js = _a.sent();
+                        return [2 /*return*/, [
+                                quotes[0],
+                                (0, print_utils_1.indent)([print_utils_1.hardline, (0, print_utils_1.stripTrailingHardline)(js)]),
+                                print_utils_1.hardline,
+                                quotes[1],
+                            ]];
+                }
+            });
+        }); };
     }
     return null;
 };

package/dist/embedJson.js

@@ -10,29 +10,75 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __generator = (this && this.__generator) || function (thisArg, body) {
+    var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
+    return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
+    function verb(n) { return function (v) { return step([n, v]); }; }
+    function step(op) {
+        if (f) throw new TypeError("Generator is already executing.");
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
+            if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+            if (y = 0, t) op = [op[0] & 2, t.value];
+            switch (op[0]) {
+                case 0: case 1: t = op; break;
+                case 4: _.label++; return { value: op[1], done: false };
+                case 5: _.label++; y = op[1]; op = [0]; continue;
+                case 7: op = _.ops.pop(); _.trys.pop(); continue;
+                default:
+                    if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
+                    if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
+                    if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
+                    if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
+                    if (t[2]) _.ops.pop();
+                    _.trys.pop(); continue;
+            }
+            op = body.call(thisArg, _);
+        } catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
+        if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
+    }
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.embedJson = void 0;
 var node_utils_1 = require("./node_utils");
 var print_utils_1 = require("./print_utils");
-var embedJson = function (path, print, textToDoc, options) {
-    var node = path.getValue();
+var embedJson = function (path, options) {
+    var node = path.getValue(); // TODO: Don't use deprecated method
     var parent = path.getParentNode();
     if ((0, node_utils_1.isStringLiteral)(node) && (0, node_utils_1.isJsonLiteral)(parent)) {
-        if (containsTripleQuote(node.value) ||
-            containsBackslash(node.value) ||
-            isRawString(node)) {
-            // Give up for now. Don't format JSON inside the string.
-            // Tackle these corner-case in the future.
-            return null;
-        }
-        var json = textToDoc(node.value, __assign(__assign({}, options), { parser: "json" }));
-        var inlineQuote = containsSingleQuote(node.value) ? "'''" : "'";
-        return [
-            (0, print_utils_1.ifBreak)("'''", inlineQuote),
-            (0, print_utils_1.indent)([print_utils_1.softline, (0, print_utils_1.stripTrailingHardline)(json)]),
-            print_utils_1.softline,
-            (0, print_utils_1.ifBreak)("'''", inlineQuote),
-        ];
+        return function (textToDoc) { return __awaiter(void 0, void 0, void 0, function () {
+            var json, inlineQuote;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        if (containsTripleQuote(node.value) ||
+                            containsBackslash(node.value) ||
+                            isRawString(node)) {
+                            // Give up for now. Don't format JSON inside the string.
+                            // Tackle these corner-case in the future.
+                            return [2 /*return*/, undefined];
+                        }
+                        return [4 /*yield*/, textToDoc(node.value, __assign(__assign({}, options), { parser: "json" }))];
+                    case 1:
+                        json = _a.sent();
+                        inlineQuote = containsSingleQuote(node.value) ? "'''" : "'";
+                        return [2 /*return*/, [
+                                (0, print_utils_1.ifBreak)("'''", inlineQuote),
+                                (0, print_utils_1.indent)([print_utils_1.softline, (0, print_utils_1.stripTrailingHardline)(json)]),
+                                print_utils_1.softline,
+                                (0, print_utils_1.ifBreak)("'''", inlineQuote),
+                            ]];
+                }
+            });
+        }); };
     }
     return null;
 };

package/dist/index.d.ts

@@ -1,6 +1,7 @@
 import { Node } from "sql-parser-cst";
 import { Parser, Printer, SupportLanguage } from "prettier";
 export { options } from "./options";
+export type { SqlPluginOptions } from "./options";
 export declare const languages: SupportLanguage[];
 export declare const parsers: Record<string, Parser<Node>>;
 export declare const printers: Record<string, Printer>;

package/dist/index.js

@@ -22,7 +22,7 @@ exports.languages = [
     },
 ];
 var createParser = function (dialect) { return ({
-    parse: function (text, parsers, options) {
+    parse: function (text, options) {
         return (0, transformCst_1.transformCst)((0, sql_parser_cst_1.parse)(text, {
             dialect: dialect,
             includeRange: true,

package/dist/options.js

@@ -5,25 +5,33 @@ exports.options = {
     sqlKeywordCase: {
         type: "choice",
         category: "SQL",
-        since: "0.1.0",
         default: "upper",
         description: "Enforces upper/lower case for SQL keywords",
         choices: [
             {
                 value: "preserve",
                 description: "preserves the existing case",
+                since: "0.1.0",
+            },
+            {
+                value: "upper",
+                description: "forces all keywords to uppercase",
+                since: "0.1.0",
+            },
+            {
+                value: "lower",
+                description: "forces all keywords to lowercase",
+                since: "0.1.0",
             },
-            { value: "upper", description: "forces all keywords to uppercase" },
-            { value: "lower", description: "forces all keywords to lowercase" },
         ],
     },
     sqlParamTypes: {
         type: "string",
         array: true,
         category: "SQL",
-        since: "0.7.0",
         default: [{ value: [] }],
         description: "Syntax for bound parameters",
+        // Since 0.7.0
         // Possible values in array: "?" | "?nr" | ":name" | "$name" | "@name"
     },
 };

package/dist/print_utils.d.ts

@@ -1,6 +1,6 @@
 import { Doc, doc } from "prettier";
 import { Node } from "sql-parser-cst";
-export declare const line: doc.builders.Line, hardline: doc.builders.Concat, softline: doc.builders.Softline, indent: typeof doc.builders.indent, group: typeof doc.builders.group, lineSuffix: typeof doc.builders.lineSuffix, ifBreak: typeof doc.builders.ifBreak, breakParent: doc.builders.BreakParent;
+export declare const line: doc.builders.Line, hardline: doc.builders.Hardline, softline: doc.builders.Softline, indent: typeof doc.builders.indent, group: typeof doc.builders.group, lineSuffix: typeof doc.builders.lineSuffix, ifBreak: typeof doc.builders.ifBreak, breakParent: doc.builders.BreakParent;
 export declare const stripTrailingHardline: typeof doc.utils.stripTrailingHardline;
 /** Improved join() that also accepts a non-array docs parameter */
 export declare const join: (sep: Doc, docs: Doc) => Doc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "prettier-plugin-sql-cst",
-  "version": "0.8.3",
+  "version": "0.9.1",
   "description": "Prettier plugin for SQL",
   "author": "Rene Saarsoo <nene@triin.net>",
   "license": "GPL-3.0-or-later",
@@ -21,7 +21,8 @@
     "prepublishOnly": "yarn test && yarn build",
     "clean": "rm -rf dist",
     "build": "yarn clean && tsc",
-    "test": "jest"
+    "test": "yarn node --experimental-vm-modules $(yarn bin jest)",
+    "pretty": "prettier -w src/"
   },
   "keywords": [
     "prettier",
@@ -29,14 +30,14 @@
     "plugin"
   ],
   "dependencies": {
-    "prettier": "^2.8.2",
+    "prettier": "^3.0.3",
     "sql-parser-cst": "^0.17.1"
   },
   "devDependencies": {
     "@types/jest": "^29.2.5",
     "dedent-js": "^1.0.1",
-    "jest": "^29.3.1",
-    "ts-jest": "^29.0.3",
+    "jest": "^29.7.0",
+    "ts-jest": "^29.1.1",
     "typescript": "^4.9.4"
   }
 }