@pgpmjs/core 4.5.3 → 4.6.0

package/core/class/pgpm.d.ts

@@ -23,6 +23,12 @@ export interface InitModuleOptions {
     noTty?: boolean;
     toolName?: string;
     answers?: Record<string, any>;
+    /**
+     * Parent directory where the module should be created.
+     * When provided, bypasses createModuleDirectory() and creates the module at outputDir/name.
+     * Must be an absolute path or relative to workspace root.
+     */
+    outputDir?: string;
 }
 export declare class PgpmPackage {
     cwd: string;

package/core/class/pgpm.js

@@ -364,7 +364,19 @@ class PgpmPackage {
     }
     async initModule(options) {
         this.ensureWorkspace();
-        const targetPath = this.createModuleDirectory(options.name);
+        // If outputDir is provided, use it directly instead of createModuleDirectory
+        let targetPath;
+        if (options.outputDir) {
+            // Resolve outputDir relative to workspace if not absolute
+            const resolvedOutputDir = path_1.default.isAbsolute(options.outputDir)
+                ? options.outputDir
+                : path_1.default.resolve(this.workspacePath, options.outputDir);
+            targetPath = path_1.default.join(resolvedOutputDir, options.name);
+            fs_1.default.mkdirSync(targetPath, { recursive: true });
+        }
+        else {
+            targetPath = this.createModuleDirectory(options.name);
+        }
         const answers = {
             ...options.answers,
             name: options.name,

package/esm/core/class/pgpm.js

@@ -325,7 +325,19 @@ export class PgpmPackage {
     }
     async initModule(options) {
         this.ensureWorkspace();
-        const targetPath = this.createModuleDirectory(options.name);
+        // If outputDir is provided, use it directly instead of createModuleDirectory
+        let targetPath;
+        if (options.outputDir) {
+            // Resolve outputDir relative to workspace if not absolute
+            const resolvedOutputDir = path.isAbsolute(options.outputDir)
+                ? options.outputDir
+                : path.resolve(this.workspacePath, options.outputDir);
+            targetPath = path.join(resolvedOutputDir, options.name);
+            fs.mkdirSync(targetPath, { recursive: true });
+        }
+        else {
+            targetPath = this.createModuleDirectory(options.name);
+        }
         const answers = {
             ...options.answers,
             name: options.name,

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, repoName, username }) => {
+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
@@ -153,11 +155,11 @@ 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],
@@ -211,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, repoName, username }) => {
+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({
@@ -234,7 +237,8 @@ export const exportMigrations = async ({ project, options, dbInfo, author, outdi
             outdir,
             prompter,
             repoName,
-            username
+            username,
+            serviceOutdir
         });
     }
 };
@@ -257,6 +261,8 @@ const preparePackage = async ({ project, author, outdir, name, description, exte
             description,
             author,
             extensions,
+            // Use outputDir to create module directly in the specified location
+            outputDir: outdir,
             answers: {
                 moduleName: name,
                 moduleDesc: description,

package/export/export-migrations.d.ts

@@ -27,6 +27,8 @@ interface ExportOptions {
     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, repoName, username }: 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, repoName, username }) => {
+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
@@ -159,11 +161,11 @@ 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],
@@ -217,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, repoName, username }) => {
+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({
@@ -240,7 +243,8 @@ const exportMigrations = async ({ project, options, dbInfo, author, outdir, sche
             outdir,
             prompter,
             repoName,
-            username
+            username,
+            serviceOutdir
         });
     }
 };
@@ -264,6 +268,8 @@ const preparePackage = async ({ project, author, outdir, name, description, exte
             description,
             author,
             extensions,
+            // Use outputDir to create module directly in the specified location
+            outputDir: outdir,
             answers: {
                 moduleName: name,
                 moduleDesc: description,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/core",
-  "version": "4.5.3",
+  "version": "4.6.0",
   "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": "b50728f2e33dd0b1da62f574c976737f2d3a41f8"
+  "gitHead": "bec3240e4e0f93b8edb386734eeb560403f574da"
 }