@pgpmjs/core 3.1.1 → 3.1.3

package/esm/files/plan/writer.js

@@ -7,8 +7,22 @@ export function writeSqitchPlan(rows, opts) {
     const dir = path.resolve(path.join(opts.outdir, opts.name));
     fs.mkdirSync(dir, { recursive: true });
     const date = () => '2017-08-11T08:11:51Z'; // stubbed timestamp
-    const author = opts.author || 'constructive';
-    const email = `${author}@5b0c196eeb62`;
+    // Parse author string - it might contain email in format "Name <email>"
+    const authorInput = (opts.author || 'constructive').trim();
+    let authorName = authorInput;
+    let authorEmail = '';
+    // Check if author already contains email in <...> format
+    const emailMatch = authorInput.match(/^(.+?)\s*<([^>]+)>\s*$/);
+    if (emailMatch) {
+        // Author already has email format: "Name <email>"
+        authorName = emailMatch[1].trim();
+        authorEmail = emailMatch[2].trim();
+    }
+    else {
+        // No email in author, use default format
+        authorName = authorInput;
+        authorEmail = `${authorName}@5b0c196eeb62`;
+    }
     const duplicates = {};
     const plan = opts.replacer(`%syntax-version=1.0.0
 %project=constructive-extension-name
@@ -22,9 +36,9 @@ ${rows
         }
         duplicates[row.deploy] = true;
         if (row.deps?.length) {
-            return `${row.deploy} [${row.deps.join(' ')}] ${date()} ${author} <${email}> # add ${row.name}`;
+            return `${row.deploy} [${row.deps.join(' ')}] ${date()} ${authorName} <${authorEmail}> # add ${row.name}`;
         }
-        return `${row.deploy} ${date()} ${author} <${email}> # add ${row.name}`;
+        return `${row.deploy} ${date()} ${authorName} <${authorEmail}> # add ${row.name}`;
     })
         .join('\n')}
 `);

package/files/plan/writer.js

@@ -17,8 +17,22 @@ function writeSqitchPlan(rows, opts) {
     const dir = path_1.default.resolve(path_1.default.join(opts.outdir, opts.name));
     fs_1.default.mkdirSync(dir, { recursive: true });
     const date = () => '2017-08-11T08:11:51Z'; // stubbed timestamp
-    const author = opts.author || 'constructive';
-    const email = `${author}@5b0c196eeb62`;
+    // Parse author string - it might contain email in format "Name <email>"
+    const authorInput = (opts.author || 'constructive').trim();
+    let authorName = authorInput;
+    let authorEmail = '';
+    // Check if author already contains email in <...> format
+    const emailMatch = authorInput.match(/^(.+?)\s*<([^>]+)>\s*$/);
+    if (emailMatch) {
+        // Author already has email format: "Name <email>"
+        authorName = emailMatch[1].trim();
+        authorEmail = emailMatch[2].trim();
+    }
+    else {
+        // No email in author, use default format
+        authorName = authorInput;
+        authorEmail = `${authorName}@5b0c196eeb62`;
+    }
     const duplicates = {};
     const plan = opts.replacer(`%syntax-version=1.0.0
 %project=constructive-extension-name
@@ -32,9 +46,9 @@ ${rows
         }
         duplicates[row.deploy] = true;
         if (row.deps?.length) {
-            return `${row.deploy} [${row.deps.join(' ')}] ${date()} ${author} <${email}> # add ${row.name}`;
+            return `${row.deploy} [${row.deps.join(' ')}] ${date()} ${authorName} <${authorEmail}> # add ${row.name}`;
         }
-        return `${row.deploy} ${date()} ${author} <${email}> # add ${row.name}`;
+        return `${row.deploy} ${date()} ${authorName} <${authorEmail}> # add ${row.name}`;
     })
         .join('\n')}
 `);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/core",
-  "version": "3.1.1",
+  "version": "3.1.3",
   "author": "Constructive <developers@constructive.io>",
   "description": "PGPM Package and Migration Tools",
   "main": "index.js",
@@ -47,7 +47,7 @@
     "makage": "^0.1.9"
   },
   "dependencies": {
-    "@pgpmjs/env": "^2.8.7",
+    "@pgpmjs/env": "^2.8.8",
     "@pgpmjs/logger": "^1.3.5",
     "@pgpmjs/server-utils": "^2.8.8",
     "@pgpmjs/types": "^2.12.6",
@@ -63,5 +63,5 @@
     "pgsql-parser": "^17.9.2",
     "yanse": "^0.1.8"
   },
-  "gitHead": "248d4056d3191b71bcab5892ef98b09164de9f7f"
+  "gitHead": "9a4f31663554bed9c6cc785a3eb283d0a5d27620"
 }