@pgpmjs/core 4.5.2 → 4.5.4

package/esm/export/export-migrations.js

@@ -92,8 +92,10 @@ 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, serviceOutdir }) => {
     outdir = outdir + '/';
+    // Use serviceOutdir for service module, defaulting to outdir if not provided
+    const svcOutdir = (serviceOutdir || outdir.slice(0, -1)) + '/';
     const pgPool = getPgPool({
         ...options.pg,
         database
@@ -133,7 +135,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) {
@@ -151,15 +155,17 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
         const metaDesc = metaExtensionDesc || `${metaExtensionName} service utilities for managing domains, APIs, and services`;
         // Detect missing modules at workspace level and prompt user
         const svcMissingResult = await detectMissingModules(project, [...SERVICE_REQUIRED_EXTENSIONS], prompter);
-        // Create/prepare the module directory
+        // Create/prepare the module directory (use serviceOutdir if provided)
         const svcModuleDir = await preparePackage({
             project,
             author,
-            outdir,
+            outdir: svcOutdir,
             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) {
@@ -207,12 +213,13 @@ SET session_replication_role TO DEFAULT;
         ];
         opts.replacer = metaReplacer.replacer;
         opts.name = metaExtensionName;
+        opts.outdir = svcOutdir;
         writePgpmPlan(metaPackage, opts);
         writePgpmFiles(metaPackage, opts);
     }
     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, serviceOutdir }) => {
     for (let v = 0; v < dbInfo.database_ids.length; v++) {
         const databaseId = dbInfo.database_ids[v];
         await exportMigrationsToDisk({
@@ -228,7 +235,10 @@ export const exportMigrations = async ({ project, options, dbInfo, author, outdi
             schema_names,
             author,
             outdir,
-            prompter
+            prompter,
+            repoName,
+            username,
+            serviceOutdir
         });
     }
 };
@@ -238,7 +248,7 @@ 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 });
@@ -257,7 +267,10 @@ const preparePackage = async ({ project, author, outdir, name, description, exte
                 access: 'restricted',
                 license: 'CLOSED',
                 fullName,
-                ...(email && { email })
+                ...(email && { email }),
+                // Use provided values or sensible defaults
+                repoName: repoName || name,
+                ...(username && { username })
             }
         });
     }

package/export/export-migrations.d.ts

@@ -23,6 +23,12 @@ 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;
+    /** Output directory for service/meta module. Defaults to outdir if not provided. */
+    serviceOutdir?: 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, serviceOutdir }: ExportOptions) => Promise<void>;
 export {};

package/export/export-migrations.js

@@ -98,8 +98,10 @@ 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, serviceOutdir }) => {
     outdir = outdir + '/';
+    // Use serviceOutdir for service module, defaulting to outdir if not provided
+    const svcOutdir = (serviceOutdir || outdir.slice(0, -1)) + '/';
     const pgPool = (0, pg_cache_1.getPgPool)({
         ...options.pg,
         database
@@ -139,7 +141,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) {
@@ -157,15 +161,17 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
         const metaDesc = metaExtensionDesc || `${metaExtensionName} service utilities for managing domains, APIs, and services`;
         // Detect missing modules at workspace level and prompt user
         const svcMissingResult = await detectMissingModules(project, [...SERVICE_REQUIRED_EXTENSIONS], prompter);
-        // Create/prepare the module directory
+        // Create/prepare the module directory (use serviceOutdir if provided)
         const svcModuleDir = await preparePackage({
             project,
             author,
-            outdir,
+            outdir: svcOutdir,
             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) {
@@ -213,12 +219,13 @@ SET session_replication_role TO DEFAULT;
         ];
         opts.replacer = metaReplacer.replacer;
         opts.name = metaExtensionName;
+        opts.outdir = svcOutdir;
         (0, files_1.writePgpmPlan)(metaPackage, opts);
         (0, files_1.writePgpmFiles)(metaPackage, opts);
     }
     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, serviceOutdir }) => {
     for (let v = 0; v < dbInfo.database_ids.length; v++) {
         const databaseId = dbInfo.database_ids[v];
         await exportMigrationsToDisk({
@@ -234,7 +241,10 @@ const exportMigrations = async ({ project, options, dbInfo, author, outdir, sche
             schema_names,
             author,
             outdir,
-            prompter
+            prompter,
+            repoName,
+            username,
+            serviceOutdir
         });
     }
 };
@@ -245,7 +255,7 @@ 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 });
@@ -264,7 +274,10 @@ const preparePackage = async ({ project, author, outdir, name, description, exte
                 access: 'restricted',
                 license: 'CLOSED',
                 fullName,
-                ...(email && { email })
+                ...(email && { email }),
+                // Use provided values or sensible defaults
+                repoName: repoName || name,
+                ...(username && { username })
             }
         });
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/core",
-  "version": "4.5.2",
+  "version": "4.5.4",
   "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": "3768b497b5b65410a23bcf7e01ed4192a5f1dd95"
+  "gitHead": "324881a46912b7d15a76f864aada03ce926f9176"
 }