pgpm 2.1.1 → 2.2.0

package/commands/export.js

@@ -69,6 +69,9 @@ exports.default = async (argv, prompter, _options) => {
             required: true
         }
     ]));
+    const selectedDatabaseNames = database_ids
+        .filter(did => did.selected)
+        .map(did => did.name);
     const dbInfo = {
         dbname,
         database_ids: database_ids.map(did => dbsResult.rows.find(db => db.name === did.name).id)
@@ -85,7 +88,7 @@ exports.default = async (argv, prompter, _options) => {
             type: 'text',
             name: 'extensionName',
             message: 'Extension name',
-            default: dbInfo.database_ids[0],
+            default: selectedDatabaseNames[0] || dbname,
             required: true
         },
         {
@@ -108,6 +111,7 @@ exports.default = async (argv, prompter, _options) => {
         }
     ]);
     const outdir = (0, path_1.resolve)(project.workspacePath, 'packages/');
+    prompter.close();
     await (0, core_1.exportMigrations)({
         project,
         options,

package/commands/extension.js

@@ -28,7 +28,7 @@ exports.default = async (argv, prompter, _options) => {
     }
     const info = project.getModuleInfo();
     const installed = project.getRequiredModules();
-    const available = project.getAvailableModules();
+    const available = await project.getAvailableModules();
     const filtered = available.filter(name => name !== info.extname);
     const questions = [
         {

package/commands/init/index.js

@@ -239,7 +239,11 @@ async function handleModuleInit(argv, prompter, ctx) {
         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 availExtensions = await project.getAvailableModules();
+    // Note: moduleName is needed here before scaffolding because initModule creates
+    // the directory first, then scaffolds. The boilerplate's ____moduleName____ question
+    // gets skipped because the answer is already passed through. So users only see it
+    // once, but the definition exists in two places for this architectural reason.
     const moduleQuestions = [
         {
             name: 'moduleName',
@@ -254,6 +258,7 @@ async function handleModuleInit(argv, prompter, ctx) {
             type: 'checkbox',
             allowCustomOptions: true,
             required: true,
+            default: ['plpgsql', 'uuid-ossp'],
         },
     ];
     const answers = await prompter.prompt(argv, moduleQuestions);

package/esm/commands/export.js

@@ -67,6 +67,9 @@ export default async (argv, prompter, _options) => {
             required: true
         }
     ]));
+    const selectedDatabaseNames = database_ids
+        .filter(did => did.selected)
+        .map(did => did.name);
     const dbInfo = {
         dbname,
         database_ids: database_ids.map(did => dbsResult.rows.find(db => db.name === did.name).id)
@@ -83,7 +86,7 @@ export default async (argv, prompter, _options) => {
             type: 'text',
             name: 'extensionName',
             message: 'Extension name',
-            default: dbInfo.database_ids[0],
+            default: selectedDatabaseNames[0] || dbname,
             required: true
         },
         {
@@ -106,6 +109,7 @@ export default async (argv, prompter, _options) => {
         }
     ]);
     const outdir = resolve(project.workspacePath, 'packages/');
+    prompter.close();
     await exportMigrations({
         project,
         options,

package/esm/commands/extension.js

@@ -26,7 +26,7 @@ export default async (argv, prompter, _options) => {
     }
     const info = project.getModuleInfo();
     const installed = project.getRequiredModules();
-    const available = project.getAvailableModules();
+    const available = await project.getAvailableModules();
     const filtered = available.filter(name => name !== info.extname);
     const questions = [
         {

package/esm/commands/init/index.js

@@ -232,7 +232,11 @@ async function handleModuleInit(argv, prompter, ctx) {
         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 availExtensions = await project.getAvailableModules();
+    // Note: moduleName is needed here before scaffolding because initModule creates
+    // the directory first, then scaffolds. The boilerplate's ____moduleName____ question
+    // gets skipped because the answer is already passed through. So users only see it
+    // once, but the definition exists in two places for this architectural reason.
     const moduleQuestions = [
         {
             name: 'moduleName',
@@ -247,6 +251,7 @@ async function handleModuleInit(argv, prompter, ctx) {
             type: 'checkbox',
             allowCustomOptions: true,
             required: true,
+            default: ['plpgsql', 'uuid-ossp'],
         },
     ];
     const answers = await prompter.prompt(argv, moduleQuestions);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pgpm",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "PostgreSQL Package Manager - Database migration and package management CLI",
   "main": "index.js",
@@ -45,8 +45,8 @@
     "ts-node": "^10.9.2"
   },
   "dependencies": {
-    "@pgpmjs/core": "^4.0.2",
-    "@pgpmjs/env": "^2.8.9",
+    "@pgpmjs/core": "^4.1.0",
+    "@pgpmjs/env": "^2.8.10",
     "@pgpmjs/logger": "^1.3.5",
     "@pgpmjs/types": "^2.12.7",
     "appstash": "^0.2.6",
@@ -73,5 +73,5 @@
     "pg",
     "pgsql"
   ],
-  "gitHead": "f6cb102f2d19174b4f54ed2ba0c02308b1325830"
+  "gitHead": "30931619fc721648340e9cb1667cd99314527085"
 }

package/commands/init/module.d.ts

@@ -1,4 +0,0 @@
-import { Inquirerer } from 'inquirerer';
-export default function runModuleSetup(argv: Partial<Record<string, any>>, prompter: Inquirerer): Promise<{
-    [x: string]: any;
-}>;

package/commands/init/module.js

@@ -1,96 +0,0 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = runModuleSetup;
-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 DEFAULT_MOTD = `
-                 |              _   _
-     ===         |.===.        '\\-//\`
-    (o o)        {}o o{}        (o o)
-ooO--(_)--Ooo-ooO--(_)--Ooo-ooO--(_)--Ooo-
-`;
-async function runModuleSetup(argv, prompter) {
-    const { cwd = process.cwd() } = argv;
-    const project = new core_1.PgpmPackage(cwd);
-    if (!project.workspacePath) {
-        process.stderr.write('Not inside a PGPM workspace.\n');
-        throw types_1.errors.NOT_IN_WORKSPACE({});
-    }
-    if (!project.isInsideAllowedDirs(cwd) && !project.isInWorkspace() && !project.isParentOfAllowedDirs(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);
-    // Avoid overlapping readline listeners with create-gen-app's prompts.
-    prompter.close();
-    const extensions = answers.extensions
-        .filter((opt) => opt.selected)
-        .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,
-        moduleName: modName,
-        packageIdentifier: argv.packageIdentifier || modName
-    };
-    await project.initModule({
-        name: modName,
-        description: answers.description || modName,
-        author: answers.author || modName,
-        extensions,
-        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')
-    });
-    const isRoot = path_1.default.resolve(project.getWorkspacePath()) === path_1.default.resolve(cwd);
-    const modulePath = isRoot
-        ? path_1.default.join(cwd, 'packages', modName)
-        : path_1.default.join(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');
-    }
-    const relPath = isRoot ? `packages/${modName}` : modName;
-    process.stdout.write(`\n✨ Enjoy!\n\ncd ./${relPath}\n`);
-    return { ...argv, ...answers };
-}

package/esm/commands/init/module.js

@@ -1,90 +0,0 @@
-import fs from 'fs';
-import path from 'path';
-import { DEFAULT_TEMPLATE_REPO, DEFAULT_TEMPLATE_TOOL_NAME, PgpmPackage, sluggify } from '@pgpmjs/core';
-import { errors } from '@pgpmjs/types';
-const DEFAULT_MOTD = `
-                 |              _   _
-     ===         |.===.        '\\-//\`
-    (o o)        {}o o{}        (o o)
-ooO--(_)--Ooo-ooO--(_)--Ooo-ooO--(_)--Ooo-
-`;
-export default async function runModuleSetup(argv, prompter) {
-    const { cwd = process.cwd() } = argv;
-    const project = new PgpmPackage(cwd);
-    if (!project.workspacePath) {
-        process.stderr.write('Not inside a PGPM workspace.\n');
-        throw errors.NOT_IN_WORKSPACE({});
-    }
-    if (!project.isInsideAllowedDirs(cwd) && !project.isInWorkspace() && !project.isParentOfAllowedDirs(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);
-    // Avoid overlapping readline listeners with create-gen-app's prompts.
-    prompter.close();
-    const extensions = answers.extensions
-        .filter((opt) => opt.selected)
-        .map((opt) => opt.name);
-    const templateRepo = argv.repo ?? DEFAULT_TEMPLATE_REPO;
-    const templatePath = argv.templatePath;
-    const dir = argv.dir;
-    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,
-        templatePath,
-        branch: argv.fromBranch,
-        dir,
-        toolName: DEFAULT_TEMPLATE_TOOL_NAME,
-        answers: templateAnswers,
-        noTty: Boolean(argv.noTty || argv['no-tty'] || process.env.CI === 'true')
-    });
-    const isRoot = path.resolve(project.getWorkspacePath()) === path.resolve(cwd);
-    const modulePath = isRoot
-        ? path.join(cwd, 'packages', modName)
-        : path.join(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');
-    }
-    const relPath = isRoot ? `packages/${modName}` : modName;
-    process.stdout.write(`\n✨ Enjoy!\n\ncd ./${relPath}\n`);
-    return { ...argv, ...answers };
-}