pgsql-deparser 16.0.0 → 17.4.0

package/esm/index.js

@@ -1,15 +1,3 @@
-/**
- * Deparser for PostgreSQL version 16
- * Auto-generated by generate-version-deparsers.ts
- */
-import { deparse as deparse17, deparseSync as deparseSync17 } from './deparser';
-import { PG16ToPG17Transformer } from './v16-to-v17-direct';
-const tx = new PG16ToPG17Transformer();
-export async function deparse(query, opts) {
-    const ast17 = tx.transform(query);
-    return await deparse17(ast17, opts);
-}
-export function deparseSync(query, opts) {
-    const ast17 = tx.transform(query);
-    return deparseSync17(ast17, opts);
-}
+import { Deparser } from "./deparser";
+const deparse = Deparser.deparse;
+export { deparse, Deparser };

package/esm/utils/index.js

@@ -0,0 +1,90 @@
+/* eslint-disable no-restricted-syntax */
+export const cleanLines = (sql) => {
+    return sql
+        .split('\n')
+        .map((l) => l.trim())
+        .filter((a) => a)
+        .join('\n');
+};
+export const transform = (obj, props) => {
+    let copy = null;
+    // Handle the 3 simple types, and null or undefined
+    if (obj == null || typeof obj !== 'object') {
+        return obj;
+    }
+    // Handle Date
+    if (obj instanceof Date) {
+        copy = new Date();
+        copy.setTime(obj.getTime());
+        return copy;
+    }
+    // Handle Array
+    if (obj instanceof Array) {
+        copy = [];
+        for (let i = 0, len = obj.length; i < len; i++) {
+            copy[i] = transform(obj[i], props);
+        }
+        return copy;
+    }
+    // Handle Object
+    if (obj instanceof Object || typeof obj === 'object') {
+        copy = {};
+        for (const attr in obj) {
+            if (obj.hasOwnProperty(attr)) {
+                if (props.hasOwnProperty(attr)) {
+                    if (typeof props[attr] === 'function') {
+                        copy[attr] = props[attr](obj[attr]);
+                    }
+                    else if (props[attr].hasOwnProperty(obj[attr])) {
+                        copy[attr] = props[attr][obj[attr]];
+                    }
+                    else {
+                        copy[attr] = transform(obj[attr], props);
+                    }
+                }
+                else {
+                    copy[attr] = transform(obj[attr], props);
+                }
+            }
+            else {
+                copy[attr] = transform(obj[attr], props);
+            }
+        }
+        return copy;
+    }
+    throw new Error("Unable to copy obj! Its type isn't supported.");
+};
+const noop = () => undefined;
+export const cleanTree = (tree) => {
+    return transform(tree, {
+        stmt_len: noop,
+        stmt_location: noop,
+        location: noop,
+        DefElem: (obj) => {
+            if (obj.defname === 'as') {
+                if (Array.isArray(obj.arg) && obj.arg.length) {
+                    // function
+                    obj.arg[0].String.sval = obj.arg[0].String.sval.trim();
+                }
+                else if (obj.arg.List && obj.arg.List.items) {
+                    // function
+                    obj.arg.List.items[0].String.sval = obj.arg.List.items[0].String.sval.trim();
+                }
+                else {
+                    // do stmt
+                    obj.arg.String.sval = obj.arg.String.sval.trim();
+                }
+                return cleanTree(obj);
+            }
+            else {
+                return cleanTree(obj);
+            }
+        }
+    });
+};
+export const cleanTreeWithStmt = (tree) => {
+    return transform(tree, {
+        stmt_location: noop,
+        location: noop
+    });
+};

package/esm/{deparser/utils → utils}/list-utils.js

