npm - pgsql-deparser - Versions diffs - 17.18.0 → 17.18.2 - Mend

pgsql-deparser 17.18.0 → 17.18.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (3) hide show

package/deparser.js CHANGED Viewed

@@ -508,9 +508,7 @@ class Deparser {
                 output.push('VALUES');
                 const lists = list_utils_1.ListUtils.unwrapList(node.valuesLists).map(list => {
                     const values = list_utils_1.ListUtils.unwrapList(list).map(val => this.visit(val, context));
-                    // Put each value on its own line for pretty printing
-                    const indentedValues = values.map(val => context.indent(val));
-                    return '(\n' + indentedValues.join(',\n') + '\n)';
+                    return context.parens(values.join(', '));
                 });
                 const indentedTuples = lists.map(tuple => {
                     if (this.containsMultilineStringLiteral(tuple)) {
@@ -660,10 +658,15 @@ class Deparser {
                     return context.format([leftExpr, operator, rightExpr]);
                 }
                 else if (rexpr) {
-                    return context.format([
-                        this.deparseOperatorName(name, context),
-                        this.visit(rexpr, context)
-                    ]);
+                    // Unary operator (e.g., unary minus: - expr)
+                    const operator = this.deparseOperatorName(name, context);
+                    let rightExpr = this.visit(rexpr, context);
+                    // Wrap in parentheses if rexpr is a binary A_Expr to preserve semantics
+                    // e.g., -(a - b) must stay -(a - b), not become -a - b
+                    if (rexpr && 'A_Expr' in rexpr && rexpr.A_Expr?.kind === 'AEXPR_OP' && rexpr.A_Expr?.lexpr) {
+                        rightExpr = context.parens(rightExpr);
+                    }
+                    return context.format([operator, rightExpr]);
                 }
                 break;
             case 'AEXPR_OP_ANY':
@@ -1764,7 +1767,7 @@ class Deparser {
                 }
                 return output.join(' ');
             }
-            let result = mods(typeName, args);
+            let result = mods(quotes_1.QuoteUtils.quoteIdentifierTypeName(typeName), args);
             if (node.arrayBounds && node.arrayBounds.length > 0) {
                 result += formatArrayBounds(node.arrayBounds);
             }
@@ -2876,6 +2879,10 @@ class Deparser {
                     });
                     output.push(`(${exclusionElements.join(', ')})`);
                 }
+                if (node.where_clause) {
+                    output.push('WHERE');
+                    output.push(context.parens(this.visit(node.where_clause, context)));
+                }
                 break;
         }
         // Handle deferrable constraints for all constraint types that support it
