@pgpmjs/core 4.5.1 → 4.5.3

package/esm/export/export-migrations.js

@@ -6,6 +6,7 @@ import { getPgPool } from 'pg-cache';
 import { PgpmPackage } from '../core/class/pgpm';
 import { writePgpmFiles, writePgpmPlan } from '../files';
 import { getMissingInstallableModules } from '../modules/modules';
+import { parseAuthor } from '../utils/author';
 import { exportMeta } from './export-meta';
 /**
  * Required extensions for database schema exports.
@@ -91,7 +92,7 @@ const installMissingModules = async (moduleDir, missingModules) => {
     await moduleProject.installModules(...missingNames);
     console.log('Modules installed successfully.');
 };
-const exportMigrationsToDisk = async ({ project, options, database, databaseId, databaseName, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter }) => {
+const exportMigrationsToDisk = async ({ project, options, database, databaseId, databaseName, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username }) => {
     outdir = outdir + '/';
     const pgPool = getPgPool({
         ...options.pg,
@@ -132,7 +133,9 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
             name,
             description: dbExtensionDesc,
             extensions: [...DB_REQUIRED_EXTENSIONS],
-            prompter
+            prompter,
+            repoName,
+            username
         });
         // Install missing modules if user confirmed (now that module exists)
         if (dbMissingResult.shouldInstall) {
@@ -158,7 +161,9 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
             name: metaExtensionName,
             description: metaDesc,
             extensions: [...SERVICE_REQUIRED_EXTENSIONS],
-            prompter
+            prompter,
+            repoName,
+            username
         });
         // Install missing modules if user confirmed (now that module exists)
         if (svcMissingResult.shouldInstall) {
@@ -211,7 +216,7 @@ SET session_replication_role TO DEFAULT;
     }
     pgPool.end();
 };
-export const exportMigrations = async ({ project, options, dbInfo, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter }) => {
+export const exportMigrations = async ({ project, options, dbInfo, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username }) => {
     for (let v = 0; v < dbInfo.database_ids.length; v++) {
         const databaseId = dbInfo.database_ids[v];
         await exportMigrationsToDisk({
@@ -227,7 +232,9 @@ export const exportMigrations = async ({ project, options, dbInfo, author, outdi
             schema_names,
             author,
             outdir,
-            prompter
+            prompter,
+            repoName,
+            username
         });
     }
 };
@@ -237,13 +244,14 @@ export const exportMigrations = async ({ project, options, dbInfo, author, outdi
  *
  * @returns The absolute path to the created/prepared module directory
  */
