@pgpmjs/core 7.2.0 → 7.2.2

package/esm/slice/slice.js

@@ -1,4 +1,5 @@
 import { parsePlanFile } from '@pgpmjs/ast/files/plan/parser';
+import { generateChangeLineContent, generateTagLineContent } from '@pgpmjs/ast/files/plan/writer';
 import { minimatch } from 'minimatch';
 /**
  * Build a dependency graph from a parsed plan file
@@ -285,41 +286,15 @@ export function generatePlanContent(pkgName, entries, tags = []) {
     let content = `%syntax-version=1.0.0\n`;
     content += `%project=${pkgName}\n`;
     content += `%uri=${pkgName}\n\n`;
+    // Dependency brackets keep their original order (empty order map), matching
+    // the source plans this content is sliced from.
+    const originalOrder = new Map();
     for (const entry of entries) {
-        let line = entry.name;
-        if (entry.dependencies && entry.dependencies.length > 0) {
-            line += ` [${entry.dependencies.join(' ')}]`;
-        }
-        if (entry.timestamp) {
-            line += ` ${entry.timestamp}`;
-            if (entry.planner) {
-                line += ` ${entry.planner}`;
-                if (entry.email) {
-                    line += ` <${entry.email}>`;
-                }
-            }
-        }
-        if (entry.comment) {
-            line += ` # ${entry.comment}`;
-        }
-        content += line + '\n';
+        content += generateChangeLineContent(entry, originalOrder) + '\n';
         // Add tags associated with this change
         const changeTags = tags.filter(t => t.change === entry.name);
         for (const tag of changeTags) {
-            let tagLine = `@${tag.name}`;
-            if (tag.timestamp) {
-                tagLine += ` ${tag.timestamp}`;
-                if (tag.planner) {
-                    tagLine += ` ${tag.planner}`;
-                    if (tag.email) {
-                        tagLine += ` <${tag.email}>`;
-                    }
-                }
-            }
-            if (tag.comment) {
-                tagLine += ` # ${tag.comment}`;
-            }
-            content += tagLine + '\n';
+            content += generateTagLineContent(tag) + '\n';
         }
     }
     return content;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/core",
-  "version": "7.2.0",
+  "version": "7.2.2",
   "author": "Constructive <developers@constructive.io>",
   "description": "PGPM Package and Migration Tools",
   "main": "index.js",
@@ -48,8 +48,8 @@
     "makage": "^0.3.0"
   },
   "dependencies": {
-    "@pgpmjs/ast": "^0.1.0",
-    "@pgpmjs/bundle": "^0.1.0",
+    "@pgpmjs/ast": "^0.1.1",
+    "@pgpmjs/bundle": "^0.2.0",
     "@pgpmjs/env": "^2.28.2",
     "@pgpmjs/logger": "^2.14.0",
     "@pgpmjs/server-utils": "^3.15.3",
@@ -66,5 +66,5 @@
     "pgsql-parser": "^18.1.1",
     "yanse": "^0.2.1"
   },
-  "gitHead": "15a831fa029544068ee64e3386e4b08715d2b86d"
+  "gitHead": "d48f39ebd4b7dcbab22df7c57438c06efd9e223d"
 }

package/slice/slice.js

@@ -15,6 +15,7 @@ exports.generateControlContent = generateControlContent;
 exports.generateSinglePackage = generateSinglePackage;
 exports.slicePlan = slicePlan;
 const parser_1 = require("@pgpmjs/ast/files/plan/parser");
+const writer_1 = require("@pgpmjs/ast/files/plan/writer");
 const minimatch_1 = require("minimatch");
 /**
  * Build a dependency graph from a parsed plan file
@@ -301,41 +302,15 @@ function generatePlanContent(pkgName, entries, tags = []) {
     let content = `%syntax-version=1.0.0\n`;
     content += `%project=${pkgName}\n`;
     content += `%uri=${pkgName}\n\n`;
+    // Dependency brackets keep their original order (empty order map), matching
+    // the source plans this content is sliced from.
+    const originalOrder = new Map();
     for (const entry of entries) {
-        let line = entry.name;
-        if (entry.dependencies && entry.dependencies.length > 0) {
-            line += ` [${entry.dependencies.join(' ')}]`;
-        }
-        if (entry.timestamp) {
-            line += ` ${entry.timestamp}`;
-            if (entry.planner) {
-                line += ` ${entry.planner}`;
-                if (entry.email) {
-                    line += ` <${entry.email}>`;
-                }
-            }
-        }
-        if (entry.comment) {
-            line += ` # ${entry.comment}`;
-        }
-        content += line + '\n';
+        content += (0, writer_1.generateChangeLineContent)(entry, originalOrder) + '\n';
         // Add tags associated with this change
         const changeTags = tags.filter(t => t.change === entry.name);
         for (const tag of changeTags) {
-            let tagLine = `@${tag.name}`;
-            if (tag.timestamp) {
-                tagLine += ` ${tag.timestamp}`;
-                if (tag.planner) {
-                    tagLine += ` ${tag.planner}`;
-                    if (tag.email) {
-                        tagLine += ` <${tag.email}>`;
-                    }
-                }
-            }
-            if (tag.comment) {
-                tagLine += ` # ${tag.comment}`;
-            }
-            content += tagLine + '\n';
+            content += (0, writer_1.generateTagLineContent)(tag) + '\n';
         }
     }
     return content;