pgpm 1.4.1 → 2.0.0

package/commands/init/index.d.ts

@@ -1,8 +1,8 @@
 import { CLIOptions, Inquirerer } from 'inquirerer';
 export declare const createInitUsageText: (binaryName: string, productLabel?: string) => string;
 declare const _default: (argv: Partial<Record<string, any>>, prompter: Inquirerer, _options: CLIOptions) => Promise<{
-    [x: string]: any;
-} | {
     cwd: string;
+} | {
+    [x: string]: any;
 }>;
 export default _default;

package/commands/init/index.js

@@ -4,29 +4,40 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createInitUsageText = void 0;
-const module_1 = __importDefault(require("./module"));
-const workspace_1 = __importDefault(require("./workspace"));
+const fs_1 = __importDefault(require("fs"));
+const path_1 = __importDefault(require("path"));
+const core_1 = require("@pgpmjs/core");
+const types_1 = require("@pgpmjs/types");
+const inquirerer_1 = require("inquirerer");
+const DEFAULT_MOTD = `
+                 |              _   _
+     ===         |.===.        '\\-//\`
+    (o o)        {}o o{}        (o o)
+ooO--(_)--Ooo-ooO--(_)--Ooo-ooO--(_)--Ooo-
+`;
 const createInitUsageText = (binaryName, productLabel) => {
     const displayName = productLabel ?? binaryName;
     return `
 Init Command:
 
-  ${binaryName} init [OPTIONS] [workspace]
+  ${binaryName} init [OPTIONS] [<fromPath>]
 
-  Initialize ${displayName} workspace or module.
+  Initialize ${displayName} from a template. The template's type (workspace/module)
+  determines the behavior automatically.
 
 Options:
   --help, -h              Show this help message
   --cwd <directory>       Working directory (default: current directory)
   --repo <repo>           Template repo (default: https://github.com/constructive-io/pgpm-boilerplates.git)
-  --template-path <path>  Template sub-path (default: workspace/module) or local path override
   --from-branch <branch>  Branch/tag to use when cloning repo
+  --dir <variant>         Template variant directory (e.g., supabase, drizzle)
 
 Examples:
-  ${binaryName} init                                   Initialize new module in existing workspace
+  ${binaryName} init                                   Initialize new module (default)
   ${binaryName} init workspace                         Initialize new workspace
+  ${binaryName} init module                            Initialize new module explicitly
+  ${binaryName} init workspace --dir <variant>         Use variant templates
   ${binaryName} init --repo owner/repo                 Use templates from GitHub repository
-  ${binaryName} init --template-path ./custom-templates Use templates from local path
   ${binaryName} init --repo owner/repo --from-branch develop  Use specific branch
 `;
 };
@@ -37,16 +48,167 @@ exports.default = async (argv, prompter, _options) => {
         console.log((0, exports.createInitUsageText)('pgpm'));
         process.exit(0);
     }
-    return handlePromptFlow(argv, prompter);
+    return handleInit(argv, prompter);
 };
