plpgsql-parse 0.2.6 → 1.0.0

package/deparse.js

@@ -10,7 +10,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deparseSync = deparseSync;
 exports.deparse = deparse;
-const parser_1 = require("@libpg-query/parser");
+const libpg_query_1 = require("libpg-query");
 const pgsql_parse_1 = require("pgsql-parse");
 const pgsql_deparser_1 = require("pgsql-deparser");
 const plpgsql_deparser_1 = require("plpgsql-deparser");
@@ -88,7 +88,7 @@ function deparseWithBodyComments(rawStmt, fnComments, pretty) {
         if (!cleanSql)
             return null;
         // Parse PL/pgSQL from the clean SQL
-        const plpgsqlRaw = (0, parser_1.parsePlPgSQLSync)(cleanSql);
+        const plpgsqlRaw = (0, libpg_query_1.parsePlPgSQLSync)(cleanSql);
         const { ast: hydrated } = (0, plpgsql_deparser_1.hydratePlpgsqlAst)(plpgsqlRaw);
         const dehydrated = (0, plpgsql_deparser_1.dehydratePlpgsqlAst)(hydrated);
         const plpgsqlFunc = dehydrated.plpgsql_funcs?.[0]?.PLpgSQL_function;
@@ -152,10 +152,21 @@ function reinjectBodyComments(originalBody, deparsedBody, comments, plpgsqlAst)
     const stmtKeywords = buildStmtKeywords(plpgsqlAst);
     let stmtKeyIdx = 0;
     const usedAnchors = new Set();
+    // Track DECLARE sections: lines between DECLARE and the following BEGIN
+    // are variable declarations, not statements, and must not consume
+    // statement keyword matches (e.g. a declaration `v_x int;` would
+    // otherwise match an assignment to `v_x`).
+    let inDeclare = false;
     for (const line of depLines) {
         const trimmed = line.trim().toUpperCase();
+        if (trimmed === 'DECLARE') {
+            inDeclare = true;
+        }
+        else if (inDeclare && trimmed.startsWith('BEGIN')) {
+            inDeclare = false;
+        }
         // Try to match this line to the next expected statement
-        if (stmtKeyIdx < stmtKeywords.length) {
+        if (!inDeclare && stmtKeyIdx < stmtKeywords.length) {
             const { lineno, keywords } = stmtKeywords[stmtKeyIdx];
             if (lineMatchesKeywords(trimmed, keywords)) {
                 // Insert comments anchored to this statement
@@ -505,19 +516,24 @@ function findLastEndLine(lines) {
 }
 /**
  * Replace the function body in a CREATE FUNCTION AST node.
+ * The body is padded with newlines so it renders as
+ * `AS $$\n<body>\n$$` rather than gluing onto the dollar quotes.
  */
 function stitchBodyIntoAst(createFunctionStmt, newBody) {
     if (!createFunctionStmt?.options)
         return;
+    const padded = (newBody.startsWith('\n') ? '' : '\n') +
+        newBody +
+        (newBody.endsWith('\n') ? '' : '\n');
     for (const opt of createFunctionStmt.options) {
         if (opt?.DefElem?.defname === 'as') {
             const arg = opt.DefElem.arg;
             if (arg?.List?.items?.[0]?.String) {
-                arg.List.items[0].String.sval = newBody;
+                arg.List.items[0].String.sval = padded;
                 return;
             }
             if (arg?.String) {
-                arg.String.sval = newBody;
+                arg.String.sval = padded;
                 return;
             }
         }

package/esm/deparse.js

@@ -6,7 +6,7 @@
  *
  * This module does NOT modify plpgsql-deparser or pgsql-deparser.
  */
-import { parsePlPgSQLSync, } from '@libpg-query/parser';
+import { parsePlPgSQLSync, } from 'libpg-query';
 import { isRawComment, isRawWhitespace, isRawStmt, } from 'pgsql-parse';
 import { Deparser } from 'pgsql-deparser';
 import { hydratePlpgsqlAst, dehydratePlpgsqlAst, deparseFunctionSync, } from 'plpgsql-deparser';
@@ -148,10 +148,21 @@ function reinjectBodyComments(originalBody, deparsedBody, comments, plpgsqlAst)
     const stmtKeywords = buildStmtKeywords(plpgsqlAst);
     let stmtKeyIdx = 0;
     const usedAnchors = new Set();
+    // Track DECLARE sections: lines between DECLARE and the following BEGIN
+    // are variable declarations, not statements, and must not consume
+    // statement keyword matches (e.g. a declaration `v_x int;` would
+    // otherwise match an assignment to `v_x`).
+    let inDeclare = false;
     for (const line of depLines) {
         const trimmed = line.trim().toUpperCase();
+        if (trimmed === 'DECLARE') {
+            inDeclare = true;
+        }
+        else if (inDeclare && trimmed.startsWith('BEGIN')) {
+            inDeclare = false;
+        }
         // Try to match this line to the next expected statement
-        if (stmtKeyIdx < stmtKeywords.length) {
+        if (!inDeclare && stmtKeyIdx < stmtKeywords.length) {
             const { lineno, keywords } = stmtKeywords[stmtKeyIdx];
             if (lineMatchesKeywords(trimmed, keywords)) {
                 // Insert comments anchored to this statement
@@ -501,19 +512,24 @@ function findLastEndLine(lines) {
 }
 /**
  * Replace the function body in a CREATE FUNCTION AST node.
+ * The body is padded with newlines so it renders as
+ * `AS $$\n<body>\n$$` rather than gluing onto the dollar quotes.
  */
 function stitchBodyIntoAst(createFunctionStmt, newBody) {
     if (!createFunctionStmt?.options)
         return;
+    const padded = (newBody.startsWith('\n') ? '' : '\n') +
+        newBody +
+        (newBody.endsWith('\n') ? '' : '\n');
     for (const opt of createFunctionStmt.options) {
         if (opt?.DefElem?.defname === 'as') {
             const arg = opt.DefElem.arg;
             if (arg?.List?.items?.[0]?.String) {
-                arg.List.items[0].String.sval = newBody;
+                arg.List.items[0].String.sval = padded;
                 return;
             }
             if (arg?.String) {
-                arg.String.sval = newBody;
+                arg.String.sval = padded;
                 return;
             }
         }

package/esm/parse.js

@@ -6,7 +6,7 @@
  * This module does NOT modify plpgsql-parser or pgsql-parse — it
  * composes them and adds body-comment metadata on top.
  */
-import { parseSync as parseSqlSync, loadModule, } from '@libpg-query/parser';
+import { parseSync as parseSqlSync, loadModule, } from 'libpg-query';
 import { parseSync as pgsqlParseSync } from 'pgsql-parse';
 import { scanBodyComments } from './body-scanner';
 export { loadModule };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plpgsql-parse",
-  "version": "0.2.6",
+  "version": "1.0.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "Comment and whitespace preserving PL/pgSQL parser",
   "main": "index.js",
@@ -41,14 +41,14 @@
     "round-trip"
   ],
   "dependencies": {
-    "@libpg-query/parser": "^17.6.10",
-    "@pgsql/types": "^17.6.2",
-    "pgsql-deparser": "17.18.5",
-    "pgsql-parse": "0.2.2",
-    "plpgsql-deparser": "0.7.13"
+    "@pgsql/types": "^18.0.0",
+    "libpg-query": "18.1.1",
+    "pgsql-deparser": "18.0.0",
+    "pgsql-parse": "1.0.0",
+    "plpgsql-deparser": "1.0.0"
   },
   "devDependencies": {
     "makage": "^0.1.8"
   },
-  "gitHead": "346e2f48387747c8e8543ffcfe1ddf7883cf6bbb"
+  "gitHead": "f700ee16d18aeacd2788eeb4410d73928cd11a5f"
 }

package/parse.d.ts

@@ -6,7 +6,7 @@
  * This module does NOT modify plpgsql-parser or pgsql-parse — it
  * composes them and adds body-comment metadata on top.
  */
-import { loadModule } from '@libpg-query/parser';
+import { loadModule } from 'libpg-query';
 import type { PlpgsqlParseResult } from './types';
 export { loadModule };
 /**

package/parse.js

@@ -11,8 +11,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.loadModule = void 0;
 exports.parseSync = parseSync;
 exports.parse = parse;
-const parser_1 = require("@libpg-query/parser");
-Object.defineProperty(exports, "loadModule", { enumerable: true, get: function () { return parser_1.loadModule; } });
+const libpg_query_1 = require("libpg-query");
+Object.defineProperty(exports, "loadModule", { enumerable: true, get: function () { return libpg_query_1.loadModule; } });
 const pgsql_parse_1 = require("pgsql-parse");
 const body_scanner_1 = require("./body-scanner");
 /**
@@ -68,7 +68,7 @@ function parseSync(sql) {
     // 1. Outer SQL: use pgsql-parse for comment/whitespace preservation
     const enhanced = (0, pgsql_parse_1.parseSync)(sql);
     // 2. Also parse with the standard SQL parser to get statement ASTs
-    const sqlResult = (0, parser_1.parseSync)(sql);
+    const sqlResult = (0, libpg_query_1.parseSync)(sql);
     const stmts = sqlResult.stmts ?? [];
     // 3. For each PL/pgSQL function, extract body comments
     const functions = [];