@pgpmjs/core 7.5.1 → 7.9.0

package/core/class/pgpm.d.ts

@@ -3,6 +3,7 @@ import { PgConfig } from 'pg-env';
 import { ExtensionInfo } from '@pgpmjs/ast/files';
 import { PackageAnalysisResult, RenameOptions } from '@pgpmjs/ast/files/types';
 import { ModuleMap } from '../../modules/modules';
+import { SyncVersionsOptions, SyncVersionsResult } from '../../packaging/sync-versions';
 /**
  * Options accepted by the {@link PgpmPackage} constructor.
  */
@@ -252,6 +253,13 @@ export declare class PgpmPackage {
      * @returns Array of module names that were updated
      */
     private updateWorkspaceModuleVersions;
+    /**
+     * Sync extension metadata (.control default_version, Makefile sql filename,
+     * and the sql/<name>--<version>.sql bundle) to the package.json version.
+     * Inside a module, syncs just that module; at a workspace root, syncs every
+     * workspace module. With `check: true`, reports skew without writing.
+     */
+    syncVersions(options?: SyncVersionsOptions): Promise<SyncVersionsResult>;
     /**
      * Get the set of modules that have been deployed to the database
      */

package/core/class/pgpm.js

@@ -58,6 +58,7 @@ const validators_1 = require("@pgpmjs/ast/files/plan/validators");
 const client_1 = require("../../migrate/client");
 const modules_1 = require("../../modules/modules");
 const package_1 = require("../../packaging/package");
+const sync_versions_1 = require("../../packaging/sync-versions");
 const deps_1 = require("../../resolution/deps");
 const fs_2 = require("../../utils/fs");
 const glob_1 = require("../../utils/glob");
@@ -1176,6 +1177,21 @@ ${dependencies.length > 0 ? dependencies.map(dep => `-- requires: ${dep}`).join(
         return affectedModules;
     }
     // ──────────────── Package Operations ────────────────
+    /**
+     * Sync extension metadata (.control default_version, Makefile sql filename,
+     * and the sql/<name>--<version>.sql bundle) to the package.json version.
+     * Inside a module, syncs just that module; at a workspace root, syncs every
+     * workspace module. With `check: true`, reports skew without writing.
+     */
+    async syncVersions(options = {}) {
+        if (this.isInModule()) {
+            return (0, sync_versions_1.syncModuleVersions)([this.modulePath], options);
+        }
+        this.ensureWorkspace();
+        const moduleMap = this.getModuleMap();
+        const packageDirs = Object.values(moduleMap).map(mod => path_1.default.resolve(this.workspacePath, mod.path));
+        return (0, sync_versions_1.syncModuleVersions)(packageDirs, options);
+    }
     /**
      * Get the set of modules that have been deployed to the database
      */

package/esm/core/class/pgpm.js

@@ -19,6 +19,7 @@ import { isValidChangeName, isValidTagName, parseReference } from '@pgpmjs/ast/f
 import { PgpmMigrate } from '../../migrate/client';
 import { getExtensionsAndModules, getExtensionsAndModulesChanges, latestChange, latestChangeAndVersion } from '../../modules/modules';
 import { packageModule } from '../../packaging/package';
+import { syncModuleVersions } from '../../packaging/sync-versions';
 import { resolveDependencies, resolveExtensionDependencies } from '../../resolution/deps';
 import { movePath } from '../../utils/fs';
 import { globPaths, globPattern, toPosixPath } from '../../utils/glob';
@@ -1137,6 +1138,21 @@ ${dependencies.length > 0 ? dependencies.map(dep => `-- requires: ${dep}`).join(
         return affectedModules;
     }
     // ──────────────── Package Operations ────────────────
+    /**
+     * Sync extension metadata (.control default_version, Makefile sql filename,
+     * and the sql/<name>--<version>.sql bundle) to the package.json version.
+     * Inside a module, syncs just that module; at a workspace root, syncs every
+     * workspace module. With `check: true`, reports skew without writing.
+     */
+    async syncVersions(options = {}) {
+        if (this.isInModule()) {
+            return syncModuleVersions([this.modulePath], options);
+        }
+        this.ensureWorkspace();
+        const moduleMap = this.getModuleMap();
+        const packageDirs = Object.values(moduleMap).map(mod => path.resolve(this.workspacePath, mod.path));
+        return syncModuleVersions(packageDirs, options);
+    }
     /**
      * Get the set of modules that have been deployed to the database
      */

package/esm/index.js

@@ -3,6 +3,7 @@ export * from './rebundle';
 export * from './extensions/extensions';
 export * from './modules/modules';
 export * from './packaging/package';
+export * from './packaging/sync-versions';
 export * from './packaging/transform';
 export * from './resolution/deps';
 export * from './resolution/resolve';

package/esm/packaging/package.js

@@ -98,7 +98,7 @@ export const writePackage = async ({ version, extension = true, usePlan = true,
     if (extension) {
         writeFileSync(controlPath, control.replace(/default_version = '[0-9\.]+'/, `default_version = '${version}'`));
         pkg.version = version;
-        writeFileSync(pkgPath, JSON.stringify(pkg, null, 2));
+        writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
         const regex = new RegExp(`${extname}--[0-9.]+.sql`);
         writeFileSync(makePath, Makefile.replace(regex, sqlFileName));
     }

package/esm/packaging/sync-versions.js

@@ -0,0 +1,53 @@
+import { Logger } from '@pgpmjs/logger';
+import { existsSync, readFileSync } from 'fs';
+import { join } from 'path';
+import { getExtensionInfo, parseControlContent } from '@pgpmjs/ast/files';
+import { writePackage } from './package';
+const log = new Logger('sync-versions');
+/**
+ * Inspect a module directory and report whether its extension metadata
+ * (.control default_version + sql bundle) matches the package.json version.
+ */
+export const getModuleVersionStatus = (packageDir) => {
+    const { extname, version, controlFile, sqlFile } = getExtensionInfo(packageDir);
+    const { version: controlVersion } = parseControlContent(readFileSync(controlFile, 'utf-8'));
+    const sqlFileExists = existsSync(join(packageDir, sqlFile));
+    return {
+        name: extname,
+        packageDir,
+        packageVersion: version,
+        controlVersion,
+        sqlFileExists,
+        inSync: version === controlVersion && sqlFileExists
+    };
+};
+/**
+ * Bring a set of module directories back in sync with their package.json
+ * versions by re-running the packaging flow (control file, Makefile, and
+ * sql/<name>--<version>.sql regenerate from the package.json version).
+ */
+export const syncModuleVersions = async (packageDirs, { check = false, usePlan = true } = {}) => {
+    const result = { synced: [], skewed: [], ok: [] };
+    for (const packageDir of packageDirs) {
+        const status = getModuleVersionStatus(packageDir);
+        if (status.inSync) {
+            result.ok.push(status);
+            continue;
+        }
+        if (check) {
+            result.skewed.push(status);
+            log.warn(`✗ ${status.name}: package.json ${status.packageVersion} != control ${status.controlVersion}` +
+                (status.sqlFileExists ? '' : ` (missing sql/${status.name}--${status.packageVersion}.sql)`));
+            continue;
+        }
+        await writePackage({
+            version: status.packageVersion,
+            extension: true,
+            usePlan,
+            packageDir
+        });
+        result.synced.push(status);
+        log.success(`✓ ${status.name}: synced to ${status.packageVersion}`);
+    }
+    return result;
+};

package/index.d.ts

@@ -3,6 +3,7 @@ export * from './rebundle';
 export * from './extensions/extensions';
 export * from './modules/modules';
 export * from './packaging/package';
+export * from './packaging/sync-versions';
 export * from './packaging/transform';
 export * from './resolution/deps';
 export * from './resolution/resolve';

package/index.js

@@ -20,6 +20,7 @@ __exportStar(require("./rebundle"), exports);
 __exportStar(require("./extensions/extensions"), exports);
 __exportStar(require("./modules/modules"), exports);
 __exportStar(require("./packaging/package"), exports);
+__exportStar(require("./packaging/sync-versions"), exports);
 __exportStar(require("./packaging/transform"), exports);
 __exportStar(require("./resolution/deps"), exports);
 __exportStar(require("./resolution/resolve"), exports);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/core",
-  "version": "7.5.1",
+  "version": "7.9.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "PGPM Package and Migration Tools",
   "main": "index.js",
@@ -48,23 +48,23 @@
     "makage": "^0.3.0"
   },
   "dependencies": {
-    "@pgpmjs/ast": "^0.2.2",
-    "@pgpmjs/bundle": "^0.3.2",
-    "@pgpmjs/env": "^2.30.2",
-    "@pgpmjs/logger": "^2.15.2",
-    "@pgpmjs/server-utils": "^3.16.2",
-    "@pgpmjs/slice": "^0.2.0",
-    "@pgpmjs/types": "^2.37.2",
-    "csv-to-pg": "^4.1.2",
+    "@pgpmjs/ast": "^0.5.0",
+    "@pgpmjs/bundle": "^0.6.0",
+    "@pgpmjs/env": "^2.33.0",
+    "@pgpmjs/logger": "^2.18.0",
+    "@pgpmjs/server-utils": "^3.19.0",
+    "@pgpmjs/slice": "^0.5.0",
+    "@pgpmjs/types": "^2.40.0",
+    "csv-to-pg": "^4.4.0",
     "genomic": "^5.6.2",
     "glob": "^13.0.6",
     "parse-package-name": "^1.0.0",
     "pg": "^8.21.0",
-    "pg-cache": "^3.16.2",
-    "pg-env": "^1.19.2",
+    "pg-cache": "^3.19.0",
+    "pg-env": "^1.22.0",
     "pgsql-deparser": "^18.1.1",
     "pgsql-parser": "^18.1.1",
     "yanse": "^0.2.1"
   },
-  "gitHead": "217ead37de876d05763874856347a48a6f356a69"
+  "gitHead": "f36bcdd2b5dada626955e9e05b19c80ca9f92ed5"
 }

package/packaging/package.js

@@ -104,7 +104,7 @@ const writePackage = async ({ version, extension = true, usePlan = true, package
     if (extension) {
         (0, fs_1.writeFileSync)(controlPath, control.replace(/default_version = '[0-9\.]+'/, `default_version = '${version}'`));
         pkg.version = version;
-        (0, fs_1.writeFileSync)(pkgPath, JSON.stringify(pkg, null, 2));
+        (0, fs_1.writeFileSync)(pkgPath, JSON.stringify(pkg, null, 2) + '\n');
         const regex = new RegExp(`${extname}--[0-9.]+.sql`);
         (0, fs_1.writeFileSync)(makePath, Makefile.replace(regex, sqlFileName));
     }

package/packaging/sync-versions.d.ts

@@ -0,0 +1,36 @@
+export interface ModuleVersionStatus {
+    /** Extension name from pgpm.plan */
+    name: string;
+    packageDir: string;
+    /** Version from package.json (source of truth) */
+    packageVersion: string;
+    /** default_version from the .control file */
+    controlVersion: string;
+    /** Whether sql/<name>--<packageVersion>.sql exists */
+    sqlFileExists: boolean;
+    inSync: boolean;
+}
+export interface SyncVersionsOptions {
+    /** Report skew without writing anything */
+    check?: boolean;
+    usePlan?: boolean;
+}
+export interface SyncVersionsResult {
+    /** Modules that were regenerated (empty in check mode) */
+    synced: ModuleVersionStatus[];
+    /** Modules found out of sync (populated in check mode) */
+    skewed: ModuleVersionStatus[];
+    /** Modules already in sync */
+    ok: ModuleVersionStatus[];
+}
+/**
+ * Inspect a module directory and report whether its extension metadata
+ * (.control default_version + sql bundle) matches the package.json version.
+ */
+export declare const getModuleVersionStatus: (packageDir: string) => ModuleVersionStatus;
+/**
+ * Bring a set of module directories back in sync with their package.json
+ * versions by re-running the packaging flow (control file, Makefile, and
+ * sql/<name>--<version>.sql regenerate from the package.json version).
+ */
+export declare const syncModuleVersions: (packageDirs: string[], { check, usePlan }?: SyncVersionsOptions) => Promise<SyncVersionsResult>;

package/packaging/sync-versions.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.syncModuleVersions = exports.getModuleVersionStatus = void 0;
+const logger_1 = require("@pgpmjs/logger");
+const fs_1 = require("fs");
+const path_1 = require("path");
+const files_1 = require("@pgpmjs/ast/files");
+const package_1 = require("./package");
+const log = new logger_1.Logger('sync-versions');
+/**
+ * Inspect a module directory and report whether its extension metadata
+ * (.control default_version + sql bundle) matches the package.json version.
+ */
+const getModuleVersionStatus = (packageDir) => {
+    const { extname, version, controlFile, sqlFile } = (0, files_1.getExtensionInfo)(packageDir);
+    const { version: controlVersion } = (0, files_1.parseControlContent)((0, fs_1.readFileSync)(controlFile, 'utf-8'));
+    const sqlFileExists = (0, fs_1.existsSync)((0, path_1.join)(packageDir, sqlFile));
+    return {
+        name: extname,
+        packageDir,
+        packageVersion: version,
+        controlVersion,
+        sqlFileExists,
+        inSync: version === controlVersion && sqlFileExists
+    };
+};
+exports.getModuleVersionStatus = getModuleVersionStatus;
+/**
+ * Bring a set of module directories back in sync with their package.json
+ * versions by re-running the packaging flow (control file, Makefile, and
+ * sql/<name>--<version>.sql regenerate from the package.json version).
+ */
+const syncModuleVersions = async (packageDirs, { check = false, usePlan = true } = {}) => {
+    const result = { synced: [], skewed: [], ok: [] };
+    for (const packageDir of packageDirs) {
+        const status = (0, exports.getModuleVersionStatus)(packageDir);
+        if (status.inSync) {
+            result.ok.push(status);
+            continue;
+        }
+        if (check) {
+            result.skewed.push(status);
+            log.warn(`✗ ${status.name}: package.json ${status.packageVersion} != control ${status.controlVersion}` +
+                (status.sqlFileExists ? '' : ` (missing sql/${status.name}--${status.packageVersion}.sql)`));
+            continue;
+        }
+        await (0, package_1.writePackage)({
+            version: status.packageVersion,
+            extension: true,
+            usePlan,
+            packageDir
+        });
+        result.synced.push(status);
+        log.success(`✓ ${status.name}: synced to ${status.packageVersion}`);
+    }
+    return result;
+};
+exports.syncModuleVersions = syncModuleVersions;