@@ -3009,6 +3016,8 @@ class Deparser {
         if (!node.frameOptions)
             return null;
         const frameOptions = node.frameOptions;
+        const EXCLUDE_MASK = 0x8000 | 0x10000 | 0x20000;
+        const baseFrameOptions = frameOptions & ~EXCLUDE_MASK;
         const frameParts = [];
         if (frameOptions & 0x01) { // FRAMEOPTION_NONDEFAULT
             if (frameOptions & 0x02) { // FRAMEOPTION_RANGE
@@ -3025,31 +3034,31 @@ class Deparser {
             return null;
         const boundsParts = [];
         // Handle specific frameOptions values that have known mappings
-        if (frameOptions === 789) {
+        if (baseFrameOptions === 789) {
             boundsParts.push('CURRENT ROW');
             boundsParts.push('AND UNBOUNDED FOLLOWING');
         }
-        else if (frameOptions === 1077) {
+        else if (baseFrameOptions === 1077) {
             boundsParts.push('UNBOUNDED PRECEDING');
             boundsParts.push('AND CURRENT ROW');
         }
-        else if (frameOptions === 18453) {
+        else if (baseFrameOptions === 18453) {
             if (node.startOffset && node.endOffset) {
                 boundsParts.push(`${this.visit(node.startOffset, context)} PRECEDING`);
                 boundsParts.push(`AND ${this.visit(node.endOffset, context)} FOLLOWING`);
             }
         }
-        else if (frameOptions === 1557) {
+        else if (baseFrameOptions === 1557) {
             boundsParts.push('CURRENT ROW');
             boundsParts.push('AND CURRENT ROW');
         }
-        else if (frameOptions === 16917) {
+        else if (baseFrameOptions === 16917) {
             boundsParts.push('CURRENT ROW');
             if (node.endOffset) {
                 boundsParts.push(`AND ${this.visit(node.endOffset, context)} FOLLOWING`);
             }
         }
-        else if (frameOptions === 1058) {
+        else if (baseFrameOptions === 1058) {
             return null;
         }
         else {
@@ -3103,6 +3112,16 @@ class Deparser {
             frameParts.push('BETWEEN');
             frameParts.push(boundsParts.join(' '));
         }
+        // EXCLUDE clause
+        if (frameOptions & 0x8000) { // FRAMEOPTION_EXCLUDE_CURRENT_ROW
+            frameParts.push('EXCLUDE CURRENT ROW');
+        }
+        else if (frameOptions & 0x10000) { // FRAMEOPTION_EXCLUDE_GROUP
+            frameParts.push('EXCLUDE GROUP');
+        }
+        else if (frameOptions & 0x20000) { // FRAMEOPTION_EXCLUDE_TIES
+            frameParts.push('EXCLUDE TIES');
+        }
         return frameParts.join(' ');
     }
     SortBy(node, context) {

package/esm/deparser.js CHANGED Viewed

@@ -505,9 +505,7 @@ export class Deparser {
                 output.push('VALUES');
                 const lists = ListUtils.unwrapList(node.valuesLists).map(list => {
                     const values = ListUtils.unwrapList(list).map(val => this.visit(val, context));
-                    // Put each value on its own line for pretty printing
-                    const indentedValues = values.map(val => context.indent(val));
-                    return '(\n' + indentedValues.join(',\n') + '\n)';
+                    return context.parens(values.join(', '));
                 });
                 const indentedTuples = lists.map(tuple => {
                     if (this.containsMultilineStringLiteral(tuple)) {
@@ -657,10 +655,15 @@ export class Deparser {
                     return context.format([leftExpr, operator, rightExpr]);
                 }
                 else if (rexpr) {
-                    return context.format([
-                        this.deparseOperatorName(name, context),
-                        this.visit(rexpr, context)
-                    ]);
+                    // Unary operator (e.g., unary minus: - expr)
+                    const operator = this.deparseOperatorName(name, context);
+                    let rightExpr = this.visit(rexpr, context);
+                    // Wrap in parentheses if rexpr is a binary A_Expr to preserve semantics
+                    // e.g., -(a - b) must stay -(a - b), not become -a - b
+                    if (rexpr && 'A_Expr' in rexpr && rexpr.A_Expr?.kind === 'AEXPR_OP' && rexpr.A_Expr?.lexpr) {
+                        rightExpr = context.parens(rightExpr);
+                    }
+                    return context.format([operator, rightExpr]);
                 }
                 break;
             case 'AEXPR_OP_ANY':
@@ -1761,7 +1764,7 @@ export class Deparser {
                 }
                 return output.join(' ');
             }
-            let result = mods(typeName, args);
+            let result = mods(QuoteUtils.quoteIdentifierTypeName(typeName), args);
             if (node.arrayBounds && node.arrayBounds.length > 0) {
                 result += formatArrayBounds(node.arrayBounds);
             }
@@ -2873,6 +2876,10 @@ export class Deparser {
                     });
                     output.push(`(${exclusionElements.join(', ')})`);
                 }
+                if (node.where_clause) {
+                    output.push('WHERE');
+                    output.push(context.parens(this.visit(node.where_clause, context)));
+                }
                 break;
         }
         // Handle deferrable constraints for all constraint types that support it
@@ -3006,6 +3013,8 @@ export class Deparser {
         if (!node.frameOptions)
             return null;
         const frameOptions = node.frameOptions;
+        const EXCLUDE_MASK = 0x8000 | 0x10000 | 0x20000;
+        const baseFrameOptions = frameOptions & ~EXCLUDE_MASK;
         const frameParts = [];
         if (frameOptions & 0x01) { // FRAMEOPTION_NONDEFAULT
             if (frameOptions & 0x02) { // FRAMEOPTION_RANGE
@@ -3022,31 +3031,31 @@ export class Deparser {
             return null;
         const boundsParts = [];
         // Handle specific frameOptions values that have known mappings
-        if (frameOptions === 789) {
+        if (baseFrameOptions === 789) {
             boundsParts.push('CURRENT ROW');
             boundsParts.push('AND UNBOUNDED FOLLOWING');
         }
-        else if (frameOptions === 1077) {
+        else if (baseFrameOptions === 1077) {
             boundsParts.push('UNBOUNDED PRECEDING');
             boundsParts.push('AND CURRENT ROW');
         }
-        else if (frameOptions === 18453) {
+        else if (baseFrameOptions === 18453) {
             if (node.startOffset && node.endOffset) {
                 boundsParts.push(`${this.visit(node.startOffset, context)} PRECEDING`);
                 boundsParts.push(`AND ${this.visit(node.endOffset, context)} FOLLOWING`);
             }
         }
-        else if (frameOptions === 1557) {
+        else if (baseFrameOptions === 1557) {
             boundsParts.push('CURRENT ROW');
             boundsParts.push('AND CURRENT ROW');
         }
-        else if (frameOptions === 16917) {
+        else if (baseFrameOptions === 16917) {
             boundsParts.push('CURRENT ROW');
             if (node.endOffset) {
                 boundsParts.push(`AND ${this.visit(node.endOffset, context)} FOLLOWING`);
             }
         }
-        else if (frameOptions === 1058) {
+        else if (baseFrameOptions === 1058) {
             return null;
         }
         else {
@@ -3100,6 +3109,16 @@ export class Deparser {
             frameParts.push('BETWEEN');
             frameParts.push(boundsParts.join(' '));
         }
+        // EXCLUDE clause
+        if (frameOptions & 0x8000) { // FRAMEOPTION_EXCLUDE_CURRENT_ROW
+            frameParts.push('EXCLUDE CURRENT ROW');
+        }
+        else if (frameOptions & 0x10000) { // FRAMEOPTION_EXCLUDE_GROUP
+            frameParts.push('EXCLUDE GROUP');
+        }
+        else if (frameOptions & 0x20000) { // FRAMEOPTION_EXCLUDE_TIES
+            frameParts.push('EXCLUDE TIES');
+        }
         return frameParts.join(' ');
     }
     SortBy(node, context) {

package/package.json CHANGED Viewed

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-deparser",
-  "version": "17.18.0",
+  "version": "17.18.2",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL AST Deparser",
   "main": "index.js",
@@ -60,5 +60,5 @@
     "@pgsql/quotes": "17.1.0",
     "@pgsql/types": "^17.6.2"
   },
-  "gitHead": "ab3eacdb20a9378b5d7aade0035e07b2edf85b90"
+  "gitHead": "cdd732b4694b84522895d2d1dd8d5db9944875d5"
 }