pgsql-deparser 14.0.1 → 14.1.1

package/esm/deparser/utils/sql-formatter.js

@@ -6,7 +6,7 @@ export class SqlFormatter {
     newlineChar;
     tabChar;
     prettyMode;
-    constructor(newlineChar = '\n', tabChar = '  ', prettyMode = false) {
+    constructor(newlineChar = '\n', tabChar = '  ', prettyMode = true) {
         this.newlineChar = newlineChar;
         this.tabChar = tabChar;
         this.prettyMode = prettyMode;

package/esm/deparser/visitors/base.js

@@ -2,6 +2,93 @@
  * Auto-generated file with types stripped for better tree-shaking
  * DO NOT EDIT - Generated by strip-deparser-types.ts
  */
+import { SqlFormatter } from '../utils/sql-formatter';
+export class DeparserContext {
+    indentLevel;
+    prettyMode;
+    isStringLiteral;
+    parentNodeTypes;
+    formatter;
+    select;
+    from;
+    group;
+    sort;
+    insertColumns;
+    update;
+    bool;
+    isColumnConstraint;
+    isDomainConstraint;
+    alterColumnOptions;
+    alterTableOptions;
+    isEnumValue;
+    objtype;
+    subtype;
+    constructor({ indentLevel = 0, prettyMode = true, isStringLiteral, parentNodeTypes = [], formatter, select, from, group, sort, insertColumns, update, bool, isColumnConstraint, isDomainConstraint, alterColumnOptions, alterTableOptions, isEnumValue, objtype, subtype, ...rest } = {}) {
+        this.indentLevel = indentLevel;
+        this.prettyMode = prettyMode;
+        this.isStringLiteral = isStringLiteral;
+        this.parentNodeTypes = parentNodeTypes;
+        this.formatter = formatter || new SqlFormatter('\n', '  ', prettyMode);
+        this.select = select;
+        this.from = from;
+        this.group = group;
+        this.sort = sort;
+        this.insertColumns = insertColumns;
+        this.update = update;
+        this.bool = bool;
+        this.isColumnConstraint = isColumnConstraint;
+        this.isDomainConstraint = isDomainConstraint;
+        this.alterColumnOptions = alterColumnOptions;
+        this.alterTableOptions = alterTableOptions;
+        this.isEnumValue = isEnumValue;
+        this.objtype = objtype;
+        this.subtype = subtype;
+        Object.assign(this, rest);
+    }
+    spawn(nodeType, overrides = {}) {
+        return new DeparserContext({
+            indentLevel: this.indentLevel,
+            prettyMode: this.prettyMode,
+            isStringLiteral: this.isStringLiteral,
+            parentNodeTypes: [...this.parentNodeTypes, nodeType],
+            formatter: this.formatter,
+            select: this.select,
+            from: this.from,
+            group: this.group,
+            sort: this.sort,
+            insertColumns: this.insertColumns,
+            update: this.update,
+            bool: this.bool,
+            isColumnConstraint: this.isColumnConstraint,
+            isDomainConstraint: this.isDomainConstraint,
+            alterColumnOptions: this.alterColumnOptions,
+            alterTableOptions: this.alterTableOptions,
+            isEnumValue: this.isEnumValue,
+            objtype: this.objtype,
+            subtype: this.subtype,
+            ...overrides,
+        });
+    }
+    indent(text, count) {
+        if (!this.prettyMode) {
+            return text;
+        }
+        const indentCount = count !== undefined ? count : this.indentLevel + 1;
+        return this.formatter.indent(text, indentCount);
+    }
+    newline() {
+        return this.formatter.newline();
+    }
+    parens(content) {
+        return this.formatter.parens(content);
+    }
+    format(parts, separator) {
+        return this.formatter.format(parts, separator);
+    }
+    isPretty() {
+        return this.formatter.isPretty();
+    }
+}
 export class BaseVisitor {
     getNodeType(node) {
         return Object.keys(node)[0];

package/esm/v14-to-v15.js

@@ -659,6 +659,9 @@ export class V14ToV15Transformer {
         if (node.name !== undefined) {
             result.name = node.name;
         }
+        if (node.num !== undefined) {
+            result.num = node.num;
+        }
         if (node.newowner !== undefined) {
             result.newowner = this.transform(node.newowner, context);
         }

package/esm/v15-to-v16.js

@@ -332,6 +332,18 @@ export class V15ToV16Transformer {
                     { String: { sval: 'json_object' } }
                 ];
             }
+            else if (node.funcname.length === 2 &&
+                node.funcname[0]?.String?.sval === 'pg_catalog' &&
+                node.funcname[1]?.String?.sval === 'system_user' &&
+                node.funcformat === 'COERCE_SQL_SYNTAX') {
+                return {
+                    ColumnRef: {
+                        fields: [
+                            { String: { sval: 'system_user' } }
+                        ]
+                    }
+                };
+            }
             else {
                 result.funcname = Array.isArray(node.funcname)
                     ? node.funcname.map((item) => this.transform(item, context))
@@ -437,6 +449,20 @@ export class V15ToV16Transformer {
         return { A_Const: result };
     }
     ColumnRef(node, context) {
+        if (node.fields && Array.isArray(node.fields) && node.fields.length === 1) {
+            const field = node.fields[0];
+            if (field?.String?.sval === 'system_user') {
+                return {
+                    FuncCall: {
+                        funcname: [
+                            { String: { sval: 'pg_catalog' } },
+                            { String: { sval: 'system_user' } }
+                        ],
+                        funcformat: 'COERCE_SQL_SYNTAX'
+                    }
+                };
+            }
+        }
         const result = {};
         if (node.fields !== undefined) {
             result.fields = Array.isArray(node.fields)
@@ -499,6 +525,30 @@ export class V15ToV16Transformer {
         return { Alias: result };
     }
     RangeVar(node, context) {
+        if (node.relname === 'system_user' && node.inh === true && node.relpersistence === 'p') {
+            return {
+                RangeFunction: {
+                    functions: [
+                        {
+                            List: {
+                                items: [
+                                    {
+                                        FuncCall: {
+                                            funcname: [
+                                                { String: { sval: 'pg_catalog' } },
+                                                { String: { sval: 'system_user' } }
+                                            ],
+                                            funcformat: 'COERCE_SQL_SYNTAX'
+                                        }
+                                    },
+                                    {}
+                                ]
+                            }
+                        }
+                    ]
+                }
+            };
+        }
         const result = {};
         if (node.catalogname !== undefined) {
             result.catalogname = node.catalogname;
@@ -706,7 +756,13 @@ export class V15ToV16Transformer {
         const result = {};
         if (node.items !== undefined) {
             result.items = Array.isArray(node.items)
-                ? node.items.map((item) => this.transform(item, context))
+                ? node.items.map((item) => {
+                    const transformed = this.transform(item, context);
+                    if (transformed === null) {
+                        return {};
+                    }
+                    return transformed;
+                })
                 : this.transform(node.items, context);
         }
         return { List: result };
@@ -1633,6 +1689,9 @@ export class V15ToV16Transformer {
         if (node.unique !== undefined) {
             result.unique = node.unique;
         }
+        if (node.nulls_not_distinct !== undefined) {
+            result.nulls_not_distinct = node.nulls_not_distinct;
+        }
         if (node.primary !== undefined) {
             result.primary = node.primary;
         }

package/package.json

@@ -1,6 +1,6 @@
 {
-  "author": "Dan Lynch <pyramation@gmail.com>",
-  "homepage": "https://github.com/launchql/pgsql-parser",
+  "author": "Constructive <developers@constructive.io>",
+  "homepage": "https://github.com/constructive-io/pgsql-parser",
   "license": "MIT",
   "main": "index.js",
   "module": "esm/index.js",
@@ -18,10 +18,10 @@
   },
   "repository": {
     "type": "git",
-    "url": "https://github.com/launchql/pgsql-parser"
+    "url": "https://github.com/constructive-io/pgsql-parser"
   },
   "bugs": {
-    "url": "https://github.com/launchql/pgsql-parser/issues"
+    "url": "https://github.com/constructive-io/pgsql-parser/issues"
   },
   "keywords": [
     "sql",
@@ -34,7 +34,7 @@
     "database"
   ],
   "name": "pgsql-deparser",
-  "version": "14.0.1",
+  "version": "14.1.1",
   "dependencies": {
     "@pgsql/types": "^14.1.1"
   }

package/v14-to-v15.js

@@ -662,6 +662,9 @@ class V14ToV15Transformer {
         if (node.name !== undefined) {
             result.name = node.name;
         }
+        if (node.num !== undefined) {
+            result.num = node.num;
+        }
         if (node.newowner !== undefined) {
             result.newowner = this.transform(node.newowner, context);
         }

package/v15-to-v16.d.ts

@@ -41,6 +41,8 @@ export declare class V15ToV16Transformer {
     };
     FuncCall(node: any, context: any): {
         FuncCall: any;
+    } | {
+        ColumnRef: any;
     };
     FuncExpr(node: any, context: any): {
         FuncExpr: any;
@@ -50,6 +52,8 @@ export declare class V15ToV16Transformer {
     };
     ColumnRef(node: any, context: any): {
         ColumnRef: any;
+    } | {
+        FuncCall: any;
     };
     TypeName(node: any, context: any): {
         TypeName: any;
@@ -59,6 +63,8 @@ export declare class V15ToV16Transformer {
     };
     RangeVar(node: any, context: any): {
         RangeVar: any;
+    } | {
+        RangeFunction: any;
     };
     A_ArrayExpr(node: any, context: any): {
         A_ArrayExpr: any;

package/v15-to-v16.js

@@ -335,6 +335,18 @@ class V15ToV16Transformer {
                     { String: { sval: 'json_object' } }
                 ];
             }
+            else if (node.funcname.length === 2 &&
+                node.funcname[0]?.String?.sval === 'pg_catalog' &&
+                node.funcname[1]?.String?.sval === 'system_user' &&
+                node.funcformat === 'COERCE_SQL_SYNTAX') {
+                return {
+                    ColumnRef: {
+                        fields: [
+                            { String: { sval: 'system_user' } }
+                        ]
+                    }
+                };
+            }
             else {
                 result.funcname = Array.isArray(node.funcname)
                     ? node.funcname.map((item) => this.transform(item, context))
@@ -440,6 +452,20 @@ class V15ToV16Transformer {
         return { A_Const: result };
     }
     ColumnRef(node, context) {
+        if (node.fields && Array.isArray(node.fields) && node.fields.length === 1) {
+            const field = node.fields[0];
+            if (field?.String?.sval === 'system_user') {
+                return {
+                    FuncCall: {
+                        funcname: [
+                            { String: { sval: 'pg_catalog' } },
+                            { String: { sval: 'system_user' } }
+                        ],
+                        funcformat: 'COERCE_SQL_SYNTAX'
+                    }
+                };
+            }
+        }
         const result = {};
         if (node.fields !== undefined) {
             result.fields = Array.isArray(node.fields)
@@ -502,6 +528,30 @@ class V15ToV16Transformer {
         return { Alias: result };
     }
     RangeVar(node, context) {
+        if (node.relname === 'system_user' && node.inh === true && node.relpersistence === 'p') {
+            return {
+                RangeFunction: {
+                    functions: [
+                        {
+                            List: {
+                                items: [
+                                    {
+                                        FuncCall: {
+                                            funcname: [
+                                                { String: { sval: 'pg_catalog' } },
+                                                { String: { sval: 'system_user' } }
+                                            ],
+                                            funcformat: 'COERCE_SQL_SYNTAX'
+                                        }
+                                    },
+                                    {}
+                                ]
+                            }
+                        }
+                    ]
+                }
+            };
+        }
         const result = {};
         if (node.catalogname !== undefined) {
             result.catalogname = node.catalogname;
@@ -709,7 +759,13 @@ class V15ToV16Transformer {
         const result = {};
         if (node.items !== undefined) {
             result.items = Array.isArray(node.items)
-                ? node.items.map((item) => this.transform(item, context))
+                ? node.items.map((item) => {
+                    const transformed = this.transform(item, context);
+                    if (transformed === null) {
+                        return {};
+                    }
+                    return transformed;
+                })
                 : this.transform(node.items, context);
         }
         return { List: result };
@@ -1636,6 +1692,9 @@ class V15ToV16Transformer {
         if (node.unique !== undefined) {
             result.unique = node.unique;
         }
+        if (node.nulls_not_distinct !== undefined) {
+            result.nulls_not_distinct = node.nulls_not_distinct;
+        }
         if (node.primary !== undefined) {
             result.primary = node.primary;
         }