-const preparePackage = async ({ project, author, outdir, name, description, extensions, prompter }) => {
+const preparePackage = async ({ project, author, outdir, name, description, extensions, prompter, repoName, username }) => {
     const curDir = process.cwd();
     const pgpmDir = path.resolve(path.join(outdir, name));
     mkdirSync(pgpmDir, { recursive: true });
     process.chdir(pgpmDir);
     const plan = glob(path.join(pgpmDir, 'pgpm.plan'));
     if (!plan.length) {
+        const { fullName, email } = parseAuthor(author);
         await project.initModule({
             name,
             description,
@@ -253,7 +261,12 @@ const preparePackage = async ({ project, author, outdir, name, description, exte
                 moduleName: name,
                 moduleDesc: description,
                 access: 'restricted',
-                license: 'CLOSED'
+                license: 'CLOSED',
+                fullName,
+                ...(email && { email }),
+                // Use provided values or sensible defaults
+                repoName: repoName || name,
+                ...(username && { username })
             }
         });
     }

package/esm/files/plan/writer.js

@@ -1,5 +1,6 @@
 import fs from 'fs';
 import path from 'path';
+import { parseAuthor } from '../../utils/author';
 /**
  * Write a PGPM plan file based on the provided rows
  */
@@ -7,22 +8,9 @@ export function writePgpmPlan(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
-    // 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 { fullName, email } = parseAuthor(opts.author || 'constructive');
+    const authorName = fullName;
+    const authorEmail = email || `${fullName}@5b0c196eeb62`;
     const duplicates = {};
     const plan = opts.replacer(`%syntax-version=1.0.0
 %project=constructive-extension-name

package/esm/utils/author.js

@@ -0,0 +1,11 @@
+export function parseAuthor(author) {
+    const trimmed = (author || '').trim();
+    const match = trimmed.match(/^(.+?)\s*<([^>]+)>$/);
+    if (match) {
+        return {
+            fullName: match[1].trim(),
+            email: match[2].trim()
+        };
+    }
+    return { fullName: trimmed };
+}

package/export/export-migrations.d.ts

@@ -23,6 +23,10 @@ interface ExportOptions {
     metaExtensionName: string;
     metaExtensionDesc?: string;
     prompter?: Prompter;
+    /** Repository name for module scaffolding. Defaults to module name if not provided. */
+    repoName?: string;
+    /** GitHub username/org for module scaffolding. Required for non-interactive use. */
+    username?: string;
 }
-export declare const exportMigrations: ({ project, options, dbInfo, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter }: ExportOptions) => Promise<void>;
+export declare const exportMigrations: ({ project, options, dbInfo, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username }: ExportOptions) => Promise<void>;
 export {};

package/export/export-migrations.js

@@ -12,6 +12,7 @@ const pg_cache_1 = require("pg-cache");
 const pgpm_1 = require("../core/class/pgpm");
 const files_1 = require("../files");
 const modules_1 = require("../modules/modules");
+const author_1 = require("../utils/author");
 const export_meta_1 = require("./export-meta");
 /**
  * Required extensions for database schema exports.
@@ -97,7 +98,7 @@ const installMissingModules = async (moduleDir, missingModules) => {
     await moduleProject.installModules(...missingNames);
     console.log('Modules installed successfully.');
 };
-const exportMigrationsToDisk = async ({ project, options, database, databaseId, databaseName, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter }) => {
+const exportMigrationsToDisk = async ({ project, options, database, databaseId, databaseName, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username }) => {
     outdir = outdir + '/';
     const pgPool = (0, pg_cache_1.getPgPool)({
         ...options.pg,
@@ -138,7 +139,9 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
             name,
             description: dbExtensionDesc,
             extensions: [...DB_REQUIRED_EXTENSIONS],
-            prompter
+            prompter,
+            repoName,
+            username
         });
         // Install missing modules if user confirmed (now that module exists)
         if (dbMissingResult.shouldInstall) {
@@ -164,7 +167,9 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
             name: metaExtensionName,
             description: metaDesc,
             extensions: [...SERVICE_REQUIRED_EXTENSIONS],
-            prompter
+            prompter,
+            repoName,
+            username
         });
         // Install missing modules if user confirmed (now that module exists)
         if (svcMissingResult.shouldInstall) {
@@ -217,7 +222,7 @@ SET session_replication_role TO DEFAULT;
     }
     pgPool.end();
 };
-const exportMigrations = async ({ project, options, dbInfo, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter }) => {
+const exportMigrations = async ({ project, options, dbInfo, author, outdir, schema_names, extensionName, extensionDesc, metaExtensionName, metaExtensionDesc, prompter, repoName, username }) => {
     for (let v = 0; v < dbInfo.database_ids.length; v++) {
         const databaseId = dbInfo.database_ids[v];
         await exportMigrationsToDisk({
@@ -233,7 +238,9 @@ const exportMigrations = async ({ project, options, dbInfo, author, outdir, sche
             schema_names,
             author,
             outdir,
-            prompter
+            prompter,
+            repoName,
+            username
         });
     }
 };
@@ -244,13 +251,14 @@ exports.exportMigrations = exportMigrations;
  *
  * @returns The absolute path to the created/prepared module directory
  */
-const preparePackage = async ({ project, author, outdir, name, description, extensions, prompter }) => {
+const preparePackage = async ({ project, author, outdir, name, description, extensions, prompter, repoName, username }) => {
     const curDir = process.cwd();
     const pgpmDir = path_1.default.resolve(path_1.default.join(outdir, name));
     (0, fs_1.mkdirSync)(pgpmDir, { recursive: true });
     process.chdir(pgpmDir);
     const plan = (0, glob_1.sync)(path_1.default.join(pgpmDir, 'pgpm.plan'));
     if (!plan.length) {
+        const { fullName, email } = (0, author_1.parseAuthor)(author);
         await project.initModule({
             name,
             description,
@@ -260,7 +268,12 @@ const preparePackage = async ({ project, author, outdir, name, description, exte
                 moduleName: name,
                 moduleDesc: description,
                 access: 'restricted',
-                license: 'CLOSED'
+                license: 'CLOSED',
+                fullName,
+                ...(email && { email }),
+                // Use provided values or sensible defaults
+                repoName: repoName || name,
+                ...(username && { username })
             }
         });
     }

package/files/plan/writer.js

@@ -11,6 +11,7 @@ exports.generateChangeLineContent = generateChangeLineContent;
 exports.generateTagLineContent = generateTagLineContent;
 const fs_1 = __importDefault(require("fs"));
 const path_1 = __importDefault(require("path"));
+const author_1 = require("../../utils/author");
 /**
  * Write a PGPM plan file based on the provided rows
  */
@@ -18,22 +19,9 @@ function writePgpmPlan(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
-    // 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 { fullName, email } = (0, author_1.parseAuthor)(opts.author || 'constructive');
+    const authorName = fullName;
+    const authorEmail = email || `${fullName}@5b0c196eeb62`;
     const duplicates = {};
     const plan = opts.replacer(`%syntax-version=1.0.0
 %project=constructive-extension-name

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/core",
-  "version": "4.5.1",
+  "version": "4.5.3",
   "author": "Constructive <developers@constructive.io>",
   "description": "PGPM Package and Migration Tools",
   "main": "index.js",
@@ -64,5 +64,5 @@
     "pgsql-parser": "^17.9.5",
     "yanse": "^0.1.8"
   },
-  "gitHead": "6883e3b93da28078483bc6aa25862613ef4405b2"
+  "gitHead": "b50728f2e33dd0b1da62f574c976737f2d3a41f8"
 }

package/utils/author.d.ts

@@ -0,0 +1,5 @@
+export interface ParsedAuthor {
+    fullName: string;
+    email?: string;
+}
+export declare function parseAuthor(author: string): ParsedAuthor;

package/utils/author.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseAuthor = parseAuthor;
+function parseAuthor(author) {
+    const trimmed = (author || '').trim();
+    const match = trimmed.match(/^(.+?)\s*<([^>]+)>$/);
+    if (match) {
+        return {
+            fullName: match[1].trim(),
+            email: match[2].trim()
+        };
+    }
+    return { fullName: trimmed };
+}