pgpm 2.2.0 → 2.3.0

package/commands/init/index.js

@@ -74,6 +74,8 @@ async function handleInit(argv, prompter) {
     }
     // Regular init path: default to 'module' if no fromPath provided
     const fromPath = positionalFromPath || 'module';
+    // Track if user explicitly requested module (e.g., `pgpm init module`)
+    const wasExplicitModuleRequest = positionalFromPath === 'module';
     // Inspect the template to get its type
     const inspection = (0, core_1.inspectTemplate)({
         fromPath,
@@ -103,7 +105,7 @@ async function handleInit(argv, prompter) {
         dir,
         noTty,
         cwd,
-    });
+    }, wasExplicitModuleRequest);
 }
 async function handleBoilerplateInit(argv, prompter, ctx) {
     let fromPath;
@@ -171,6 +173,7 @@ async function handleBoilerplateInit(argv, prompter, ctx) {
         });
     }
     // Default to module init (for 'module' type or unknown types)
+    // When using --boilerplate, user made an explicit choice, so treat as explicit request
     return handleModuleInit(argv, prompter, {
         fromPath,
         templateRepo: ctx.templateRepo,
@@ -178,7 +181,7 @@ async function handleBoilerplateInit(argv, prompter, ctx) {
         dir: ctx.dir,
         noTty: ctx.noTty,
         cwd: ctx.cwd,
-    });
+    }, true);
 }
 async function handleWorkspaceInit(argv, prompter, ctx) {
     const workspaceQuestions = [
@@ -229,9 +232,37 @@ async function handleWorkspaceInit(argv, prompter, ctx) {
     process.stdout.write(`\n✨ Enjoy!\n\ncd ./${dirName}\n`);
     return { ...argv, ...answers, cwd: targetPath };
 }
-async function handleModuleInit(argv, prompter, ctx) {
+async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest = false) {
     const project = new core_1.PgpmPackage(ctx.cwd);
     if (!project.workspacePath) {
+        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
+        if (wasExplicitModuleRequest || noTty) {
+            process.stderr.write('Not inside a PGPM workspace.\n');
+            throw types_1.errors.NOT_IN_WORKSPACE({});
+        }
+        // Offer to create a workspace instead
+        const recoveryQuestion = [
+            {
+                name: 'createWorkspace',
+                message: 'You are not inside a PGPM workspace. Would you like to create a new workspace instead?',
+                type: 'confirm',
+                required: true,
+            },
+        ];
+        const { createWorkspace } = await prompter.prompt(argv, recoveryQuestion);
+        if (createWorkspace) {
+            return handleWorkspaceInit(argv, prompter, {
+                fromPath: 'workspace',
+                templateRepo: ctx.templateRepo,
+                branch: ctx.branch,
+                dir: ctx.dir,
+                noTty: ctx.noTty,
+                cwd: ctx.cwd,
+            });
+        }
+        // User declined, show the error
         process.stderr.write('Not inside a PGPM workspace.\n');
         throw types_1.errors.NOT_IN_WORKSPACE({});
     }

package/esm/commands/init/index.js

@@ -67,6 +67,8 @@ async function handleInit(argv, prompter) {
     }
     // Regular init path: default to 'module' if no fromPath provided
     const fromPath = positionalFromPath || 'module';
+    // Track if user explicitly requested module (e.g., `pgpm init module`)
+    const wasExplicitModuleRequest = positionalFromPath === 'module';
     // Inspect the template to get its type
     const inspection = inspectTemplate({
         fromPath,
@@ -96,7 +98,7 @@ async function handleInit(argv, prompter) {
         dir,
         noTty,
         cwd,
-    });
+    }, wasExplicitModuleRequest);
 }
 async function handleBoilerplateInit(argv, prompter, ctx) {
     let fromPath;
@@ -164,6 +166,7 @@ async function handleBoilerplateInit(argv, prompter, ctx) {
         });
     }
     // Default to module init (for 'module' type or unknown types)