@@ -1,7 +1,3 @@
-/**
- * Auto-generated file with types stripped for better tree-shaking
- * DO NOT EDIT - Generated by strip-deparser-types.ts
- */
 export class ListUtils {
     static unwrapList(obj) {
         if (obj === undefined || obj === null) {

package/esm/{deparser/utils → utils}/quote-utils.js

@@ -1,7 +1,3 @@
-/**
- * Auto-generated file with types stripped for better tree-shaking
- * DO NOT EDIT - Generated by strip-deparser-types.ts
- */
 const RESERVED_WORDS = new Set([
     'all', 'analyse', 'analyze', 'and', 'any', 'array', 'as', 'asc', 'asymmetric',
     'authorization', 'binary', 'both', 'case', 'cast', 'check', 'collate', 'collation',
@@ -52,34 +48,4 @@ export class QuoteUtils {
     static escape(literal) {
         return `'${literal.replace(/'/g, "''")}'`;
     }
-    /**
-     * Escapes a string value for use in E-prefixed string literals
-     * Handles both backslashes and single quotes properly
-     */
-    static escapeEString(value) {
-        return value.replace(/\\/g, '\\\\').replace(/'/g, "''");
-    }
-    /**
-     * Formats a string as an E-prefixed string literal with proper escaping
-     * This wraps the complete E-prefix logic including detection and formatting
-     */
-    static formatEString(value) {
-        const needsEscape = QuoteUtils.needsEscapePrefix(value);
-        if (needsEscape) {
-            const escapedValue = QuoteUtils.escapeEString(value);
-            return `E'${escapedValue}'`;
-        }
-        else {
-            return QuoteUtils.escape(value);
-        }
-    }
-    /**
-     * Determines if a string value needs E-prefix for escaped string literals
-     * Detects backslash escape sequences that require E-prefix in PostgreSQL
-     */
-    static needsEscapePrefix(value) {
-        // Always use E'' if the string contains any backslashes,
-        // unless it's a raw \x... bytea-style literal.
-        return !/^\\x[0-9a-fA-F]+$/i.test(value) && value.includes('\\');
-    }
 }

package/esm/utils/sql-formatter.js

@@ -0,0 +1,23 @@
+export class SqlFormatter {
+    newlineChar;
+    tabChar;
+    constructor(newlineChar = '\n', tabChar = '  ') {
+        this.newlineChar = newlineChar;
+        this.tabChar = tabChar;
+    }
+    format(parts, separator = ' ') {
+        return parts.filter(part => part !== null && part !== undefined && part !== '').join(separator);
+    }
+    indent(text, count = 1) {
+        return text;
+    }
+    parens(content) {
+        return `(${content})`;
+    }
+    newline() {
+        return this.newlineChar;
+    }
+    tab() {
+        return this.tabChar;
+    }
+}

package/esm/{deparser/visitors → visitors}/base.js

@@ -1,7 +1,3 @@
-/**
- * Auto-generated file with types stripped for better tree-shaking
- * DO NOT EDIT - Generated by strip-deparser-types.ts
- */
 export class BaseVisitor {
     getNodeType(node) {
         return Object.keys(node)[0];

package/index.d.ts

@@ -1,9 +1,3 @@
-/**
- * Deparser for PostgreSQL version 16
- * Auto-generated by generate-version-deparsers.ts
- */
-import { Node, ParseResult } from '@pgsql/types';
-import { DeparserOptions } from './deparser';
-export declare function deparse(query: Node | Node[] | ParseResult, opts?: DeparserOptions): Promise<string>;
-export declare function deparseSync(query: Node | Node[] | ParseResult, opts?: DeparserOptions): string;
-export { DeparserOptions } from './deparser';
+import { Deparser, DeparserOptions } from "./deparser";
+declare const deparse: typeof Deparser.deparse;
+export { deparse, Deparser, DeparserOptions };

package/index.js

@@ -1,19 +1,7 @@
 "use strict";
-/**
- * Deparser for PostgreSQL version 16
- * Auto-generated by generate-version-deparsers.ts
- */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deparse = deparse;
-exports.deparseSync = deparseSync;
+exports.Deparser = exports.deparse = void 0;
 const deparser_1 = require("./deparser");
-const v16_to_v17_direct_1 = require("./v16-to-v17-direct");
-const tx = new v16_to_v17_direct_1.PG16ToPG17Transformer();
-async function deparse(query, opts) {
-    const ast17 = tx.transform(query);
-    return await (0, deparser_1.deparse)(ast17, opts);
-}
-function deparseSync(query, opts) {
-    const ast17 = tx.transform(query);
-    return (0, deparser_1.deparseSync)(ast17, opts);
-}
+Object.defineProperty(exports, "Deparser", { enumerable: true, get: function () { return deparser_1.Deparser; } });
+const deparse = deparser_1.Deparser.deparse;
+exports.deparse = deparse;

package/package.json

@@ -1,17 +1,13 @@
 {
+  "name": "pgsql-deparser",
+  "version": "17.4.0",
   "author": "Dan Lynch <pyramation@gmail.com>",
-  "homepage": "https://github.com/launchql/pgsql-parser",
-  "license": "MIT",
+  "description": "PostgreSQL AST Deparser",
   "main": "index.js",
   "module": "esm/index.js",
   "types": "index.d.ts",
-  "description": "PostgreSQL AST Deparser",
-  "scripts": {
-    "copy": "copyfiles -f ../../../../LICENSE README.md package.json dist",
-    "clean": "rimraf dist",
-    "build": "npm run clean && tsc && tsc -p tsconfig.esm.json && npm run copy",
-    "publish:pkg": "npm publish --tag pg16"
-  },
+  "homepage": "https://github.com/launchql/pgsql-parser",
+  "license": "SEE LICENSE IN LICENSE",
   "publishConfig": {
     "access": "public",
     "directory": "dist"
@@ -23,6 +19,21 @@
   "bugs": {
     "url": "https://github.com/launchql/pgsql-parser/issues"
   },
+  "scripts": {
+    "copy": "copyfiles -f ../../LICENSE README.md package.json dist",
+    "clean": "rimraf dist",
+    "prepare": "npm run build",
+    "build": "npm run clean && tsc && tsc -p tsconfig.esm.json && npm run copy",
+    "build:dev": "npm run clean && tsc --declarationMap && tsc -p tsconfig.esm.json && npm run copy",
+    "kitchen-sink": "npm run fixtures && npm run fixtures:kitchen-sink",
+    "fixtures:kitchen-sink": "ts-node scripts/make-kitchen-sink.ts",
+    "fixtures:ast": "ts-node scripts/make-fixtures-ast.ts",
+    "fixtures:sql": "ts-node scripts/make-fixtures-sql.ts",
+    "fixtures": "ts-node scripts/make-fixtures.ts",
+    "lint": "eslint . --fix",
+    "test": "jest",
+    "test:watch": "jest --watch"
+  },
   "keywords": [
     "sql",
     "postgres",
@@ -33,9 +44,11 @@
     "deparser",
     "database"
   ],
-  "name": "pgsql-deparser",
-  "version": "16.0.0",
+  "devDependencies": {
+    "libpg-query": "17.3.3"
+  },
   "dependencies": {
-    "@pgsql/types": "^16.1.1"
-  }
-}
+    "@pgsql/types": "^17.4.0"
+  },
+  "gitHead": "3725e93239a76bdc02d2d9159209e01d0142e364"
+}

package/utils/index.d.ts

@@ -0,0 +1,4 @@
+export declare const cleanLines: (sql: string) => string;
+export declare const transform: (obj: any, props: any) => any;
+export declare const cleanTree: (tree: any) => any;
+export declare const cleanTreeWithStmt: (tree: any) => any;

package/utils/index.js

@@ -0,0 +1,97 @@
+"use strict";
+/* eslint-disable no-restricted-syntax */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.cleanTreeWithStmt = exports.cleanTree = exports.transform = exports.cleanLines = void 0;
+const cleanLines = (sql) => {
+    return sql
+        .split('\n')
+        .map((l) => l.trim())
+        .filter((a) => a)
+        .join('\n');
+};
+exports.cleanLines = cleanLines;
+const transform = (obj, props) => {
+    let copy = null;
+    // Handle the 3 simple types, and null or undefined
+    if (obj == null || typeof obj !== 'object') {
+        return obj;
+    }
+    // Handle Date
+    if (obj instanceof Date) {
+        copy = new Date();
+        copy.setTime(obj.getTime());
+        return copy;
+    }
+    // Handle Array
+    if (obj instanceof Array) {
+        copy = [];
+        for (let i = 0, len = obj.length; i < len; i++) {
+            copy[i] = (0, exports.transform)(obj[i], props);
+        }
+        return copy;
+    }
+    // Handle Object
+    if (obj instanceof Object || typeof obj === 'object') {
+        copy = {};
+        for (const attr in obj) {
+            if (obj.hasOwnProperty(attr)) {
+                if (props.hasOwnProperty(attr)) {
+                    if (typeof props[attr] === 'function') {
+                        copy[attr] = props[attr](obj[attr]);
+                    }
+                    else if (props[attr].hasOwnProperty(obj[attr])) {
+                        copy[attr] = props[attr][obj[attr]];
+                    }
+                    else {
+                        copy[attr] = (0, exports.transform)(obj[attr], props);
+                    }
+                }
+                else {
+                    copy[attr] = (0, exports.transform)(obj[attr], props);
+                }
+            }
+            else {
+                copy[attr] = (0, exports.transform)(obj[attr], props);
+            }
+        }
+        return copy;
+    }
+    throw new Error("Unable to copy obj! Its type isn't supported.");
+};
+exports.transform = transform;
+const noop = () => undefined;
+const cleanTree = (tree) => {
+    return (0, exports.transform)(tree, {
+        stmt_len: noop,
+        stmt_location: noop,
+        location: noop,
+        DefElem: (obj) => {
+            if (obj.defname === 'as') {
+                if (Array.isArray(obj.arg) && obj.arg.length) {
+                    // function
+                    obj.arg[0].String.sval = obj.arg[0].String.sval.trim();
+                }
+                else if (obj.arg.List && obj.arg.List.items) {
+                    // function
+                    obj.arg.List.items[0].String.sval = obj.arg.List.items[0].String.sval.trim();
+                }
+                else {
+                    // do stmt
+                    obj.arg.String.sval = obj.arg.String.sval.trim();
+                }
+                return (0, exports.cleanTree)(obj);
+            }
+            else {
+                return (0, exports.cleanTree)(obj);
+            }
+        }
+    });
+};
+exports.cleanTree = cleanTree;
+const cleanTreeWithStmt = (tree) => {
+    return (0, exports.transform)(tree, {
+        stmt_location: noop,
+        location: noop
+    });
+};
+exports.cleanTreeWithStmt = cleanTreeWithStmt;

package/{deparser/utils → utils}/list-utils.d.ts

@@ -1,7 +1,3 @@
-/**
- * Auto-generated file with types stripped for better tree-shaking
- * DO NOT EDIT - Generated by strip-deparser-types.ts
- */
 export declare class ListUtils {
     static unwrapList(obj: any): any[];
     static formatList(items: any[], separator: string, prefix: string, formatter: (item: any) => string): string;

package/{deparser/utils → utils}/list-utils.js

@@ -1,8 +1,4 @@
 "use strict";
-/**
- * Auto-generated file with types stripped for better tree-shaking
- * DO NOT EDIT - Generated by strip-deparser-types.ts
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ListUtils = void 0;
 class ListUtils {

package/utils/quote-utils.d.ts

@@ -0,0 +1,5 @@
+export declare class QuoteUtils {
+    static needsQuotes(value: string): boolean;
+    static quote(value: any): any;
+    static escape(literal: string): string;
+}

package/{deparser/utils → utils}/quote-utils.js

@@ -1,8 +1,4 @@
 "use strict";
-/**
- * Auto-generated file with types stripped for better tree-shaking
- * DO NOT EDIT - Generated by strip-deparser-types.ts
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.QuoteUtils = void 0;
 const RESERVED_WORDS = new Set([
@@ -55,35 +51,5 @@ class QuoteUtils {
     static escape(literal) {
         return `'${literal.replace(/'/g, "''")}'`;
     }
-    /**
-     * Escapes a string value for use in E-prefixed string literals
-     * Handles both backslashes and single quotes properly
-     */
-    static escapeEString(value) {
-        return value.replace(/\\/g, '\\\\').replace(/'/g, "''");
-    }
-    /**
-     * Formats a string as an E-prefixed string literal with proper escaping
-     * This wraps the complete E-prefix logic including detection and formatting
-     */
-    static formatEString(value) {
-        const needsEscape = QuoteUtils.needsEscapePrefix(value);
-        if (needsEscape) {
-            const escapedValue = QuoteUtils.escapeEString(value);
-            return `E'${escapedValue}'`;
-        }
-        else {
-            return QuoteUtils.escape(value);
-        }
-    }
-    /**
-     * Determines if a string value needs E-prefix for escaped string literals
-     * Detects backslash escape sequences that require E-prefix in PostgreSQL
-     */
-    static needsEscapePrefix(value) {
-        // Always use E'' if the string contains any backslashes,
-        // unless it's a raw \x... bytea-style literal.
-        return !/^\\x[0-9a-fA-F]+$/i.test(value) && value.includes('\\');
-    }
 }
 exports.QuoteUtils = QuoteUtils;

package/{deparser/utils → utils}/sql-formatter.d.ts

@@ -1,16 +1,10 @@
-/**
- * Auto-generated file with types stripped for better tree-shaking
- * DO NOT EDIT - Generated by strip-deparser-types.ts
- */
 export declare class SqlFormatter {
     private newlineChar;
     private tabChar;
-    private prettyMode;
-    constructor(newlineChar?: string, tabChar?: string, prettyMode?: boolean);
+    constructor(newlineChar?: string, tabChar?: string);
     format(parts: string[], separator?: string): string;
     indent(text: string, count?: number): string;
     parens(content: string): string;
     newline(): string;
     tab(): string;
-    isPretty(): boolean;
 }

package/{deparser/utils → utils}/sql-formatter.js

@@ -1,28 +1,18 @@
 "use strict";
-/**
- * Auto-generated file with types stripped for better tree-shaking
- * DO NOT EDIT - Generated by strip-deparser-types.ts
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SqlFormatter = void 0;
 class SqlFormatter {
     newlineChar;
     tabChar;
-    prettyMode;
-    constructor(newlineChar = '\n', tabChar = '  ', prettyMode = false) {
+    constructor(newlineChar = '\n', tabChar = '  ') {
         this.newlineChar = newlineChar;
         this.tabChar = tabChar;
-        this.prettyMode = prettyMode;
     }
     format(parts, separator = ' ') {
         return parts.filter(part => part !== null && part !== undefined && part !== '').join(separator);
     }
     indent(text, count = 1) {
-        if (!this.prettyMode) {
-            return text;
-        }
-        const indentation = this.tabChar.repeat(count);
-        return text.split(this.newlineChar).map(line => line.trim() ? indentation + line : line).join(this.newlineChar);
+        return text;
     }
     parens(content) {
         return `(${content})`;
@@ -33,8 +23,5 @@ class SqlFormatter {
     tab() {
         return this.tabChar;
     }
-    isPretty() {
-        return this.prettyMode;
-    }
 }
 exports.SqlFormatter = SqlFormatter;

package/{deparser/visitors → visitors}/base.d.ts

@@ -1,19 +1,16 @@
-/**
- * Auto-generated file with types stripped for better tree-shaking
- * DO NOT EDIT - Generated by strip-deparser-types.ts
- */
+import { Node } from '@pgsql/types';
 export interface DeparserContext {
     isStringLiteral?: boolean;
     parentNodeTypes: string[];
     [key: string]: any;
 }
 export interface DeparserVisitor {
-    visit(node: any, context?: DeparserContext): string;
+    visit(node: Node, context?: DeparserContext): string;
 }
 export declare abstract class BaseVisitor implements DeparserVisitor {
-    abstract visit(node: any, context?: DeparserContext): string;
-    protected getNodeType(node: any): string;
-    protected getNodeData(node: any): any;
+    abstract visit(node: Node, context?: DeparserContext): string;
+    protected getNodeType(node: Node): string;
+    protected getNodeData(node: Node): any;
     protected formatList(items: any[], separator: string, prefix: string, formatter: (item: any) => string): string;
     protected formatParts(parts: string[], separator?: string): string;
     protected formatParens(content: string): string;

package/{deparser/visitors → visitors}/base.js

@@ -1,8 +1,4 @@
 "use strict";
-/**
- * Auto-generated file with types stripped for better tree-shaking
- * DO NOT EDIT - Generated by strip-deparser-types.ts
- */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseVisitor = void 0;
 class BaseVisitor {