pgpm 3.1.0 → 3.1.1

package/commands/init/index.js

@@ -241,19 +241,20 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
     // Whether this is a pgpm-managed template (creates pgpm.plan, .control files)
     const isPgpmTemplate = workspaceType === 'pgpm';
     const project = new core_1.PgpmPackage(ctx.cwd);
+    // Track resolved workspace path for both pgpm and non-pgpm workspace types
+    let resolvedWorkspacePath;
+    let workspaceTypeName = '';
     // Check workspace requirement based on type (skip if workspaceType is false)
     if (workspaceType !== false) {
-        let workspacePath;
-        let workspaceTypeName = '';
         if (workspaceType === 'pgpm') {
-            workspacePath = project.workspacePath;
+            resolvedWorkspacePath = project.workspacePath;
             workspaceTypeName = 'PGPM';
         }
         else {
-            workspacePath = (0, env_1.resolveWorkspaceByType)(ctx.cwd, workspaceType);
+            resolvedWorkspacePath = (0, env_1.resolveWorkspaceByType)(ctx.cwd, workspaceType);
             workspaceTypeName = workspaceType.toUpperCase();
         }
-        if (!workspacePath) {
+        if (!resolvedWorkspacePath) {
             const noTty = Boolean(argv.noTty || argv['no-tty'] || process.env.CI === 'true');
             // If user explicitly requested module init or we're in non-interactive mode,
             // just show the error with helpful guidance
@@ -261,8 +262,9 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
                 process.stderr.write(`Not inside a ${workspaceTypeName} workspace.\n`);
                 throw types_1.errors.NOT_IN_WORKSPACE({});
             }
-            // Only offer to create a workspace for pgpm templates
-            if (workspaceType === 'pgpm') {
+            // Offer to create a workspace for pgpm templates or when --dir is specified
+            // (when --dir is specified, we know which workspace variant to use)
+            if (workspaceType === 'pgpm' || ctx.dir) {
                 const recoveryQuestion = [
                     {
                         name: 'workspace',
@@ -284,7 +286,7 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
                     });
                 }
             }
-            // User declined or non-pgpm workspace type, show the error
+            // User declined or non-pgpm workspace type without --dir, show the error
             process.stderr.write(`Not inside a ${workspaceTypeName} workspace.\n`);
             throw types_1.errors.NOT_IN_WORKSPACE({});
         }
@@ -334,7 +336,7 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
     // Determine output path based on whether we're in a workspace
     let modulePath;
     if (project.workspacePath) {
-        // Use workspace-aware initModule
+        // PGPM workspace - use workspace-aware initModule
         await project.initModule({
             name: modName,
             description: answers.description || modName,
@@ -354,8 +356,28 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
             ? path_1.default.join(ctx.cwd, 'packages', modName)
             : path_1.default.join(ctx.cwd, modName);
     }
+    else if (resolvedWorkspacePath && workspaceType !== false) {
+        // Non-pgpm workspace (pnpm, lerna, npm) - scaffold to packages/ directory
+        const isRoot = path_1.default.resolve(resolvedWorkspacePath) === path_1.default.resolve(ctx.cwd);
+        modulePath = isRoot
+            ? path_1.default.join(ctx.cwd, 'packages', modName)
+            : path_1.default.join(ctx.cwd, modName);
+        fs_1.default.mkdirSync(modulePath, { recursive: true });
+        await (0, core_1.scaffoldTemplate)({
+            fromPath: ctx.fromPath,
+            outputDir: modulePath,
+            templateRepo: ctx.templateRepo,
+            branch: ctx.branch,
+            dir: ctx.dir,
+            answers: templateAnswers,
+            noTty: ctx.noTty,
+            toolName: core_1.DEFAULT_TEMPLATE_TOOL_NAME,
+            cwd: ctx.cwd,
+            prompter
+        });
+    }
     else {
-        // Not in a workspace - scaffold directly to current directory
+        // Not in any workspace (requiresWorkspace: false) - scaffold to current directory
         modulePath = path_1.default.join(ctx.cwd, modName);
         fs_1.default.mkdirSync(modulePath, { recursive: true });
         await (0, core_1.scaffoldTemplate)({

package/esm/commands/init/index.js

@@ -234,19 +234,20 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
     // Whether this is a pgpm-managed template (creates pgpm.plan, .control files)
     const isPgpmTemplate = workspaceType === 'pgpm';
     const project = new PgpmPackage(ctx.cwd);
+    // Track resolved workspace path for both pgpm and non-pgpm workspace types
+    let resolvedWorkspacePath;
+    let workspaceTypeName = '';
     // Check workspace requirement based on type (skip if workspaceType is false)
     if (workspaceType !== false) {
-        let workspacePath;
-        let workspaceTypeName = '';
         if (workspaceType === 'pgpm') {
-            workspacePath = project.workspacePath;
+            resolvedWorkspacePath = project.workspacePath;
             workspaceTypeName = 'PGPM';
         }
         else {
-            workspacePath = resolveWorkspaceByType(ctx.cwd, workspaceType);
+            resolvedWorkspacePath = resolveWorkspaceByType(ctx.cwd, workspaceType);
             workspaceTypeName = workspaceType.toUpperCase();
         }
-        if (!workspacePath) {
+        if (!resolvedWorkspacePath) {
             const noTty = Boolean(argv.noTty || argv['no-tty'] || process.env.CI === 'true');
             // If user explicitly requested module init or we're in non-interactive mode,
             // just show the error with helpful guidance
@@ -254,8 +255,9 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
                 process.stderr.write(`Not inside a ${workspaceTypeName} workspace.\n`);
                 throw errors.NOT_IN_WORKSPACE({});
             }
-            // Only offer to create a workspace for pgpm templates
-            if (workspaceType === 'pgpm') {
+            // Offer to create a workspace for pgpm templates or when --dir is specified
+            // (when --dir is specified, we know which workspace variant to use)
+            if (workspaceType === 'pgpm' || ctx.dir) {
                 const recoveryQuestion = [
                     {
                         name: 'workspace',
@@ -277,7 +279,7 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
                     });
                 }
             }
-            // User declined or non-pgpm workspace type, show the error
+            // User declined or non-pgpm workspace type without --dir, show the error
             process.stderr.write(`Not inside a ${workspaceTypeName} workspace.\n`);
             throw errors.NOT_IN_WORKSPACE({});
         }
@@ -327,7 +329,7 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
     // Determine output path based on whether we're in a workspace
     let modulePath;
     if (project.workspacePath) {
-        // Use workspace-aware initModule
+        // PGPM workspace - use workspace-aware initModule
         await project.initModule({
             name: modName,
             description: answers.description || modName,
@@ -347,8 +349,28 @@ async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest =
             ? path.join(ctx.cwd, 'packages', modName)
             : path.join(ctx.cwd, modName);
     }
+    else if (resolvedWorkspacePath && workspaceType !== false) {
+        // Non-pgpm workspace (pnpm, lerna, npm) - scaffold to packages/ directory
+        const isRoot = path.resolve(resolvedWorkspacePath) === path.resolve(ctx.cwd);
+        modulePath = isRoot
+            ? path.join(ctx.cwd, 'packages', modName)
+            : path.join(ctx.cwd, modName);
+        fs.mkdirSync(modulePath, { recursive: true });
+        await scaffoldTemplate({
+            fromPath: ctx.fromPath,
+            outputDir: modulePath,
+            templateRepo: ctx.templateRepo,
+            branch: ctx.branch,
+            dir: ctx.dir,
+            answers: templateAnswers,
+            noTty: ctx.noTty,
+            toolName: DEFAULT_TEMPLATE_TOOL_NAME,
+            cwd: ctx.cwd,
+            prompter
+        });
+    }
     else {
-        // Not in a workspace - scaffold directly to current directory
+        // Not in any workspace (requiresWorkspace: false) - scaffold to current directory
         modulePath = path.join(ctx.cwd, modName);
         fs.mkdirSync(modulePath, { recursive: true });
         await scaffoldTemplate({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgpm",
-  "version": "3.1.0",
+  "version": "3.1.1",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL Package Manager - Database migration and package management CLI",
   "main": "index.js",
@@ -74,5 +74,5 @@
     "pg",
     "pgsql"
   ],
-  "gitHead": "20d7e992348542531e73f20c0fd084decec86325"
+  "gitHead": "cb4843d3d80592f369e7f1a67b8a9223e6bfe48c"
 }