prettier-plugin-sql-cst 0.17.2 → 0.17.4

package/dist/node_utils.d.ts

@@ -30,6 +30,8 @@ export declare const isCreateTriggerStmt: (node: any) => node is import("sql-par
 export declare const isExecuteClause: (node: any) => node is import("sql-parser-cst").ExecuteClause;
 export declare const isDataTypeName: (node: any) => node is import("sql-parser-cst").DataTypeName;
 export declare const isIntervalDataType: (node: any) => node is import("sql-parser-cst").IntervalDataType;
+export declare const isIntervalUnit: (node: any) => node is import("sql-parser-cst").IntervalUnit;
+export declare const isIntervalUnitRange: (node: any) => node is import("sql-parser-cst").IntervalUnitRange;
 export declare const isTimeDataType: (node: any) => node is import("sql-parser-cst").TimeDataType;
 export declare const isParametricDataType: (node: any) => node is import("sql-parser-cst").ParametricDataType;
-export declare const isDataType: (node: any) => boolean;
+export declare const isDataType: ([node, ...ancestors]: any[]) => boolean;

package/dist/node_utils.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.isDataType = exports.isParametricDataType = exports.isTimeDataType = exports.isIntervalDataType = exports.isDataTypeName = exports.isExecuteClause = exports.isCreateTriggerStmt = exports.isBigqueryQuotedMemberExpr = exports.isDynamicallyLoadedFunction = exports.isLanguageClause = exports.isAlterActionRename = exports.isDropProcedureStmt = exports.isAlterProcedureStmt = exports.isCreateProcedureStmt = exports.isDropFunctionStmt = exports.isAlterFunctionStmt = exports.isCreateFunctionStmt = exports.isListExpr = exports.isCompoundSelectStmt = exports.isSelectStmt = exports.isMemberExpr = exports.isParenExpr = exports.isAsClause = exports.isArraySubscript = exports.isStringLiteral = exports.isJsonbLiteral = exports.isJsonLiteral = exports.isEmpty = exports.isKeyword = exports.isCreateTableStmt = exports.isFuncArgs = exports.isFuncCall = exports.isValuesClause = exports.isProgram = void 0;
+exports.isDataType = exports.isParametricDataType = exports.isTimeDataType = exports.isIntervalUnitRange = exports.isIntervalUnit = exports.isIntervalDataType = exports.isDataTypeName = exports.isExecuteClause = exports.isCreateTriggerStmt = exports.isBigqueryQuotedMemberExpr = exports.isDynamicallyLoadedFunction = exports.isLanguageClause = exports.isAlterActionRename = exports.isDropProcedureStmt = exports.isAlterProcedureStmt = exports.isCreateProcedureStmt = exports.isDropFunctionStmt = exports.isAlterFunctionStmt = exports.isCreateFunctionStmt = exports.isListExpr = exports.isCompoundSelectStmt = exports.isSelectStmt = exports.isMemberExpr = exports.isParenExpr = exports.isAsClause = exports.isArraySubscript = exports.isStringLiteral = exports.isJsonbLiteral = exports.isJsonLiteral = exports.isEmpty = exports.isKeyword = exports.isCreateTableStmt = exports.isFuncArgs = exports.isFuncCall = exports.isValuesClause = exports.isProgram = void 0;
 var utils_1 = require("./utils");
 var is = function (type) {
     return function (node) {
@@ -38,11 +38,16 @@ exports.isCreateTriggerStmt = is("create_trigger_stmt");
 exports.isExecuteClause = is("execute_clause");
 exports.isDataTypeName = is("data_type_name");
 exports.isIntervalDataType = is("interval_data_type");
+exports.isIntervalUnit = is("interval_unit");
+exports.isIntervalUnitRange = is("interval_unit_range");
 exports.isTimeDataType = is("time_data_type");
 exports.isParametricDataType = is("parametric_data_type");
-var isDataType = function (node) {
+var isDataType = function (_a) {
+    var node = _a[0], ancestors = _a.slice(1);
     return (0, exports.isDataTypeName)(node) ||
         (0, exports.isIntervalDataType)(node) ||
+        ((0, exports.isIntervalUnit)(node) && (0, exports.isDataType)(ancestors)) ||
+        ((0, exports.isIntervalUnitRange)(node) && (0, exports.isDataType)(ancestors)) ||
         (0, exports.isTimeDataType)(node) ||
         (0, exports.isParametricDataType)(node);
 };

package/dist/syntax/base.js

@@ -5,7 +5,7 @@ var node_utils_1 = require("../node_utils");
 exports.baseMap = {
     /** cst-ignore: name */
     keyword: function (print, node, path, options) {
-        var keywordCase = (0, node_utils_1.isDataType)(path.parent)
+        var keywordCase = (0, node_utils_1.isDataType)(path.ancestors)
             ? options.sqlTypeCase
             : options.sqlKeywordCase;
         switch (keywordCase) {

package/dist/syntax/data_type.js

@@ -30,9 +30,9 @@ exports.dataTypeMap = {
             print(["timeKw", "precision"])
         ], (node.timeZoneKw ? [print.spaced("timeZoneKw")] : []), true)));
     },
-    interval_data_type: function (print) {
-        return print.spaced(["intervalKw", "fieldsKw", "precision"]);
-    },
+    interval_data_type: function (print) { return print.spaced(["intervalKw", "unit"]); },
+    interval_unit_range: function (print) { return print.spaced(["fromUnit", "toKw", "toUnit"]); },
+    interval_unit: function (print) { return print.spaced(["unitKw", "precision"]); },
     parametric_data_type: function (print) { return print(["typeKw", "params"]); },
     generic_type_params: function (print) {
         return (0, print_utils_1.group)(["<", (0, print_utils_1.indent)([print_utils_1.softline, print("params")]), print_utils_1.softline, ">"]);

package/dist/syntax/expr.js

@@ -141,10 +141,9 @@ exports.exprMap = {
     extract_expr: function (print) { return print(["extractKw", "args"]); },
     extract_from: function (print) { return print.spaced(["unit", "fromKw", "expr"]); },
     week_expr: function (print) { return print(["weekKw", "args"]); },
-    interval_literal: function (print) { return print.spaced(["intervalKw", "string"]); },
-    interval_expr: function (print) { return print.spaced(["intervalKw", "expr", "unit"]); },
-    interval_unit_range: function (print) { return print.spaced(["fromUnit", "toKw", "toUnit"]); },
-    interval_unit: function (print) { return print("unitKw"); },
+    interval_literal: function (print) {
+        return print.spaced(["intervalKw", "precision", "value", "unit"]);
+    },
     array_literal_expr: function (print) { return print(["arrayKw", "expr"]); },
     array_expr: function (print) {
         return (0, print_utils_1.group)(["[", (0, print_utils_1.indent)([print_utils_1.softline, print("expr")]), print_utils_1.softline, "]"]);

package/package.json

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