@pgpmjs/core 7.13.0 → 7.15.0

package/projects/deploy.js

@@ -40,15 +40,12 @@ const types_1 = require("@pgpmjs/types");
 const path_1 = require("path");
 const path = __importStar(require("path"));
 const pg_cache_1 = require("pg-cache");
+const materialize_1 = require("../apply/materialize");
+const apply_spec_1 = require("../apply/apply-spec");
+const deploy_bundled_1 = require("../bundle/deploy-bundled");
 const pgpm_1 = require("../core/class/pgpm");
 const client_1 = require("../migrate/client");
-const package_1 = require("../packaging/package");
-// Cache for fast deployment
-const deployFastCache = {};
-const getCacheKey = (pg, name, database) => {
-    const { host, port, user } = pg ?? {};
-    return `${host}:${port}:${user}:${database}:${name}`;
-};
+const deps_1 = require("../resolution/deps");
 const log = new logger_1.Logger('deploy');
 const deployProject = async (opts, name, database, pkg, toChange) => {
     const mergedOpts = (0, env_1.getEnvOptions)(opts);
@@ -59,9 +56,12 @@ const deployProject = async (opts, name, database, pkg, toChange) => {
         throw types_1.errors.MODULE_NOT_FOUND({ name });
     }
     const modulePath = path.resolve(pkg.workspacePath, modules[name].path);
-    const moduleProject = new pgpm_1.PgpmPackage(modulePath, { extensionsDir: pkg.extensionsDir });
     log.info(`📦 Resolving dependencies for ${name}...`);
-    const extensions = moduleProject.getModuleExtensions();
+    // Proxy (apply-spec) modules have no pgpm.plan, so resolve straight off the
+    // workspace module map instead of instantiating a module-rooted package.
+    const extensions = (0, apply_spec_1.hasApplySpec)(modulePath)
+        ? (0, deps_1.resolveExtensionDependencies)(name, modules)
+        : new pgpm_1.PgpmPackage(modulePath, { extensionsDir: pkg.extensionsDir }).getModuleExtensions();
     const pgPool = (0, pg_cache_1.getPgPool)({ ...opts.pg, database });
     log.success(`🚀 Starting deployment to database ${database}...`);
     for (const extension of extensions.resolved) {
@@ -73,59 +73,32 @@ const deployProject = async (opts, name, database, pkg, toChange) => {
                 await pgPool.query(msg);
             }
             else {
-                const modulePath = (0, path_1.resolve)(pkg.workspacePath, modules[extension].path);
+                const sourcePath = (0, path_1.resolve)(pkg.workspacePath, modules[extension].path);
+                const modulePath = await (0, materialize_1.resolveEffectiveModulePath)(extension, sourcePath, modules, pkg.workspacePath);
                 log.info(`📂 Deploying local module: ${extension}`);
                 log.debug(`→ Path: ${modulePath}`);
-                if (mergedOpts.deployment.fast) {
-                    // Use fast deployment strategy
-                    const localProject = new pgpm_1.PgpmPackage(modulePath, { extensionsDir: pkg.extensionsDir });
-                    const cacheKey = getCacheKey(mergedOpts.pg, extension, database);
-                    if (mergedOpts.deployment.cache && deployFastCache[cacheKey]) {
-                        log.warn(`⚡ Using cached package for ${extension}.`);
-                        await pgPool.query(deployFastCache[cacheKey].sql);
+                if (modulePath !== sourcePath) {
+                    log.info(`🔁 Applying transpiled module (spec in ${sourcePath})`);
+                }
+                // The fast strategy is opt-in; everything else uses the per-change path.
+                if (mergedOpts.deployment.fast || mergedOpts.deployment.bundled) {
+                    // Fast strategy: execute the module in one shot AND record the
+                    // migration ledger, from the pre-built bundle artifact when one
+                    // verifies and from `deploy/` otherwise. If the semantics cannot be
+                    // honoured, fall through to the per-change migration path rather than
+                    // deploying without a ledger.
+                    const outcome = await (0, deploy_bundled_1.deployModuleFast)(modulePath, {
+                        config: { ...mergedOpts.pg, database },
+                        logOnly: mergedOpts.deployment.logOnly,
+                        useTransaction: mergedOpts.deployment.useTx,
+                        hashMethod: mergedOpts.deployment.hashMethod
+                    });
+                    if ((0, deploy_bundled_1.isBundledDeployResult)(outcome)) {
                         continue;
                     }
-                    let modulePackage;
-                    try {
-                        modulePackage = await (0, package_1.packageModule)(localProject.modulePath, {
-                            usePlan: mergedOpts.deployment.usePlan,
-                            extension: false
-                        });
-                    }
-                    catch (err) {
-                        // Build comprehensive error message
-                        const errorLines = [];
-                        errorLines.push(`❌ Failed to package module "${extension}" at path: ${modulePath}`);
-                        errorLines.push(`   Module Path: ${modulePath}`);
-                        errorLines.push(`   Workspace Path: ${pkg.workspacePath}`);
-                        errorLines.push(`   Error Code: ${err.code || 'N/A'}`);
-                        errorLines.push(`   Error Message: ${err.message || 'Unknown error'}`);
-                        // Provide debugging hints
-                        if (err.code === 'ENOENT') {
-                            errorLines.push('💡 Hint: File or directory not found. Check if the module path is correct.');
-                        }
-                        else if (err.code === 'EACCES') {
-                            errorLines.push('💡 Hint: Permission denied. Check file permissions.');
-                        }
-                        else if (err.message && err.message.includes('pgpm.plan')) {
-                            errorLines.push('💡 Hint: pgpm.plan file issue. Check if the plan file exists and is valid.');
-                        }
-                        // Log the consolidated error message
-                        log.error(errorLines.join('\n'));
-                        console.error(err); // Preserve full stack trace
-                        throw types_1.errors.DEPLOYMENT_FAILED({
-                            type: 'Deployment',
-                            module: extension
-                        });
-                    }
-                    log.debug(`→ Command: sqitch deploy db:pg:${database}`);
-                    log.debug(`> ${modulePackage.sql}`);
-                    await pgPool.query(modulePackage.sql);
-                    if (mergedOpts.deployment.cache) {
-                        deployFastCache[cacheKey] = modulePackage;
-                    }
+                    log.info(`↩️ Fast deploy unavailable for ${extension} (${outcome}); using per-change path.`);
                 }
-                else {
+                {
                     // Use new migration system
                     log.debug(`→ Command: constructive migrate deploy db:pg:${database}`);
                     try {

package/projects/revert.js

@@ -39,8 +39,11 @@ const types_1 = require("@pgpmjs/types");
 const path_1 = require("path");
 const path = __importStar(require("path"));
 const pg_cache_1 = require("pg-cache");
+const materialize_1 = require("../apply/materialize");
+const apply_spec_1 = require("../apply/apply-spec");
 const pgpm_1 = require("../core/class/pgpm");
 const client_1 = require("../migrate/client");
+const deps_1 = require("../resolution/deps");
 const log = new logger_1.Logger('revert');
 const revertProject = async (opts, name, database, pkg, options) => {
     log.info(`🔍 Gathering modules from ${pkg.workspacePath}...`);
@@ -50,9 +53,12 @@ const revertProject = async (opts, name, database, pkg, options) => {
         throw types_1.errors.MODULE_NOT_FOUND({ name });
     }
     const modulePath = path.resolve(pkg.workspacePath, modules[name].path);
-    const moduleProject = new pgpm_1.PgpmPackage(modulePath, { extensionsDir: pkg.extensionsDir });
     log.info(`📦 Resolving dependencies for ${name}...`);
-    const extensions = moduleProject.getModuleExtensions();
+    // Proxy (apply-spec) modules have no pgpm.plan, so resolve straight off the
+    // workspace module map instead of instantiating a module-rooted package.
+    const extensions = (0, apply_spec_1.hasApplySpec)(modulePath)
+        ? (0, deps_1.resolveExtensionDependencies)(name, modules)
+        : new pgpm_1.PgpmPackage(modulePath, { extensionsDir: pkg.extensionsDir }).getModuleExtensions();
     const pgPool = (0, pg_cache_1.getPgPool)({
         ...opts.pg,
         database
@@ -78,7 +84,8 @@ const revertProject = async (opts, name, database, pkg, options) => {
                 }
             }
             else {
-                const modulePath = (0, path_1.resolve)(pkg.workspacePath, modules[extension].path);
+                const sourcePath = (0, path_1.resolve)(pkg.workspacePath, modules[extension].path);
+                const modulePath = await (0, materialize_1.resolveEffectiveModulePath)(extension, sourcePath, modules, pkg.workspacePath);
                 log.info(`📂 Reverting local module: ${extension}`);
                 log.debug(`→ Path: ${modulePath}`);
                 // Use new migration system

package/projects/verify.js

@@ -39,8 +39,11 @@ const types_1 = require("@pgpmjs/types");
 const path_1 = require("path");
 const path = __importStar(require("path"));
 const pg_cache_1 = require("pg-cache");
+const materialize_1 = require("../apply/materialize");
+const apply_spec_1 = require("../apply/apply-spec");
 const pgpm_1 = require("../core/class/pgpm");
 const client_1 = require("../migrate/client");
+const deps_1 = require("../resolution/deps");
 const log = new logger_1.Logger('verify');
 const verifyProject = async (opts, name, database, pkg, options) => {
     log.info(`🔍 Gathering modules from ${pkg.workspacePath}...`);
@@ -50,9 +53,12 @@ const verifyProject = async (opts, name, database, pkg, options) => {
         throw types_1.errors.MODULE_NOT_FOUND({ name });
     }
     const modulePath = path.resolve(pkg.workspacePath, modules[name].path);
-    const moduleProject = new pgpm_1.PgpmPackage(modulePath, { extensionsDir: pkg.extensionsDir });
     log.info(`📦 Resolving dependencies for ${name}...`);
-    const extensions = moduleProject.getModuleExtensions();
+    // Proxy (apply-spec) modules have no pgpm.plan, so resolve straight off the
+    // workspace module map instead of instantiating a module-rooted package.
+    const extensions = (0, apply_spec_1.hasApplySpec)(modulePath)
+        ? (0, deps_1.resolveExtensionDependencies)(name, modules)
+        : new pgpm_1.PgpmPackage(modulePath, { extensionsDir: pkg.extensionsDir }).getModuleExtensions();
     const pgPool = (0, pg_cache_1.getPgPool)({
         ...opts.pg,
         database
@@ -67,7 +73,8 @@ const verifyProject = async (opts, name, database, pkg, options) => {
                 await pgPool.query(query, [extension]);
             }
             else {
-                const modulePath = (0, path_1.resolve)(pkg.workspacePath, modules[extension].path);
+                const sourcePath = (0, path_1.resolve)(pkg.workspacePath, modules[extension].path);
+                const modulePath = await (0, materialize_1.resolveEffectiveModulePath)(extension, sourcePath, modules, pkg.workspacePath);
                 log.info(`📂 Verifying local module: ${extension}`);
                 log.debug(`→ Path: ${modulePath}`);
                 log.debug(`→ Command: constructive migrate verify db:pg:${database}`);