@pgpmjs/core 7.14.0 → 7.15.0

package/esm/projects/deploy.js

@@ -6,16 +6,10 @@ import * as path from 'path';
 import { getPgPool } from 'pg-cache';
 import { resolveEffectiveModulePath } from '../apply/materialize';
 import { hasApplySpec } from '../apply/apply-spec';
+import { deployModuleFast, isBundledDeployResult } from '../bundle/deploy-bundled';
 import { PgpmPackage } from '../core/class/pgpm';
 import { PgpmMigrate } from '../migrate/client';
-import { packageModule } from '../packaging/package';
 import { resolveExtensionDependencies } from '../resolution/deps';
-// Cache for fast deployment
-const deployFastCache = {};
-const getCacheKey = (pg, name, database) => {
-    const { host, port, user } = pg ?? {};
-    return `${host}:${port}:${user}:${database}:${name}`;
-};
 const log = new Logger('deploy');
 export const deployProject = async (opts, name, database, pkg, toChange) => {
     const mergedOpts = getEnvOptions(opts);
@@ -50,56 +44,25 @@ export const deployProject = async (opts, name, database, pkg, toChange) => {
                 if (modulePath !== sourcePath) {
                     log.info(`🔁 Applying transpiled module (spec in ${sourcePath})`);
                 }
-                if (mergedOpts.deployment.fast) {
-                    // Use fast deployment strategy
-                    const localProject = new 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);
+                // 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 deployModuleFast(modulePath, {
+                        config: { ...mergedOpts.pg, database },
+                        logOnly: mergedOpts.deployment.logOnly,
+                        useTransaction: mergedOpts.deployment.useTx,
+                        hashMethod: mergedOpts.deployment.hashMethod
+                    });
+                    if (isBundledDeployResult(outcome)) {
                         continue;
                     }
-                    let modulePackage;
-                    try {
-                        modulePackage = await 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 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/core",
-  "version": "7.14.0",
+  "version": "7.15.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "PGPM Package and Migration Tools",
   "main": "index.js",
@@ -48,24 +48,24 @@
     "makage": "^0.3.0"
   },
   "dependencies": {
-    "@pgpmjs/ast": "^0.9.1",
-    "@pgpmjs/bundle": "^0.11.0",
-    "@pgpmjs/env": "^2.37.0",
+    "@pgpmjs/ast": "^0.9.2",
+    "@pgpmjs/bundle": "^0.12.0",
+    "@pgpmjs/env": "^2.38.0",
     "@pgpmjs/logger": "^2.22.0",
-    "@pgpmjs/server-utils": "^3.23.0",
-    "@pgpmjs/slice": "^0.10.0",
-    "@pgpmjs/transform": "^0.10.0",
-    "@pgpmjs/types": "^2.45.0",
+    "@pgpmjs/server-utils": "^3.23.1",
+    "@pgpmjs/slice": "^0.10.1",
+    "@pgpmjs/transform": "^0.11.0",
+    "@pgpmjs/types": "^2.46.0",
     "csv-to-pg": "^4.8.0",
     "genomic": "^5.6.2",
     "glob": "^13.0.6",
     "parse-package-name": "^1.0.0",
     "pg": "^8.21.0",
-    "pg-cache": "^3.23.0",
+    "pg-cache": "^3.23.1",
     "pg-env": "^1.26.0",
     "pgsql-deparser": "^18.1.1",
     "pgsql-parser": "^18.1.1",
     "yanse": "^0.2.1"
   },
-  "gitHead": "d85911699e8a50a9fdfeb7506195442525c1f238"
+  "gitHead": "5ef8341033a8fbd85841b770e996e468dd15333b"
 }

package/packaging/package.d.ts

@@ -9,6 +9,12 @@ interface PackageModuleOptions {
 interface WritePackageOptions extends PackageModuleOptions {
     version: string;
     packageDir: string;
+    /**
+     * Also emit the content-addressed bundle artifact
+     * `sql/<name>--<version>.bundle.tar.gz` (default true). It is what
+     * `deploy --bundled` consumes.
+     */
+    bundle?: boolean;
 }
 export interface MergeSqlOptions {
     /** Strip `TransactionStmt`/`CreateExtensionStmt` before deparsing (extension mode) */
@@ -38,5 +44,5 @@ export declare const packageModule: (packageDir: string, { usePlan, extension, p
     tree1?: string;
     tree2?: string;
 }>;
-export declare const writePackage: ({ version, extension, usePlan, packageDir, outputDiff, }: WritePackageOptions) => Promise<void>;
+export declare const writePackage: ({ version, extension, usePlan, packageDir, outputDiff, bundle, }: WritePackageOptions) => Promise<void>;
 export {};

package/packaging/package.js

@@ -7,6 +7,7 @@ const path_1 = require("path");
 const pgsql_deparser_1 = require("pgsql-deparser");
 const pgsql_parser_1 = require("pgsql-parser");
 const files_1 = require("@pgpmjs/ast/files");
+const artifact_1 = require("../bundle/artifact");
 const resolve_1 = require("../resolution/resolve");
 const transform_1 = require("./transform");
 const log = new logger_1.Logger('package');
@@ -84,7 +85,7 @@ const packageModule = async (packageDir, { usePlan = true, extension = true, pre
     }
 };
 exports.packageModule = packageModule;
-const writePackage = async ({ version, extension = true, usePlan = true, packageDir, outputDiff = false, }) => {
+const writePackage = async ({ version, extension = true, usePlan = true, packageDir, outputDiff = false, bundle = true, }) => {
     const pkgPath = `${packageDir}/package.json`;
     const pkg = require(pkgPath);
     const extname = await (0, files_1.getExtensionName)(packageDir);
@@ -121,5 +122,11 @@ const writePackage = async ({ version, extension = true, usePlan = true, package
     const writePath = `${outPath}/${sqlFileName}`;
     (0, fs_1.writeFileSync)(writePath, sql);
     log.success(`${(0, path_1.relative)(packageDir, writePath)} written`);
+    if (bundle) {
+        const bundlePath = await (0, artifact_1.writeBundleArtifact)(packageDir, version, {
+            createdWith: '@pgpmjs/core'
+        });
+        log.success(`${(0, path_1.relative)(packageDir, bundlePath)} written`);
+    }
 };
 exports.writePackage = writePackage;

package/projects/deploy.js

@@ -42,16 +42,10 @@ 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");
 const deps_1 = require("../resolution/deps");
-// Cache for fast deployment
-const deployFastCache = {};
-const getCacheKey = (pg, name, database) => {
-    const { host, port, user } = pg ?? {};
-    return `${host}:${port}:${user}:${database}:${name}`;
-};
 const log = new logger_1.Logger('deploy');
 const deployProject = async (opts, name, database, pkg, toChange) => {
     const mergedOpts = (0, env_1.getEnvOptions)(opts);
@@ -86,56 +80,25 @@ const deployProject = async (opts, name, database, pkg, toChange) => {
                 if (modulePath !== sourcePath) {
                     log.info(`🔁 Applying transpiled module (spec in ${sourcePath})`);
                 }
-                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);
+                // 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 {