pgsql-deparser 18.4.3 → 18.4.5

package/deparser.d.ts

@@ -306,5 +306,4 @@ export declare class Deparser implements DeparserVisitor {
     AlterObjectSchemaStmt(node: t.AlterObjectSchemaStmt, context: DeparserContext): string;
     AlterRoleSetStmt(node: t.AlterRoleSetStmt, context: DeparserContext): string;
     CreateForeignTableStmt(node: t.CreateForeignTableStmt, context: DeparserContext): string;
-    private containsMultilineStringLiteral;
 }

package/deparser.js

@@ -500,12 +500,7 @@ class Deparser {
                     // Check if single target is complex - if so, use multiline format
                     if (this.isComplexSelectTarget(targetNode)) {
                         output.push('SELECT' + distinctPart);
-                        if (this.containsMultilineStringLiteral(target)) {
-                            output.push(target);
-                        }
-                        else {
-                            output.push(context.indent(target));
-                        }
+                        output.push(context.indent(target));
                     }
                     else {
                         output.push('SELECT' + distinctPart + ' ' + target);
@@ -515,9 +510,6 @@ class Deparser {
                     const targetStrings = targetList
                         .map(e => {
                         const targetStr = this.visit(e, context.spawn('SelectStmt', { select: true }));
-                        if (this.containsMultilineStringLiteral(targetStr)) {
-                            return targetStr;
-                        }
                         return context.indent(targetStr);
                     });
                     const formattedTargets = targetStrings.join(',' + context.newline());
@@ -569,9 +561,6 @@ class Deparser {
                     return context.parens(values.join(', '));
                 });
                 const indentedTuples = lists.map(tuple => {
-                    if (this.containsMultilineStringLiteral(tuple)) {
-                        return tuple;
-                    }
                     return context.indent(tuple);
                 });
                 output.push(indentedTuples.join(',\n'));
@@ -591,9 +580,6 @@ class Deparser {
                 const groupItems = groupList
                     .map(e => {
                     const groupStr = this.visit(e, context.spawn('SelectStmt', { group: true, indentLevel: context.indentLevel + 1 }));
-                    if (this.containsMultilineStringLiteral(groupStr)) {
-                        return groupStr;
-                    }
                     return context.indent(groupStr);
                 })
                     .join(',' + context.newline());
@@ -612,12 +598,7 @@ class Deparser {
             if (context.isPretty()) {
                 output.push('HAVING');
                 const havingStr = this.visit(node.havingClause, context);
-                if (this.containsMultilineStringLiteral(havingStr)) {
-                    output.push(havingStr);
-                }
-                else {
-                    output.push(context.indent(havingStr));
-                }
+                output.push(context.indent(havingStr));
             }
             else {
                 output.push('HAVING');
@@ -638,9 +619,6 @@ class Deparser {
                 const sortItems = sortList
                     .map(e => {
                     const sortStr = this.visit(e, context.spawn('SelectStmt', { sort: true, indentLevel: context.indentLevel + 1 }));
-                    if (this.containsMultilineStringLiteral(sortStr)) {
-                        return sortStr;
-                    }
                     return context.indent(sortStr);
                 })
                     .join(',' + context.newline());
@@ -1093,7 +1071,7 @@ class Deparser {
                         if (context.isPretty()) {
                             // Put each assignment on its own line for pretty printing
                             const indentedTargets = targets.map(target => context.indent(target));
-                            output.push('\n' + indentedTargets.join(',\n'));
+                            output[output.length - 1] += '\n' + indentedTargets.join(',\n');
                         }
                         else {
                             output.push(targets.join(', '));
@@ -1245,9 +1223,6 @@ class Deparser {
                 const cteStrings = ctes.map((cte, index) => {
                     const cteStr = this.visit(cte, context);
                     const prefix = index === 0 ? context.newline() : ',' + context.newline();
-                    if (this.containsMultilineStringLiteral(cteStr)) {
-                        return prefix + cteStr;
-                    }
                     return prefix + context.indent(cteStr);
                 });
                 output.push(cteStrings.join(''));
@@ -1422,7 +1397,9 @@ class Deparser {
             const source = this.visit(args[1], context);
             // EXTRACT requires an unquoted uppercase keyword (EPOCH, YEAR, etc.)
             // but A_Const sval deparsing wraps it in single quotes — strip and uppercase
-            if (field.startsWith("'") && field.endsWith("'")) {
+            // only when it is spelled the way the bare-keyword form parses back
+            if (/^'(?:year|month|day|hour|minute|second)'$/.test(field)
+                || (/^'[a-z_][a-z0-9_]*'$/.test(field) && (0, quotes_1.keywordKindOf)(field.slice(1, -1)) === 'NO_KEYWORD')) {
                 field = field.slice(1, -1).toUpperCase();
             }
             return `EXTRACT(${field} FROM ${source})`;
@@ -2220,7 +2197,9 @@ class Deparser {
     A_Indirection(node, context) {
         let argStr = this.visit(node.arg, context);
         const argType = this.getNodeType(node.arg);
-        if (argType === 'TypeCast' || argType === 'SubLink' || argType === 'A_Expr' || argType === 'FuncCall' || argType === 'A_Indirection' || argType === 'ColumnRef' || argType === 'RowExpr') {
+        // Grammar: only a parameter takes indirection bare; every other target is
+        // `'(' a_expr ')' opt_indirection` (a plain column subscript is the same node).
+        if (argType !== 'ParamRef') {
             argStr = `(${argStr})`;
         }
         const output = [argStr];
@@ -2248,21 +2227,11 @@ class Deparser {
         if (context.isPretty() && args.length > 0) {
             for (const arg of args) {
                 const whenClause = this.visit(arg, context);
-                if (this.containsMultilineStringLiteral(whenClause)) {
-                    output.push(context.newline() + whenClause);
-                }
-                else {
-                    output.push(context.newline() + context.indent(whenClause));
-                }
+                output.push(context.newline() + context.indent(whenClause));
             }
             if (node.defresult) {
                 const elseResult = this.visit(node.defresult, context);
-                if (this.containsMultilineStringLiteral(elseResult)) {
-                    output.push(context.newline() + 'ELSE ' + elseResult);
-                }
-                else {
-                    output.push(context.newline() + context.indent('ELSE ' + elseResult));
-                }
+                output.push(context.newline() + context.indent('ELSE ' + elseResult));
             }
             output.push(context.newline() + 'END');
             return output.join(' ');
@@ -3864,12 +3833,7 @@ class Deparser {
             if (context.isPretty()) {
                 // For complex JOIN conditions, format with proper indentation
                 if (qualsStr.includes('AND') || qualsStr.includes('OR') || qualsStr.length > 50) {
-                    if (this.containsMultilineStringLiteral(qualsStr)) {
-                        output.push(` ON ${qualsStr}`);
-                    }
-                    else {
-                        output.push(` ON${context.newline()}${context.indent(qualsStr)}`);
-                    }
+                    output.push(` ON${context.newline()}${context.indent(qualsStr)}`);
                 }
                 else {
                     output.push(` ON ${qualsStr}`);
@@ -5891,7 +5855,7 @@ class Deparser {
                     if (node.defname === 'new_version') {
                         // argValue is unquoted due to DefElem context, so we need to quote it
                         const quotedValue = this.quoteDefElemArg(node.arg, argValue);
-                        return `UPDATE TO ${quotedValue}`;
+                        return `TO ${quotedValue}`;
                     }
                     if (node.defname === 'schema') {
                         return `SET SCHEMA ${argValue}`;
@@ -5911,6 +5875,12 @@ class Deparser {
                 if (node.defname === 'cascade') {
                     return argValue === 'true' ? 'CASCADE' : '';
                 }
+                if (node.defname === 'new_version') {
+                    return `VERSION ${this.quoteDefElemArg(node.arg, argValue)}`;
+                }
+                if (node.defname === 'schema' && node.arg && this.getNodeType(node.arg) === 'String') {
+                    return `SCHEMA ${quotes_1.QuoteUtils.quoteIdentifier(this.getNodeData(node.arg).sval)}`;
+                }
                 return `${node.defname.toUpperCase()} ${argValue}`;
             }
             // Handle IndexStmt WITH clause options - no quotes, compact formatting
@@ -6168,6 +6138,7 @@ class Deparser {
         if (node.extname) {
             output.push(this.quoteIfNeeded(node.extname));
         }
+        output.push('UPDATE');
         if (node.options && node.options.length > 0) {
             const extContext = context.spawn('AlterExtensionStmt');
             const options = list_utils_1.ListUtils.unwrapList(node.options)
@@ -8476,6 +8447,9 @@ class Deparser {
                     .join(' ');
                 components.push(context.indent('REFERENCING ' + transitionClauses));
             }
+            if (node.constrrel) {
+                components.push(context.indent('FROM ' + this.RangeVar(node.constrrel, context)));
+            }
             if (node.deferrable) {
                 components.push(context.indent('DEFERRABLE'));
             }
@@ -8497,7 +8471,7 @@ class Deparser {
                 const funcName = list_utils_1.ListUtils.unwrapList(node.funcname)
                     .map(name => this.visit(name, context))
                     .join('.');
-                executeStr += ' PROCEDURE ' + funcName;
+                executeStr += ' FUNCTION ' + funcName;
             }
             if (node.args && node.args.length > 0) {
                 const argContext = context.spawn('CreateTrigStmt', { isStringLiteral: true });
@@ -10934,9 +10908,5 @@ class Deparser {
         }
         return output.join(' ');
     }
-    containsMultilineStringLiteral(content) {
-        const stringLiteralRegex = /'[^']*\n[^']*'/g;
-        return stringLiteralRegex.test(content);
-    }
 }
 exports.Deparser = Deparser;

package/esm/deparser.js

@@ -497,12 +497,7 @@ export class Deparser {
                     // Check if single target is complex - if so, use multiline format
                     if (this.isComplexSelectTarget(targetNode)) {
                         output.push('SELECT' + distinctPart);
-                        if (this.containsMultilineStringLiteral(target)) {
-                            output.push(target);
-                        }
-                        else {
-                            output.push(context.indent(target));
-                        }
+                        output.push(context.indent(target));
                     }
                     else {
                         output.push('SELECT' + distinctPart + ' ' + target);
@@ -512,9 +507,6 @@ export class Deparser {
                     const targetStrings = targetList
                         .map(e => {
                         const targetStr = this.visit(e, context.spawn('SelectStmt', { select: true }));
-                        if (this.containsMultilineStringLiteral(targetStr)) {
-                            return targetStr;
-                        }
                         return context.indent(targetStr);
                     });
                     const formattedTargets = targetStrings.join(',' + context.newline());
@@ -566,9 +558,6 @@ export class Deparser {
                     return context.parens(values.join(', '));
                 });
                 const indentedTuples = lists.map(tuple => {
-                    if (this.containsMultilineStringLiteral(tuple)) {
-                        return tuple;
-                    }
                     return context.indent(tuple);
                 });
                 output.push(indentedTuples.join(',\n'));
@@ -588,9 +577,6 @@ export class Deparser {
                 const groupItems = groupList
                     .map(e => {
                     const groupStr = this.visit(e, context.spawn('SelectStmt', { group: true, indentLevel: context.indentLevel + 1 }));
-                    if (this.containsMultilineStringLiteral(groupStr)) {
-                        return groupStr;
-                    }
                     return context.indent(groupStr);
                 })
                     .join(',' + context.newline());
@@ -609,12 +595,7 @@ export class Deparser {
             if (context.isPretty()) {
                 output.push('HAVING');
                 const havingStr = this.visit(node.havingClause, context);
-                if (this.containsMultilineStringLiteral(havingStr)) {
-                    output.push(havingStr);
-                }
-                else {
-                    output.push(context.indent(havingStr));
-                }
+                output.push(context.indent(havingStr));
             }
             else {
                 output.push('HAVING');
@@ -635,9 +616,6 @@ export class Deparser {
                 const sortItems = sortList
                     .map(e => {
                     const sortStr = this.visit(e, context.spawn('SelectStmt', { sort: true, indentLevel: context.indentLevel + 1 }));
-                    if (this.containsMultilineStringLiteral(sortStr)) {
-                        return sortStr;
-                    }
                     return context.indent(sortStr);
                 })
                     .join(',' + context.newline());
@@ -1090,7 +1068,7 @@ export class Deparser {
                         if (context.isPretty()) {
                             // Put each assignment on its own line for pretty printing
                             const indentedTargets = targets.map(target => context.indent(target));
-                            output.push('\n' + indentedTargets.join(',\n'));
+                            output[output.length - 1] += '\n' + indentedTargets.join(',\n');
                         }
                         else {
                             output.push(targets.join(', '));
@@ -1242,9 +1220,6 @@ export class Deparser {
                 const cteStrings = ctes.map((cte, index) => {
                     const cteStr = this.visit(cte, context);
                     const prefix = index === 0 ? context.newline() : ',' + context.newline();
-                    if (this.containsMultilineStringLiteral(cteStr)) {
-                        return prefix + cteStr;
-                    }
                     return prefix + context.indent(cteStr);
                 });
                 output.push(cteStrings.join(''));
@@ -1419,7 +1394,9 @@ export class Deparser {
             const source = this.visit(args[1], context);
             // EXTRACT requires an unquoted uppercase keyword (EPOCH, YEAR, etc.)
             // but A_Const sval deparsing wraps it in single quotes — strip and uppercase
-            if (field.startsWith("'") && field.endsWith("'")) {
+            // only when it is spelled the way the bare-keyword form parses back
+            if (/^'(?:year|month|day|hour|minute|second)'$/.test(field)
+                || (/^'[a-z_][a-z0-9_]*'$/.test(field) && keywordKindOf(field.slice(1, -1)) === 'NO_KEYWORD')) {
                 field = field.slice(1, -1).toUpperCase();
             }
             return `EXTRACT(${field} FROM ${source})`;
@@ -2217,7 +2194,9 @@ export class Deparser {
     A_Indirection(node, context) {
         let argStr = this.visit(node.arg, context);
         const argType = this.getNodeType(node.arg);
-        if (argType === 'TypeCast' || argType === 'SubLink' || argType === 'A_Expr' || argType === 'FuncCall' || argType === 'A_Indirection' || argType === 'ColumnRef' || argType === 'RowExpr') {
+        // Grammar: only a parameter takes indirection bare; every other target is
+        // `'(' a_expr ')' opt_indirection` (a plain column subscript is the same node).
+        if (argType !== 'ParamRef') {
             argStr = `(${argStr})`;
         }
         const output = [argStr];
@@ -2245,21 +2224,11 @@ export class Deparser {
         if (context.isPretty() && args.length > 0) {
             for (const arg of args) {
                 const whenClause = this.visit(arg, context);
-                if (this.containsMultilineStringLiteral(whenClause)) {
-                    output.push(context.newline() + whenClause);
-                }
-                else {
-                    output.push(context.newline() + context.indent(whenClause));
-                }
+                output.push(context.newline() + context.indent(whenClause));
             }
             if (node.defresult) {
                 const elseResult = this.visit(node.defresult, context);
-                if (this.containsMultilineStringLiteral(elseResult)) {
-                    output.push(context.newline() + 'ELSE ' + elseResult);
-                }
-                else {
-                    output.push(context.newline() + context.indent('ELSE ' + elseResult));
-                }
+                output.push(context.newline() + context.indent('ELSE ' + elseResult));
             }
             output.push(context.newline() + 'END');
             return output.join(' ');
@@ -3861,12 +3830,7 @@ export class Deparser {
             if (context.isPretty()) {
                 // For complex JOIN conditions, format with proper indentation
                 if (qualsStr.includes('AND') || qualsStr.includes('OR') || qualsStr.length > 50) {
-                    if (this.containsMultilineStringLiteral(qualsStr)) {
-                        output.push(` ON ${qualsStr}`);
-                    }
-                    else {
-                        output.push(` ON${context.newline()}${context.indent(qualsStr)}`);
-                    }
+                    output.push(` ON${context.newline()}${context.indent(qualsStr)}`);
                 }
                 else {
                     output.push(` ON ${qualsStr}`);
@@ -5888,7 +5852,7 @@ export class Deparser {
                     if (node.defname === 'new_version') {
                         // argValue is unquoted due to DefElem context, so we need to quote it
                         const quotedValue = this.quoteDefElemArg(node.arg, argValue);
-                        return `UPDATE TO ${quotedValue}`;
+                        return `TO ${quotedValue}`;
                     }
                     if (node.defname === 'schema') {
                         return `SET SCHEMA ${argValue}`;
@@ -5908,6 +5872,12 @@ export class Deparser {
                 if (node.defname === 'cascade') {
                     return argValue === 'true' ? 'CASCADE' : '';
                 }
+                if (node.defname === 'new_version') {
+                    return `VERSION ${this.quoteDefElemArg(node.arg, argValue)}`;
+                }
+                if (node.defname === 'schema' && node.arg && this.getNodeType(node.arg) === 'String') {
+                    return `SCHEMA ${QuoteUtils.quoteIdentifier(this.getNodeData(node.arg).sval)}`;
+                }
                 return `${node.defname.toUpperCase()} ${argValue}`;
             }
             // Handle IndexStmt WITH clause options - no quotes, compact formatting
@@ -6165,6 +6135,7 @@ export class Deparser {
         if (node.extname) {
             output.push(this.quoteIfNeeded(node.extname));
         }
+        output.push('UPDATE');
         if (node.options && node.options.length > 0) {
             const extContext = context.spawn('AlterExtensionStmt');
             const options = ListUtils.unwrapList(node.options)
@@ -8473,6 +8444,9 @@ export class Deparser {
                     .join(' ');
                 components.push(context.indent('REFERENCING ' + transitionClauses));
             }
+            if (node.constrrel) {
+                components.push(context.indent('FROM ' + this.RangeVar(node.constrrel, context)));
+            }
             if (node.deferrable) {
                 components.push(context.indent('DEFERRABLE'));
             }
@@ -8494,7 +8468,7 @@ export class Deparser {
                 const funcName = ListUtils.unwrapList(node.funcname)
                     .map(name => this.visit(name, context))
                     .join('.');
-                executeStr += ' PROCEDURE ' + funcName;
+                executeStr += ' FUNCTION ' + funcName;
             }
             if (node.args && node.args.length > 0) {
                 const argContext = context.spawn('CreateTrigStmt', { isStringLiteral: true });
@@ -10931,8 +10905,4 @@ export class Deparser {
         }
         return output.join(' ');
     }
-    containsMultilineStringLiteral(content) {
-        const stringLiteralRegex = /'[^']*\n[^']*'/g;
-        return stringLiteralRegex.test(content);
-    }
 }

package/esm/index.js

@@ -7,4 +7,5 @@ export const deparse = async (...args) => {
     return deparseMethod(...args);
 };
 export { Deparser };
+export { splitSqlLines } from './utils/sql-formatter';
 export { QuoteUtils } from '@pgsql/quotes';

package/esm/utils/sql-formatter.js

@@ -1,3 +1,105 @@
+const isIdentChar = (ch) => ch !== undefined && (/[A-Za-z0-9_$]/.test(ch) || ch.charCodeAt(0) >= 0x80);
+const DOLLAR_TAG = /\$(?:[A-Za-z_\u0080-\uffff][A-Za-z0-9_\u0080-\uffff]*)?\$/y;
+/**
+ * Splits SQL text into lines, breaking only at newlines that sit between
+ * tokens. A newline inside a string literal ('...', E'...', $tag$...$tag$),
+ * a quoted identifier or a block comment is part of that token's value and
+ * stays inside its line, so callers can re-indent the lines without changing
+ * what the SQL means.
+ */
+export function splitSqlLines(text, newlineChar = '\n') {
+    if (!newlineChar || !text.includes(newlineChar)) {
+        return [text];
+    }
+    const lines = [];
+    const length = text.length;
+    let lineStart = 0;
+    let i = 0;
+    while (i < length) {
+        const ch = text[i];
+        if (ch === "'") {
+            const prev = text[i - 1];
+            const backslashEscapes = (prev === 'E' || prev === 'e') && !isIdentChar(text[i - 2]);
+            i++;
+            while (i < length) {
+                if (backslashEscapes && text[i] === '\\') {
+                    i += 2;
+                }
+                else if (text[i] === "'") {
+                    if (text[i + 1] === "'") {
+                        i += 2;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                else {
+                    i++;
+                }
+            }
+            i++;
+        }
+        else if (ch === '"') {
+            i++;
+            while (i < length) {
+                if (text[i] === '"') {
+                    if (text[i + 1] === '"') {
+                        i += 2;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                else {
+                    i++;
+                }
+            }
+            i++;
+        }
+        else if (ch === '$' && !isIdentChar(text[i - 1])) {
+            DOLLAR_TAG.lastIndex = i;
+            const tag = DOLLAR_TAG.exec(text);
+            if (tag) {
+                const close = text.indexOf(tag[0], i + tag[0].length);
+                i = close === -1 ? length : close + tag[0].length;
+            }
+            else {
+                i++;
+            }
+        }
+        else if (ch === '-' && text[i + 1] === '-') {
+            const end = text.indexOf('\n', i);
+            i = end === -1 ? length : end;
+        }
+        else if (ch === '/' && text[i + 1] === '*') {
+            let depth = 1;
+            i += 2;
+            while (i < length && depth > 0) {
+                if (text[i] === '/' && text[i + 1] === '*') {
+                    depth++;
+                    i += 2;
+                }
+                else if (text[i] === '*' && text[i + 1] === '/') {
+                    depth--;
+                    i += 2;
+                }
+                else {
+                    i++;
+                }
+            }
+        }
+        else if (text.startsWith(newlineChar, i)) {
+            lines.push(text.slice(lineStart, i));
+            i += newlineChar.length;
+            lineStart = i;
+        }
+        else {
+            i++;
+        }
+    }
+    lines.push(text.slice(lineStart));
+    return lines;
+}
 export class SqlFormatter {
     newlineChar;
     tabChar;
@@ -15,7 +117,7 @@ export class SqlFormatter {
             return text;
         }
         const indentation = this.tabChar.repeat(count);
-        return text.split(this.newlineChar).map(line => line.trim() ? indentation + line : line).join(this.newlineChar);
+        return splitSqlLines(text, this.newlineChar).map(line => line.trim() ? indentation + line : line).join(this.newlineChar);
     }
     parens(content) {
         return `(${content})`;

package/index.d.ts

@@ -3,4 +3,5 @@ declare const deparseMethod: typeof Deparser.deparse;
 export declare const deparseSync: typeof Deparser.deparse;
 export declare const deparse: (...args: Parameters<typeof deparseMethod>) => Promise<ReturnType<typeof deparseMethod>>;
 export { Deparser, DeparserOptions };
+export { splitSqlLines } from './utils/sql-formatter';
 export { QuoteUtils } from '@pgsql/quotes';

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.QuoteUtils = exports.Deparser = exports.deparse = exports.deparseSync = void 0;
+exports.QuoteUtils = exports.splitSqlLines = exports.Deparser = exports.deparse = exports.deparseSync = void 0;
 const deparser_1 = require("./deparser");
 Object.defineProperty(exports, "Deparser", { enumerable: true, get: function () { return deparser_1.Deparser; } });
 const deparseMethod = deparser_1.Deparser.deparse;
@@ -11,5 +11,7 @@ const deparse = async (...args) => {
     return deparseMethod(...args);
 };
 exports.deparse = deparse;
+var sql_formatter_1 = require("./utils/sql-formatter");
+Object.defineProperty(exports, "splitSqlLines", { enumerable: true, get: function () { return sql_formatter_1.splitSqlLines; } });
 var quotes_1 = require("@pgsql/quotes");
 Object.defineProperty(exports, "QuoteUtils", { enumerable: true, get: function () { return quotes_1.QuoteUtils; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-deparser",
-  "version": "18.4.3",
+  "version": "18.4.5",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL AST Deparser",
   "main": "index.js",
@@ -53,12 +53,12 @@
     "database"
   ],
   "devDependencies": {
-    "libpg-query": "18.2.1",
+    "libpg-query": "18.2.4",
     "makage": "^0.5.1"
   },
   "dependencies": {
     "@pgsql/quotes": "18.2.4",
     "@pgsql/types": "^18.0.0"
   },
-  "gitHead": "ce03e09604aea4b0fd7d62cf23e72d0de8ad33c1"
+  "gitHead": "2ea833400ad4f4b440b318b84fe9f0364db686fb"
 }

package/utils/sql-formatter.d.ts

@@ -1,3 +1,11 @@
+/**
+ * Splits SQL text into lines, breaking only at newlines that sit between
+ * tokens. A newline inside a string literal ('...', E'...', $tag$...$tag$),
+ * a quoted identifier or a block comment is part of that token's value and
+ * stays inside its line, so callers can re-indent the lines without changing
+ * what the SQL means.
+ */
+export declare function splitSqlLines(text: string, newlineChar?: string): string[];
 export declare class SqlFormatter {
     private newlineChar;
     private tabChar;

package/utils/sql-formatter.js

@@ -1,6 +1,109 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlFormatter = void 0;
+exports.splitSqlLines = splitSqlLines;
+const isIdentChar = (ch) => ch !== undefined && (/[A-Za-z0-9_$]/.test(ch) || ch.charCodeAt(0) >= 0x80);
+const DOLLAR_TAG = /\$(?:[A-Za-z_\u0080-\uffff][A-Za-z0-9_\u0080-\uffff]*)?\$/y;
+/**
+ * Splits SQL text into lines, breaking only at newlines that sit between
+ * tokens. A newline inside a string literal ('...', E'...', $tag$...$tag$),
+ * a quoted identifier or a block comment is part of that token's value and
+ * stays inside its line, so callers can re-indent the lines without changing
+ * what the SQL means.
+ */
+function splitSqlLines(text, newlineChar = '\n') {
+    if (!newlineChar || !text.includes(newlineChar)) {
+        return [text];
+    }
+    const lines = [];
+    const length = text.length;
+    let lineStart = 0;
+    let i = 0;
+    while (i < length) {
+        const ch = text[i];
+        if (ch === "'") {
+            const prev = text[i - 1];
+            const backslashEscapes = (prev === 'E' || prev === 'e') && !isIdentChar(text[i - 2]);
+            i++;
+            while (i < length) {
+                if (backslashEscapes && text[i] === '\\') {
+                    i += 2;
+                }
+                else if (text[i] === "'") {
+                    if (text[i + 1] === "'") {
+                        i += 2;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                else {
+                    i++;
+                }
+            }
+            i++;
+        }
+        else if (ch === '"') {
+            i++;
+            while (i < length) {
+                if (text[i] === '"') {
+                    if (text[i + 1] === '"') {
+                        i += 2;
+                    }
+                    else {
+                        break;
+                    }
+                }
+                else {
+                    i++;
+                }
+            }
+            i++;
+        }
+        else if (ch === '$' && !isIdentChar(text[i - 1])) {
+            DOLLAR_TAG.lastIndex = i;
+            const tag = DOLLAR_TAG.exec(text);
+            if (tag) {
+                const close = text.indexOf(tag[0], i + tag[0].length);
+                i = close === -1 ? length : close + tag[0].length;
+            }
+            else {
+                i++;
+            }
+        }
+        else if (ch === '-' && text[i + 1] === '-') {
+            const end = text.indexOf('\n', i);
+            i = end === -1 ? length : end;
+        }
+        else if (ch === '/' && text[i + 1] === '*') {
+            let depth = 1;
+            i += 2;
+            while (i < length && depth > 0) {
+                if (text[i] === '/' && text[i + 1] === '*') {
+                    depth++;
+                    i += 2;
+                }
+                else if (text[i] === '*' && text[i + 1] === '/') {
+                    depth--;
+                    i += 2;
+                }
+                else {
+                    i++;
+                }
+            }
+        }
+        else if (text.startsWith(newlineChar, i)) {
+            lines.push(text.slice(lineStart, i));
+            i += newlineChar.length;
+            lineStart = i;
+        }
+        else {
+            i++;
+        }
+    }
+    lines.push(text.slice(lineStart));
+    return lines;
+}
 class SqlFormatter {
     newlineChar;
     tabChar;
@@ -18,7 +121,7 @@ class SqlFormatter {
             return text;
         }
         const indentation = this.tabChar.repeat(count);
-        return text.split(this.newlineChar).map(line => line.trim() ? indentation + line : line).join(this.newlineChar);
+        return splitSqlLines(text, this.newlineChar).map(line => line.trim() ? indentation + line : line).join(this.newlineChar);
     }
     parens(content) {
         return `(${content})`;