plpgsql-parse 0.2.5 → 0.3.0

package/deparse.js

@@ -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

@@ -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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "plpgsql-parse",
-  "version": "0.2.5",
+  "version": "0.3.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",
+    "@libpg-query/parser": "^17.8.0",
     "@pgsql/types": "^17.6.2",
     "pgsql-deparser": "17.18.5",
-    "pgsql-parse": "0.2.2",
-    "plpgsql-deparser": "0.7.12"
+    "pgsql-parse": "0.3.0",
+    "plpgsql-deparser": "0.8.0"
   },
   "devDependencies": {
     "makage": "^0.1.8"
   },
-  "gitHead": "96ac7df98afcb70a1e2ee861ba98c0c57adb3166"
+  "gitHead": "60fb86690a2d8e9bf90e2626edf242673e283980"
 }