-async function handlePromptFlow(argv, prompter) {
-    const firstArg = argv._?.[0] || undefined;
-    if (firstArg === 'workspace') {
-        const nextArgv = {
+async function handleInit(argv, prompter) {
+    const { cwd = process.cwd() } = argv;
+    const templateRepo = argv.repo ?? core_1.DEFAULT_TEMPLATE_REPO;
+    const branch = argv.fromBranch;
+    const dir = argv.dir;
+    const noTty = Boolean(argv.noTty || argv['no-tty'] || process.env.CI === 'true');
+    // Get fromPath from first positional arg, default to 'module'
+    const fromPath = argv._?.[0] || 'module';
+    // Inspect the template to get its type
+    const inspection = (0, core_1.inspectTemplate)({
+        fromPath,
+        templateRepo,
+        branch,
+        dir,
+        toolName: core_1.DEFAULT_TEMPLATE_TOOL_NAME,
+        cwd,
+    });
+    const templateType = inspection.config?.type;
+    // Branch based on template type
+    if (templateType === 'workspace') {
+        return handleWorkspaceInit(argv, prompter, {
+            fromPath,
+            templateRepo,
+            branch,
+            dir,
+            noTty,
+            cwd,
+        });
+    }
+    // Default to module init (for 'module' type or unknown types)
+    return handleModuleInit(argv, prompter, {
+        fromPath,
+        templateRepo,
+        branch,
+        dir,
+        noTty,
+        cwd,
+    });
+}
+async function handleWorkspaceInit(argv, prompter, ctx) {
+    const workspaceQuestions = [
+        {
+            name: 'name',
+            message: 'Enter workspace name',
+            required: true,
+            type: 'text'
+        }
+    ];
+    const answers = await prompter.prompt(argv, workspaceQuestions);
+    const targetPath = path_1.default.join(ctx.cwd, (0, core_1.sluggify)(answers.name));
+    // Register workspace.dirname resolver so boilerplate templates can use it via defaultFrom/setFrom
+    const dirName = path_1.default.basename(targetPath);
+    (0, inquirerer_1.registerDefaultResolver)('workspace.dirname', () => dirName);
+    await (0, core_1.scaffoldTemplate)({
+        fromPath: ctx.fromPath,
+        outputDir: targetPath,
+        templateRepo: ctx.templateRepo,
+        branch: ctx.branch,
+        dir: ctx.dir,
+        answers: {
             ...argv,
-            _: (argv._ ?? []).slice(1)
-        };
-        return (0, workspace_1.default)(nextArgv, prompter);
+            ...answers,
+            workspaceName: answers.name
+        },
+        toolName: core_1.DEFAULT_TEMPLATE_TOOL_NAME,
+        noTty: ctx.noTty,
+        cwd: ctx.cwd,
+        prompter
+    });
+    // Check for .motd file and print it, or use default ASCII art
+    const motdPath = path_1.default.join(targetPath, '.motd');
+    let motd = DEFAULT_MOTD;
+    if (fs_1.default.existsSync(motdPath)) {
+        try {
+            motd = fs_1.default.readFileSync(motdPath, 'utf8');
+            fs_1.default.unlinkSync(motdPath);
+        }
+        catch {
+            // Ignore errors reading/deleting .motd
+        }
+    }
+    process.stdout.write(motd);
+    if (!motd.endsWith('\n')) {
+        process.stdout.write('\n');
+    }
+    process.stdout.write(`\n✨ Enjoy!\n\ncd ./${dirName}\n`);
+    return { ...argv, ...answers, cwd: targetPath };
+}
+async function handleModuleInit(argv, prompter, ctx) {
+    const project = new core_1.PgpmPackage(ctx.cwd);
+    if (!project.workspacePath) {
+        process.stderr.write('Not inside a PGPM workspace.\n');
+        throw types_1.errors.NOT_IN_WORKSPACE({});
+    }
+    if (!project.isInsideAllowedDirs(ctx.cwd) && !project.isInWorkspace() && !project.isParentOfAllowedDirs(ctx.cwd)) {
+        process.stderr.write('You must be inside the workspace root or a parent directory of modules (like packages/).\n');
+        throw types_1.errors.NOT_IN_WORKSPACE_MODULE({});
+    }
+    const availExtensions = project.getAvailableModules();
+    const moduleQuestions = [
+        {
+            name: 'moduleName',
+            message: 'Enter the module name',
+            required: true,
+            type: 'text',
+        },
+        {
+            name: 'extensions',
+            message: 'Which extensions?',
+            options: availExtensions,
+            type: 'checkbox',
+            allowCustomOptions: true,
+            required: true,
+        },
+    ];
+    const answers = await prompter.prompt(argv, moduleQuestions);
+    const modName = (0, core_1.sluggify)(answers.moduleName);
+    const extensions = answers.extensions
+        .filter((opt) => opt.selected)
+        .map((opt) => opt.name);
+    const templateAnswers = {
+        ...argv,
+        ...answers,
+        moduleName: modName,
+        packageIdentifier: argv.packageIdentifier || modName
+    };
+    await project.initModule({
+        name: modName,
+        description: answers.description || modName,
+        author: answers.author || modName,
+        extensions,
+        templateRepo: ctx.templateRepo,
+        templatePath: ctx.fromPath,
+        branch: ctx.branch,
+        dir: ctx.dir,
+        toolName: core_1.DEFAULT_TEMPLATE_TOOL_NAME,
+        answers: templateAnswers,
+        noTty: ctx.noTty
+    });
+    const isRoot = path_1.default.resolve(project.getWorkspacePath()) === path_1.default.resolve(ctx.cwd);
+    const modulePath = isRoot
+        ? path_1.default.join(ctx.cwd, 'packages', modName)
+        : path_1.default.join(ctx.cwd, modName);
+    const motdPath = path_1.default.join(modulePath, '.motd');
+    let motd = DEFAULT_MOTD;
+    if (fs_1.default.existsSync(motdPath)) {
+        try {
+            motd = fs_1.default.readFileSync(motdPath, 'utf8');
+            fs_1.default.unlinkSync(motdPath);
+        }
+        catch {
+            // Ignore errors reading/deleting .motd
+        }
+    }
+    process.stdout.write(motd);
+    if (!motd.endsWith('\n')) {
+        process.stdout.write('\n');
     }
-    return (0, module_1.default)(argv, prompter);
+    const relPath = isRoot ? `packages/${modName}` : modName;
+    process.stdout.write(`\n✨ Enjoy!\n\ncd ./${relPath}\n`);
+    return { ...argv, ...answers };
 }

package/commands/init/module.js

@@ -51,6 +51,7 @@ async function runModuleSetup(argv, prompter) {
         .map((opt) => opt.name);
     const templateRepo = argv.repo ?? core_1.DEFAULT_TEMPLATE_REPO;
     const templatePath = argv.templatePath;
+    const dir = argv.dir;
     const templateAnswers = {
         ...argv,
         ...answers,
@@ -65,6 +66,7 @@ async function runModuleSetup(argv, prompter) {
         templateRepo,
         templatePath,
         branch: argv.fromBranch,
+        dir,
         toolName: core_1.DEFAULT_TEMPLATE_TOOL_NAME,
         answers: templateAnswers,
         noTty: Boolean(argv.noTty || argv['no-tty'] || process.env.CI === 'true')

package/commands/init/workspace.js

@@ -35,12 +35,13 @@ async function runWorkspaceSetup(argv, prompter) {
     // This provides the intended workspace directory name before the folder is created
     const dirName = path_1.default.basename(targetPath);
     (0, inquirerer_1.registerDefaultResolver)('workspace.dirname', () => dirName);
+    const dir = argv.dir;
     await (0, core_1.scaffoldTemplate)({
-        type: 'workspace',
+        fromPath: templatePath ?? 'workspace',
         outputDir: targetPath,
         templateRepo,
         branch: argv.fromBranch,
-        templatePath,
+        dir,
         answers: {
             ...argv,
             ...answers,
@@ -48,7 +49,8 @@ async function runWorkspaceSetup(argv, prompter) {
         },
         toolName: core_1.DEFAULT_TEMPLATE_TOOL_NAME,
         noTty: Boolean(argv.noTty || argv['no-tty'] || process.env.CI === 'true'),
-        cwd
+        cwd,
+        prompter
     });
     // Check for .motd file and print it, or use default ASCII art
     const motdPath = path_1.default.join(targetPath, '.motd');

package/esm/commands/init/index.js

@@ -1,26 +1,37 @@
-import runModuleSetup from './module';
-import runWorkspaceSetup from './workspace';
+import fs from 'fs';
+import path from 'path';
+import { DEFAULT_TEMPLATE_REPO, DEFAULT_TEMPLATE_TOOL_NAME, inspectTemplate, PgpmPackage, scaffoldTemplate, sluggify, } from '@pgpmjs/core';
+import { errors } from '@pgpmjs/types';
+import { registerDefaultResolver } from 'inquirerer';
+const DEFAULT_MOTD = `
+                 |              _   _
+     ===         |.===.        '\\-//\`
+    (o o)        {}o o{}        (o o)
+ooO--(_)--Ooo-ooO--(_)--Ooo-ooO--(_)--Ooo-
+`;
 export const createInitUsageText = (binaryName, productLabel) => {
     const displayName = productLabel ?? binaryName;
     return `
 Init Command:
 
-  ${binaryName} init [OPTIONS] [workspace]
+  ${binaryName} init [OPTIONS] [<fromPath>]
 
-  Initialize ${displayName} workspace or module.
+  Initialize ${displayName} from a template. The template's type (workspace/module)
+  determines the behavior automatically.
 
 Options:
   --help, -h              Show this help message
   --cwd <directory>       Working directory (default: current directory)
   --repo <repo>           Template repo (default: https://github.com/constructive-io/pgpm-boilerplates.git)
-  --template-path <path>  Template sub-path (default: workspace/module) or local path override
   --from-branch <branch>  Branch/tag to use when cloning repo
+  --dir <variant>         Template variant directory (e.g., supabase, drizzle)
 
 Examples:
-  ${binaryName} init                                   Initialize new module in existing workspace
+  ${binaryName} init                                   Initialize new module (default)
   ${binaryName} init workspace                         Initialize new workspace
+  ${binaryName} init module                            Initialize new module explicitly
+  ${binaryName} init workspace --dir <variant>         Use variant templates
   ${binaryName} init --repo owner/repo                 Use templates from GitHub repository
-  ${binaryName} init --template-path ./custom-templates Use templates from local path
   ${binaryName} init --repo owner/repo --from-branch develop  Use specific branch
 `;
 };
@@ -30,16 +41,167 @@ export default async (argv, prompter, _options) => {
         console.log(createInitUsageText('pgpm'));
         process.exit(0);
     }
-    return handlePromptFlow(argv, prompter);
+    return handleInit(argv, prompter);
 };
-async function handlePromptFlow(argv, prompter) {
-    const firstArg = argv._?.[0] || undefined;
-    if (firstArg === 'workspace') {
-        const nextArgv = {
+async function handleInit(argv, prompter) {
+    const { cwd = process.cwd() } = argv;
+    const templateRepo = argv.repo ?? DEFAULT_TEMPLATE_REPO;
+    const branch = argv.fromBranch;
+    const dir = argv.dir;
+    const noTty = Boolean(argv.noTty || argv['no-tty'] || process.env.CI === 'true');
+    // Get fromPath from first positional arg, default to 'module'
+    const fromPath = argv._?.[0] || 'module';
+    // Inspect the template to get its type
+    const inspection = inspectTemplate({
+        fromPath,
+        templateRepo,
+        branch,
+        dir,
+        toolName: DEFAULT_TEMPLATE_TOOL_NAME,
+        cwd,
+    });
+    const templateType = inspection.config?.type;
+    // Branch based on template type
+    if (templateType === 'workspace') {
+        return handleWorkspaceInit(argv, prompter, {
+            fromPath,
+            templateRepo,
+            branch,
+            dir,
+            noTty,
+            cwd,
+        });
+    }
+    // Default to module init (for 'module' type or unknown types)
+    return handleModuleInit(argv, prompter, {
+        fromPath,
+        templateRepo,
+        branch,
+        dir,
+        noTty,
+        cwd,
+    });
+}
+async function handleWorkspaceInit(argv, prompter, ctx) {
+    const workspaceQuestions = [
+        {
+            name: 'name',
+            message: 'Enter workspace name',
+            required: true,
+            type: 'text'
+        }
+    ];
+    const answers = await prompter.prompt(argv, workspaceQuestions);
+    const targetPath = path.join(ctx.cwd, sluggify(answers.name));
+    // Register workspace.dirname resolver so boilerplate templates can use it via defaultFrom/setFrom
+    const dirName = path.basename(targetPath);
+    registerDefaultResolver('workspace.dirname', () => dirName);
+    await scaffoldTemplate({
+        fromPath: ctx.fromPath,
+        outputDir: targetPath,
+        templateRepo: ctx.templateRepo,
+        branch: ctx.branch,
+        dir: ctx.dir,
+        answers: {
             ...argv,
-            _: (argv._ ?? []).slice(1)
-        };
-        return runWorkspaceSetup(nextArgv, prompter);
+            ...answers,
+            workspaceName: answers.name
+        },
+        toolName: DEFAULT_TEMPLATE_TOOL_NAME,
+        noTty: ctx.noTty,
+        cwd: ctx.cwd,
+        prompter
+    });
+    // Check for .motd file and print it, or use default ASCII art
+    const motdPath = path.join(targetPath, '.motd');
+    let motd = DEFAULT_MOTD;
+    if (fs.existsSync(motdPath)) {
+        try {
+            motd = fs.readFileSync(motdPath, 'utf8');
+            fs.unlinkSync(motdPath);
+        }
+        catch {
+            // Ignore errors reading/deleting .motd
+        }
+    }
+    process.stdout.write(motd);
+    if (!motd.endsWith('\n')) {
+        process.stdout.write('\n');
+    }
+    process.stdout.write(`\n✨ Enjoy!\n\ncd ./${dirName}\n`);
+    return { ...argv, ...answers, cwd: targetPath };
+}
+async function handleModuleInit(argv, prompter, ctx) {
+    const project = new PgpmPackage(ctx.cwd);
+    if (!project.workspacePath) {
+        process.stderr.write('Not inside a PGPM workspace.\n');
+        throw errors.NOT_IN_WORKSPACE({});
+    }
+    if (!project.isInsideAllowedDirs(ctx.cwd) && !project.isInWorkspace() && !project.isParentOfAllowedDirs(ctx.cwd)) {
+        process.stderr.write('You must be inside the workspace root or a parent directory of modules (like packages/).\n');
+        throw errors.NOT_IN_WORKSPACE_MODULE({});
+    }
+    const availExtensions = project.getAvailableModules();
+    const moduleQuestions = [
+        {
+            name: 'moduleName',
+            message: 'Enter the module name',
+            required: true,
+            type: 'text',
+        },
+        {
+            name: 'extensions',
+            message: 'Which extensions?',
+            options: availExtensions,
+            type: 'checkbox',
+            allowCustomOptions: true,
+            required: true,
+        },
+    ];
+    const answers = await prompter.prompt(argv, moduleQuestions);
+    const modName = sluggify(answers.moduleName);
+    const extensions = answers.extensions
+        .filter((opt) => opt.selected)
+        .map((opt) => opt.name);
+    const templateAnswers = {
+        ...argv,
+        ...answers,
+        moduleName: modName,
+        packageIdentifier: argv.packageIdentifier || modName
+    };
+    await project.initModule({
+        name: modName,
+        description: answers.description || modName,
+        author: answers.author || modName,
+        extensions,
+        templateRepo: ctx.templateRepo,
+        templatePath: ctx.fromPath,
+        branch: ctx.branch,
+        dir: ctx.dir,
+        toolName: DEFAULT_TEMPLATE_TOOL_NAME,
+        answers: templateAnswers,
+        noTty: ctx.noTty
+    });
+    const isRoot = path.resolve(project.getWorkspacePath()) === path.resolve(ctx.cwd);
+    const modulePath = isRoot
+        ? path.join(ctx.cwd, 'packages', modName)
+        : path.join(ctx.cwd, modName);
+    const motdPath = path.join(modulePath, '.motd');
+    let motd = DEFAULT_MOTD;
+    if (fs.existsSync(motdPath)) {
+        try {
+            motd = fs.readFileSync(motdPath, 'utf8');
+            fs.unlinkSync(motdPath);
+        }
+        catch {
+            // Ignore errors reading/deleting .motd
+        }
+    }
+    process.stdout.write(motd);
+    if (!motd.endsWith('\n')) {
+        process.stdout.write('\n');
     }
-    return runModuleSetup(argv, prompter);
+    const relPath = isRoot ? `packages/${modName}` : modName;
+    process.stdout.write(`\n✨ Enjoy!\n\ncd ./${relPath}\n`);
+    return { ...argv, ...answers };
 }

package/esm/commands/init/module.js

@@ -45,6 +45,7 @@ export default async function runModuleSetup(argv, prompter) {
         .map((opt) => opt.name);
     const templateRepo = argv.repo ?? DEFAULT_TEMPLATE_REPO;
     const templatePath = argv.templatePath;
+    const dir = argv.dir;
     const templateAnswers = {
         ...argv,
         ...answers,
@@ -59,6 +60,7 @@ export default async function runModuleSetup(argv, prompter) {
         templateRepo,
         templatePath,
         branch: argv.fromBranch,
+        dir,
         toolName: DEFAULT_TEMPLATE_TOOL_NAME,
         answers: templateAnswers,
         noTty: Boolean(argv.noTty || argv['no-tty'] || process.env.CI === 'true')

package/esm/commands/init/workspace.js

@@ -29,12 +29,13 @@ export default async function runWorkspaceSetup(argv, prompter) {
     // This provides the intended workspace directory name before the folder is created
     const dirName = path.basename(targetPath);
     registerDefaultResolver('workspace.dirname', () => dirName);
+    const dir = argv.dir;
     await scaffoldTemplate({
-        type: 'workspace',
+        fromPath: templatePath ?? 'workspace',
         outputDir: targetPath,
         templateRepo,
         branch: argv.fromBranch,
-        templatePath,
+        dir,
         answers: {
             ...argv,
             ...answers,
@@ -42,7 +43,8 @@ export default async function runWorkspaceSetup(argv, prompter) {
         },
         toolName: DEFAULT_TEMPLATE_TOOL_NAME,
         noTty: Boolean(argv.noTty || argv['no-tty'] || process.env.CI === 'true'),
-        cwd
+        cwd,
+        prompter
     });
     // Check for .motd file and print it, or use default ASCII art
     const motdPath = path.join(targetPath, '.motd');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgpm",
-  "version": "1.4.1",
+  "version": "2.0.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL Package Manager - Database migration and package management CLI",
   "main": "index.js",
@@ -45,14 +45,14 @@
     "ts-node": "^10.9.2"
   },
   "dependencies": {
-    "@pgpmjs/core": "^3.2.2",
+    "@pgpmjs/core": "^4.0.0",
     "@pgpmjs/env": "^2.8.8",
     "@pgpmjs/logger": "^1.3.5",
     "@pgpmjs/types": "^2.12.6",
     "appstash": "^0.2.6",
-    "create-gen-app": "^0.6.3",
+    "create-gen-app": "^0.8.1",
     "find-and-require-package-json": "^0.8.2",
-    "inquirerer": "^2.3.1",
+    "inquirerer": "^2.4.0",
     "js-yaml": "^4.1.0",
     "minimist": "^1.2.8",
     "pg-cache": "^1.6.9",
@@ -73,5 +73,5 @@
     "pg",
     "pgsql"
   ],
-  "gitHead": "cca7c544a3bc138f968aa7a7ddef6708ec06d1d6"
+  "gitHead": "b1d773f5215ad5ea1dca82b33b550728fdcd1ec0"
 }