+    // When using --boilerplate, user made an explicit choice, so treat as explicit request
     return handleModuleInit(argv, prompter, {
         fromPath,
         templateRepo: ctx.templateRepo,
@@ -171,7 +174,7 @@ async function handleBoilerplateInit(argv, prompter, ctx) {
         dir: ctx.dir,
         noTty: ctx.noTty,
         cwd: ctx.cwd,
-    });
+    }, true);
 }
 async function handleWorkspaceInit(argv, prompter, ctx) {
     const workspaceQuestions = [
@@ -222,9 +225,37 @@ async function handleWorkspaceInit(argv, prompter, ctx) {
     process.stdout.write(`\n✨ Enjoy!\n\ncd ./${dirName}\n`);
     return { ...argv, ...answers, cwd: targetPath };
 }
-async function handleModuleInit(argv, prompter, ctx) {
+async function handleModuleInit(argv, prompter, ctx, wasExplicitModuleRequest = false) {
     const project = new PgpmPackage(ctx.cwd);
     if (!project.workspacePath) {
+        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
+        if (wasExplicitModuleRequest || noTty) {
+            process.stderr.write('Not inside a PGPM workspace.\n');
+            throw errors.NOT_IN_WORKSPACE({});
+        }
+        // Offer to create a workspace instead
+        const recoveryQuestion = [
+            {
+                name: 'createWorkspace',
+                message: 'You are not inside a PGPM workspace. Would you like to create a new workspace instead?',
+                type: 'confirm',
+                required: true,
+            },
+        ];
+        const { createWorkspace } = await prompter.prompt(argv, recoveryQuestion);
+        if (createWorkspace) {
+            return handleWorkspaceInit(argv, prompter, {
+                fromPath: 'workspace',
+                templateRepo: ctx.templateRepo,
+                branch: ctx.branch,
+                dir: ctx.dir,
+                noTty: ctx.noTty,
+                cwd: ctx.cwd,
+            });
+        }
+        // User declined, show the error
         process.stderr.write('Not inside a PGPM workspace.\n');
         throw errors.NOT_IN_WORKSPACE({});
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgpm",
-  "version": "2.2.0",
+  "version": "2.3.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL Package Manager - Database migration and package management CLI",
   "main": "index.js",
@@ -39,23 +39,24 @@
     "@types/pg": "^8.16.0",
     "@types/semver": "^7.5.8",
     "@types/shelljs": "^0.8.16",
+    "clean-ansi": "0.1.5",
     "glob": "^13.0.0",
     "makage": "^0.1.9",
     "pg": "^8.16.3",
     "ts-node": "^10.9.2"
   },
   "dependencies": {
-    "@pgpmjs/core": "^4.1.0",
-    "@pgpmjs/env": "^2.8.10",
+    "@pgpmjs/core": "^4.1.2",
+    "@pgpmjs/env": "^2.8.11",
     "@pgpmjs/logger": "^1.3.5",
-    "@pgpmjs/types": "^2.12.7",
+    "@pgpmjs/types": "^2.12.8",
     "appstash": "^0.2.6",
-    "create-gen-app": "^0.8.1",
+    "create-gen-app": "^0.10.0",
     "find-and-require-package-json": "^0.8.2",
     "inquirerer": "^2.4.0",
     "js-yaml": "^4.1.0",
     "minimist": "^1.2.8",
-    "pg-cache": "^1.6.10",
+    "pg-cache": "^1.6.11",
     "pg-env": "^1.2.4",
     "semver": "^7.6.2",
     "shelljs": "^0.10.0",
@@ -73,5 +74,5 @@
     "pg",
     "pgsql"
   ],
-  "gitHead": "30931619fc721648340e9cb1667cd99314527085"
+  "gitHead": "c2e68f9808a87e3231d9b9af5e706bef5dbd2af8"
 }