pgsql-deparser 18.3.11 → 18.3.12

package/deparser.js

@@ -124,7 +124,7 @@ function isWrappedParseResult(obj) {
  */
 function formatBitString(bsval) {
     const quote = (value) => value.replace(/'/g, "''");
-    if (/^x[0-9A-Fa-f]+$/.test(bsval)) {
+    if (/^x[0-9A-Fa-f]*$/.test(bsval)) {
         return `x'${bsval.substring(1)}'`;
     }
     if (bsval.startsWith('b')) {
@@ -132,6 +132,11 @@ function formatBitString(bsval) {
     }
     return `b'${quote(bsval)}'`;
 }
+// A dollar-quoted body ends at the first occurrence of its tag, including one
+// formed by the body's trailing characters plus the closing tag (`...$` + `$$`).
+function dollarTagConflicts(body, tag) {
+    return (body + tag).indexOf(tag) < body.length;
+}
 const NUMERIC_LITERAL = /^[+-]?(?:0[xX](?:_?[0-9A-Fa-f])+|0[oO](?:_?[0-7])+|0[bB](?:_?[01])+|(?:\d(?:_?\d)*(?:\.(?:\d(?:_?\d)*)?)?|\.\d(?:_?\d)*)(?:[eE][+-]?\d(?:_?\d)*)?)$/;
 function formatInteger(ival) {
     const value = String(ival);
@@ -206,10 +211,19 @@ class Deparser {
      */
     getFunctionDelimiter(body) {
         const delimiter = this.options.functionDelimiter || '$$';
-        if (body.includes(delimiter)) {
-            return this.options.functionDelimiterFallback || '$EOFCODE$';
+        if (!dollarTagConflicts(body, delimiter)) {
+            return delimiter;
+        }
+        const fallback = this.options.functionDelimiterFallback || '$EOFCODE$';
+        if (!dollarTagConflicts(body, fallback)) {
+            return fallback;
+        }
+        const base = fallback.slice(0, -1);
+        let counter = 1;
+        while (dollarTagConflicts(body, `${base}${counter}$`)) {
+            counter++;
         }
-        return delimiter;
+        return `${base}${counter}$`;
     }
     /**
      * Maps ObjectType enum values to their corresponding SQL keywords
@@ -9811,7 +9825,9 @@ class Deparser {
     formatOptionValue(arg, argValue) {
         if (arg && this.getNodeType(arg) === 'String') {
             const sval = this.getNodeData(arg).sval || '';
-            return /^[A-Za-z_][A-Za-z0-9_]*$/.test(sval) ? sval : quotes_1.QuoteUtils.escape(sval);
+            return /^[a-z_][a-z0-9_]*$/.test(sval) && (0, quotes_1.keywordKindOf)(sval) === 'NO_KEYWORD'
+                ? sval
+                : quotes_1.QuoteUtils.escape(sval);
         }
         return argValue;
     }

package/esm/deparser.js

@@ -1,4 +1,4 @@
-import { QuoteUtils } from '@pgsql/quotes';
+import { keywordKindOf, QuoteUtils } from '@pgsql/quotes';
 import { ListUtils } from './utils/list-utils';
 import { SqlFormatter } from './utils/sql-formatter';
 import { DeparserContext } from './visitors/base';
@@ -121,7 +121,7 @@ function isWrappedParseResult(obj) {
  */
 function formatBitString(bsval) {
     const quote = (value) => value.replace(/'/g, "''");
-    if (/^x[0-9A-Fa-f]+$/.test(bsval)) {
+    if (/^x[0-9A-Fa-f]*$/.test(bsval)) {
         return `x'${bsval.substring(1)}'`;
     }
     if (bsval.startsWith('b')) {
@@ -129,6 +129,11 @@ function formatBitString(bsval) {
     }
     return `b'${quote(bsval)}'`;
 }
+// A dollar-quoted body ends at the first occurrence of its tag, including one
+// formed by the body's trailing characters plus the closing tag (`...$` + `$$`).
+function dollarTagConflicts(body, tag) {
+    return (body + tag).indexOf(tag) < body.length;
+}
 const NUMERIC_LITERAL = /^[+-]?(?:0[xX](?:_?[0-9A-Fa-f])+|0[oO](?:_?[0-7])+|0[bB](?:_?[01])+|(?:\d(?:_?\d)*(?:\.(?:\d(?:_?\d)*)?)?|\.\d(?:_?\d)*)(?:[eE][+-]?\d(?:_?\d)*)?)$/;
 function formatInteger(ival) {
     const value = String(ival);
@@ -203,10 +208,19 @@ export class Deparser {
      */
     getFunctionDelimiter(body) {
         const delimiter = this.options.functionDelimiter || '$$';
-        if (body.includes(delimiter)) {
-            return this.options.functionDelimiterFallback || '$EOFCODE$';
+        if (!dollarTagConflicts(body, delimiter)) {
+            return delimiter;
+        }
+        const fallback = this.options.functionDelimiterFallback || '$EOFCODE$';
+        if (!dollarTagConflicts(body, fallback)) {
+            return fallback;
+        }
+        const base = fallback.slice(0, -1);
+        let counter = 1;
+        while (dollarTagConflicts(body, `${base}${counter}$`)) {
+            counter++;
         }
-        return delimiter;
+        return `${base}${counter}$`;
     }
     /**
      * Maps ObjectType enum values to their corresponding SQL keywords
@@ -9808,7 +9822,9 @@ export class Deparser {
     formatOptionValue(arg, argValue) {
         if (arg && this.getNodeType(arg) === 'String') {
             const sval = this.getNodeData(arg).sval || '';
-            return /^[A-Za-z_][A-Za-z0-9_]*$/.test(sval) ? sval : QuoteUtils.escape(sval);
+            return /^[a-z_][a-z0-9_]*$/.test(sval) && keywordKindOf(sval) === 'NO_KEYWORD'
+                ? sval
+                : QuoteUtils.escape(sval);
         }
         return argValue;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-deparser",
-  "version": "18.3.11",
+  "version": "18.3.12",
   "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": "253de85d89081d866200077492ce69c3a2e96b04"
+  "gitHead": "b4605c200dd1ee25af88965997217a312d4afa27"
 }