pgsql-deparser 18.3.8 → 18.3.9

package/deparser.d.ts

@@ -8,31 +8,6 @@ export interface DeparserOptions {
     functionDelimiterFallback?: string;
     pretty?: boolean;
 }
-/**
- * Deparser - Converts PostgreSQL AST nodes back to SQL strings
- *
- * Entry Points:
- * 1. ParseResult (from libpg-query) - The complete parse result
- *    Structure: { version: number, stmts: RawStmt[] }
- *    Note: stmts is "repeated RawStmt" in protobuf, so array contains RawStmt
- *    objects inline (not wrapped as { RawStmt: ... } nodes)
- *    Example: { version: 170004, stmts: [{ stmt: {...}, stmt_len: 32 }] }
- *
- * 2. Wrapped ParseResult - When explicitly wrapped as a Node
- *    Structure: { ParseResult: { version: number, stmts: RawStmt[] } }
- *
- * 3. Wrapped RawStmt - When explicitly wrapped as a Node
- *    Structure: { RawStmt: { stmt: Node, stmt_len?: number } }
- *
- * 4. Array of Nodes - Multiple statements to deparse
- *    Can be: Node[] (e.g., SelectStmt, InsertStmt, etc.)
- *
- * 5. Single Node - Individual statement node
- *    Example: { SelectStmt: {...} }, { InsertStmt: {...} }, etc.
- *
- * The deparser automatically detects bare ParseResult objects for backward
- * compatibility and wraps them internally for consistent processing.
- */
 export declare class Deparser implements DeparserVisitor {
     private tree;
     private options;

package/deparser.js

@@ -122,6 +122,16 @@ function isWrappedParseResult(obj) {
  * The deparser automatically detects bare ParseResult objects for backward
  * compatibility and wraps them internally for consistent processing.
  */
+function formatBitString(bsval) {
+    const quote = (value) => value.replace(/'/g, "''");
+    if (/^x[0-9A-Fa-f]+$/.test(bsval)) {
+        return `x'${bsval.substring(1)}'`;
+    }
+    if (bsval.startsWith('b')) {
+        return `b'${quote(bsval.substring(1))}'`;
+    }
+    return `b'${quote(bsval)}'`;
+}
 class Deparser {
     tree;
     options;
@@ -1669,15 +1679,7 @@ class Deparser {
         else if (nodeAny.bsval !== undefined) {
             if (typeof nodeAny.bsval === 'object' && nodeAny.bsval !== null) {
                 if (nodeAny.bsval.bsval !== undefined) {
-                    const bsval = nodeAny.bsval.bsval;
-                    // Check if this is a hexadecimal bit string (starts with x and contains only hex digits)
-                    if (bsval.startsWith('x') && /^x[0-9A-Fa-f]+$/.test(bsval)) {
-                        return `x'${bsval.substring(1)}'`;
-                    }
-                    if (bsval.startsWith('b')) {
-                        return `b'${bsval.substring(1)}'`;
-                    }
-                    return `b'${bsval}'`;
+                    return formatBitString(nodeAny.bsval.bsval);
                 }
                 else if (Object.keys(nodeAny.bsval).length === 0) {
                     return "''";
@@ -1690,15 +1692,7 @@ class Deparser {
                 return 'NULL';
             }
             else {
-                const bsval = nodeAny.bsval;
-                // Check if this is a hexadecimal bit string (starts with x and contains only hex digits)
-                if (bsval.startsWith('x') && /^x[0-9A-Fa-f]+$/.test(bsval)) {
-                    return `x'${bsval.substring(1)}'`;
-                }
-                if (bsval.startsWith('b')) {
-                    return `b'${bsval.substring(1)}'`;
-                }
-                return `b'${bsval}'`;
+                return formatBitString(nodeAny.bsval);
             }
         }
         if (nodeAny.val) {
@@ -1715,7 +1709,7 @@ class Deparser {
                 return nodeAny.val.Boolean.boolval ? 'true' : 'false';
             }
             else if (nodeAny.val.BitString?.bsval !== undefined) {
-                return nodeAny.val.BitString.bsval;
+                return formatBitString(nodeAny.val.BitString.bsval);
             }
         }
         if (nodeAny.isnull === true) {
@@ -2395,15 +2389,7 @@ class Deparser {
         return node.boolval ? 'true' : 'false';
     }
     BitString(node, context) {
-        // Check if this is a hexadecimal bit string (starts with x)
-        if (node.bsval.startsWith('x')) {
-            return `x'${node.bsval.substring(1)}'`;
-        }
-        if (node.bsval.startsWith('b')) {
-            return `b'${node.bsval.substring(1)}'`;
-        }
-        // Fallback for raw values without prefix
-        return `b'${node.bsval}'`;
+        return formatBitString(node.bsval);
     }
     Null(node, context) {
         return 'NULL';

package/esm/deparser.js

@@ -119,6 +119,16 @@ function isWrappedParseResult(obj) {
  * The deparser automatically detects bare ParseResult objects for backward
  * compatibility and wraps them internally for consistent processing.
  */
+function formatBitString(bsval) {
+    const quote = (value) => value.replace(/'/g, "''");
+    if (/^x[0-9A-Fa-f]+$/.test(bsval)) {
+        return `x'${bsval.substring(1)}'`;
+    }
+    if (bsval.startsWith('b')) {
+        return `b'${quote(bsval.substring(1))}'`;
+    }
+    return `b'${quote(bsval)}'`;
+}
 export class Deparser {
     tree;
     options;
@@ -1666,15 +1676,7 @@ export class Deparser {
         else if (nodeAny.bsval !== undefined) {
             if (typeof nodeAny.bsval === 'object' && nodeAny.bsval !== null) {
                 if (nodeAny.bsval.bsval !== undefined) {
-                    const bsval = nodeAny.bsval.bsval;
-                    // Check if this is a hexadecimal bit string (starts with x and contains only hex digits)
-                    if (bsval.startsWith('x') && /^x[0-9A-Fa-f]+$/.test(bsval)) {
-                        return `x'${bsval.substring(1)}'`;
-                    }
-                    if (bsval.startsWith('b')) {
-                        return `b'${bsval.substring(1)}'`;
-                    }
-                    return `b'${bsval}'`;
+                    return formatBitString(nodeAny.bsval.bsval);
                 }
                 else if (Object.keys(nodeAny.bsval).length === 0) {
                     return "''";
@@ -1687,15 +1689,7 @@ export class Deparser {
                 return 'NULL';
             }
             else {
-                const bsval = nodeAny.bsval;
-                // Check if this is a hexadecimal bit string (starts with x and contains only hex digits)
-                if (bsval.startsWith('x') && /^x[0-9A-Fa-f]+$/.test(bsval)) {
-                    return `x'${bsval.substring(1)}'`;
-                }
-                if (bsval.startsWith('b')) {
-                    return `b'${bsval.substring(1)}'`;
-                }
-                return `b'${bsval}'`;
+                return formatBitString(nodeAny.bsval);
             }
         }
         if (nodeAny.val) {
@@ -1712,7 +1706,7 @@ export class Deparser {
                 return nodeAny.val.Boolean.boolval ? 'true' : 'false';
             }
             else if (nodeAny.val.BitString?.bsval !== undefined) {
-                return nodeAny.val.BitString.bsval;
+                return formatBitString(nodeAny.val.BitString.bsval);
             }
         }
         if (nodeAny.isnull === true) {
@@ -2392,15 +2386,7 @@ export class Deparser {
         return node.boolval ? 'true' : 'false';
     }
     BitString(node, context) {
-        // Check if this is a hexadecimal bit string (starts with x)
-        if (node.bsval.startsWith('x')) {
-            return `x'${node.bsval.substring(1)}'`;
-        }
-        if (node.bsval.startsWith('b')) {
-            return `b'${node.bsval.substring(1)}'`;
-        }
-        // Fallback for raw values without prefix
-        return `b'${node.bsval}'`;
+        return formatBitString(node.bsval);
     }
     Null(node, context) {
         return 'NULL';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-deparser",
-  "version": "18.3.8",
+  "version": "18.3.9",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL AST Deparser",
   "main": "index.js",
@@ -60,5 +60,5 @@
     "@pgsql/quotes": "18.2.4",
     "@pgsql/types": "^18.0.0"
   },
-  "gitHead": "b93d0f73eab976c7db21f7bc7e2dad165d25173e"
+  "gitHead": "506aa3b63613eea04b78afc1ac440bc84b8a07ad"
 }