pgsql-deparser 17.17.2 → 17.18.1

package/esm/deparser.js

@@ -1,6 +1,6 @@
 import { DeparserContext } from './visitors/base';
 import { SqlFormatter } from './utils/sql-formatter';
-import { QuoteUtils } from './utils/quote-utils';
+import { QuoteUtils } from '@pgsql/quotes';
 import { ListUtils } from './utils/list-utils';
 /**
  * List of real PostgreSQL built-in types as they appear in pg_catalog.pg_type.typname.
@@ -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)) {
@@ -1761,7 +1759,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 +2871,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 +3008,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 +3026,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 +3104,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/esm/index.js

@@ -7,4 +7,4 @@ export const deparse = async (...args) => {
     return deparseMethod(...args);
 };
 export { Deparser };
-export { QuoteUtils } from './utils/quote-utils';
+export { QuoteUtils } from '@pgsql/quotes';

package/index.d.ts

@@ -3,4 +3,4 @@ declare const deparseMethod: typeof Deparser.deparse;
 export declare const deparseSync: typeof Deparser.deparse;
 export declare const deparse: (...args: Parameters<typeof deparseMethod>) => Promise<ReturnType<typeof deparseMethod>>;
 export { Deparser, DeparserOptions };
-export { QuoteUtils } from './utils/quote-utils';
+export { QuoteUtils } from '@pgsql/quotes';

package/index.js

@@ -11,5 +11,5 @@ const deparse = async (...args) => {
     return deparseMethod(...args);
 };
 exports.deparse = deparse;
-var quote_utils_1 = require("./utils/quote-utils");
-Object.defineProperty(exports, "QuoteUtils", { enumerable: true, get: function () { return quote_utils_1.QuoteUtils; } });
+var quotes_1 = require("@pgsql/quotes");
+Object.defineProperty(exports, "QuoteUtils", { enumerable: true, get: function () { return quotes_1.QuoteUtils; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgsql-deparser",
-  "version": "17.17.2",
+  "version": "17.18.1",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL AST Deparser",
   "main": "index.js",
@@ -40,8 +40,7 @@
     "organize-transformers": "ts-node scripts/organize-transformers-by-version.ts",
     "generate-version-deparsers": "ts-node scripts/generate-version-deparsers.ts",
     "generate-packages": "ts-node scripts/generate-version-packages.ts",
-    "prepare-versions": "npm run strip-transformer-types && npm run strip-direct-transformer-types && npm run strip-deparser-types && npm run organize-transformers && npm run generate-version-deparsers && npm run generate-packages",
-    "keywords": "ts-node scripts/keywords.ts"
+    "prepare-versions": "npm run strip-transformer-types && npm run strip-direct-transformer-types && npm run strip-deparser-types && npm run organize-transformers && npm run generate-version-deparsers && npm run generate-packages"
   },
   "keywords": [
     "sql",
@@ -58,7 +57,8 @@
     "makage": "^0.1.8"
   },
   "dependencies": {
+    "@pgsql/quotes": "17.1.0",
     "@pgsql/types": "^17.6.2"
   },
-  "gitHead": "65aeb17fd6ba57c698831988bb8e4efb942ca4e1"
+  "gitHead": "58ddefe11a5d002db6645fa7bc2f284123d48470"
 }

package/esm/kwlist.js

@@ -1,531 +0,0 @@
-/* eslint-disable */
-/**
- * Generated from PostgreSQL kwlist.h
- * DO NOT EDIT BY HAND.
- */
-export const kwlist = {
-    UNRESERVED_KEYWORD: [
-        "abort",
-        "absent",
-        "absolute",
-        "access",
-        "action",
-        "add",
-        "admin",
-        "after",
-        "aggregate",
-        "also",
-        "alter",
-        "always",
-        "asensitive",
-        "assertion",
-        "assignment",
-        "at",
-        "atomic",
-        "attach",
-        "attribute",
-        "backward",
-        "before",
-        "begin",
-        "breadth",
-        "by",
-        "cache",
-        "call",
-        "called",
-        "cascade",
-        "cascaded",
-        "catalog",
-        "chain",
-        "characteristics",
-        "checkpoint",
-        "class",
-        "close",
-        "cluster",
-        "columns",
-        "comment",
-        "comments",
-        "commit",
-        "committed",
-        "compression",
-        "conditional",
-        "configuration",
-        "conflict",
-        "connection",
-        "constraints",
-        "content",
-        "continue",
-        "conversion",
-        "copy",
-        "cost",
-        "csv",
-        "cube",
-        "current",
-        "cursor",
-        "cycle",
-        "data",
-        "database",
-        "day",
-        "deallocate",
-        "declare",
-        "defaults",
-        "deferred",
-        "definer",
-        "delete",
-        "delimiter",
-        "delimiters",
-        "depends",
-        "depth",
-        "detach",
-        "dictionary",
-        "disable",
-        "discard",
-        "document",
-        "domain",
-        "double",
-        "drop",
-        "each",
-        "empty",
-        "enable",
-        "encoding",
-        "encrypted",
-        "enforced",
-        "enum",
-        "error",
-        "escape",
-        "event",
-        "exclude",
-        "excluding",
-        "exclusive",
-        "execute",
-        "explain",
-        "expression",
-        "extension",
-        "external",
-        "family",
-        "filter",
-        "finalize",
-        "first",
-        "following",
-        "force",
-        "format",
-        "forward",
-        "function",
-        "functions",
-        "generated",
-        "global",
-        "granted",
-        "groups",
-        "handler",
-        "header",
-        "hold",
-        "hour",
-        "identity",
-        "if",
-        "ignore",
-        "immediate",
-        "immutable",
-        "implicit",
-        "import",
-        "include",
-        "including",
-        "increment",
-        "indent",
-        "index",
-        "indexes",
-        "inherit",
-        "inherits",
-        "inline",
-        "input",
-        "insensitive",
-        "insert",
-        "instead",
-        "invoker",
-        "isolation",
-        "keep",
-        "key",
-        "keys",
-        "label",
-        "language",
-        "large",
-        "last",
-        "leakproof",
-        "level",
-        "listen",
-        "load",
-        "local",
-        "location",
-        "lock",
-        "locked",
-        "logged",
-        "lsn",
-        "mapping",
-        "match",
-        "matched",
-        "materialized",
-        "maxvalue",
-        "merge",
-        "method",
-        "minute",
-        "minvalue",
-        "mode",
-        "month",
-        "move",
-        "name",
-        "names",
-        "nested",
-        "new",
-        "next",
-        "nfc",
-        "nfd",
-        "nfkc",
-        "nfkd",
-        "no",
-        "normalized",
-        "nothing",
-        "notify",
-        "nowait",
-        "nulls",
-        "object",
-        "objects",
-        "of",
-        "off",
-        "oids",
-        "old",
-        "omit",
-        "operator",
-        "option",
-        "options",
-        "ordinality",
-        "others",
-        "over",
-        "overriding",
-        "owned",
-        "owner",
-        "parallel",
-        "parameter",
-        "parser",
-        "partial",
-        "partition",
-        "partitions",
-        "passing",
-        "password",
-        "path",
-        "period",
-        "plan",
-        "plans",
-        "policy",
-        "preceding",
-        "prepare",
-        "prepared",
-        "preserve",
-        "prior",
-        "privileges",
-        "procedural",
-        "procedure",
-        "procedures",
-        "program",
-        "publication",
-        "quote",
-        "quotes",
-        "range",
-        "read",
-        "reassign",
-        "recursive",
-        "ref",
-        "referencing",
-        "refresh",
-        "reindex",
-        "relative",
-        "release",
-        "rename",
-        "repeatable",
-        "replace",
-        "replica",
-        "reset",
-        "respect",
-        "restart",
-        "restrict",
-        "return",
-        "returns",
-        "revoke",
-        "role",
-        "rollback",
-        "rollup",
-        "routine",
-        "routines",
-        "rows",
-        "rule",
-        "savepoint",
-        "scalar",
-        "schema",
-        "schemas",
-        "scroll",
-        "search",
-        "second",
-        "security",
-        "sequence",
-        "sequences",
-        "serializable",
-        "server",
-        "session",
-        "set",
-        "sets",
-        "share",
-        "show",
-        "simple",
-        "skip",
-        "snapshot",
-        "source",
-        "split",
-        "sql",
-        "stable",
-        "standalone",
-        "start",
-        "statement",
-        "statistics",
-        "stdin",
-        "stdout",
-        "storage",
-        "stored",
-        "strict",
-        "string",
-        "strip",
-        "subscription",
-        "support",
-        "sysid",
-        "system",
-        "tables",
-        "tablespace",
-        "target",
-        "temp",
-        "template",
-        "temporary",
-        "text",
-        "ties",
-        "transaction",
-        "transform",
-        "trigger",
-        "truncate",
-        "trusted",
-        "type",
-        "types",
-        "uescape",
-        "unbounded",
-        "uncommitted",
-        "unconditional",
-        "unencrypted",
-        "unknown",
-        "unlisten",
-        "unlogged",
-        "until",
-        "update",
-        "vacuum",
-        "valid",
-        "validate",
-        "validator",
-        "value",
-        "varying",
-        "version",
-        "view",
-        "views",
-        "virtual",
-        "volatile",
-        "wait",
-        "whitespace",
-        "within",
-        "without",
-        "work",
-        "wrapper",
-        "write",
-        "xml",
-        "year",
-        "yes",
-        "zone"
-    ],
-    RESERVED_KEYWORD: [
-        "all",
-        "analyse",
-        "analyze",
-        "and",
-        "any",
-        "array",
-        "as",
-        "asc",
-        "asymmetric",
-        "both",
-        "case",
-        "cast",
-        "check",
-        "collate",
-        "column",
-        "constraint",
-        "create",
-        "current_catalog",
-        "current_date",
-        "current_role",
-        "current_time",
-        "current_timestamp",
-        "current_user",
-        "default",
-        "deferrable",
-        "desc",
-        "distinct",
-        "do",
-        "else",
-        "end",
-        "except",
-        "false",
-        "fetch",
-        "for",
-        "foreign",
-        "from",
-        "grant",
-        "group",
-        "having",
-        "in",
-        "initially",
-        "intersect",
-        "into",
-        "lateral",
-        "leading",
-        "limit",
-        "localtime",
-        "localtimestamp",
-        "not",
-        "null",
-        "offset",
-        "on",
-        "only",
-        "or",
-        "order",
-        "placing",
-        "primary",
-        "references",
-        "returning",
-        "select",
-        "session_user",
-        "some",
-        "symmetric",
-        "system_user",
-        "table",
-        "then",
-        "to",
-        "trailing",
-        "true",
-        "union",
-        "unique",
-        "user",
-        "using",
-        "variadic",
-        "when",
-        "where",
-        "window",
-        "with"
-    ],
-    TYPE_FUNC_NAME_KEYWORD: [
-        "authorization",
-        "binary",
-        "collation",
-        "concurrently",
-        "cross",
-        "current_schema",
-        "freeze",
-        "full",
-        "ilike",
-        "inner",
-        "is",
-        "isnull",
-        "join",
-        "left",
-        "like",
-        "natural",
-        "notnull",
-        "outer",
-        "overlaps",
-        "right",
-        "similar",
-        "tablesample",
-        "verbose"
-    ],
-    COL_NAME_KEYWORD: [
-        "between",
-        "bigint",
-        "bit",
-        "boolean",
-        "char",
-        "character",
-        "coalesce",
-        "dec",
-        "decimal",
-        "exists",
-        "extract",
-        "float",
-        "greatest",
-        "grouping",
-        "inout",
-        "int",
-        "integer",
-        "interval",
-        "json",
-        "json_array",
-        "json_arrayagg",
-        "json_exists",
-        "json_object",
-        "json_objectagg",
-        "json_query",
-        "json_scalar",
-        "json_serialize",
-        "json_table",
-        "json_value",
-        "least",
-        "merge_action",
-        "national",
-        "nchar",
-        "none",
-        "normalize",
-        "nullif",
-        "numeric",
-        "out",
-        "overlay",
-        "position",
-        "precision",
-        "real",
-        "row",
-        "setof",
-        "smallint",
-        "substring",
-        "time",
-        "timestamp",
-        "treat",
-        "trim",
-        "values",
-        "varchar",
-        "xmlattributes",
-        "xmlconcat",
-        "xmlelement",
-        "xmlexists",
-        "xmlforest",
-        "xmlnamespaces",
-        "xmlparse",
-        "xmlpi",
-        "xmlroot",
-        "xmlserialize",
-        "xmltable"
-    ]
-};
-export const RESERVED_KEYWORDS = new Set(kwlist.RESERVED_KEYWORD ?? []);
-export const UNRESERVED_KEYWORDS = new Set(kwlist.UNRESERVED_KEYWORD ?? []);
-export const COL_NAME_KEYWORDS = new Set(kwlist.COL_NAME_KEYWORD ?? []);
-export const TYPE_FUNC_NAME_KEYWORDS = new Set(kwlist.TYPE_FUNC_NAME_KEYWORD ?? []);
-export function keywordKindOf(word) {
-    const w = word.toLowerCase();
-    if (RESERVED_KEYWORDS.has(w))
-        return "RESERVED_KEYWORD";
-    if (TYPE_FUNC_NAME_KEYWORDS.has(w))
-        return "TYPE_FUNC_NAME_KEYWORD";
-    if (COL_NAME_KEYWORDS.has(w))
-        return "COL_NAME_KEYWORD";
-    if (UNRESERVED_KEYWORDS.has(w))
-        return "UNRESERVED_KEYWORD";
-    return "NO_KEYWORD";
-}