@pgpmjs/export 1.5.2 → 1.8.0

package/esm/export-migrations.js

@@ -41,6 +41,14 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
            and (category is null or category != ALL($2::text[]))
          order by id`, [databaseId, excludeCategories])
         : await pgPool.query(`select * from db_migrate.sql_actions where database_id = $1 order by id`, [databaseId]);
+    // Registry fixtures — meta_registration actions that insert into
+    // metaschema_public.* (e.g. pg_partman partition registration) — FK-reference
+    // the database/schema/table/field identity rows exported into the
+    // meta/service package. Hoist them into that package, after its metaschema
+    // fixtures, so both packages deploy cleanly in app → service order.
+    const isRegistryFixture = (row) => row.category === 'meta_registration' && /\bmetaschema_public\./.test(row.content ?? '');
+    const registryRows = results.rows.filter(isRegistryFixture);
+    const appRows = results.rows.filter((row) => !isRegistryFixture(row));
     const opts = {
         name,
         replacer,
@@ -49,7 +57,7 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
     };
     // Build description for the database extension package
     const dbExtensionDesc = extensionDesc || `${name} database schema for ${databaseName}`;
-    if (results?.rows?.length > 0) {
+    if (appRows.length > 0) {
         // Detect missing modules at workspace level and prompt user
         const dbMissingResult = await detectMissingModules(project, [...DB_REQUIRED_EXTENSIONS], prompter, argv);
         // Create/prepare the module directory
@@ -68,8 +76,8 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
         if (dbMissingResult.shouldInstall) {
             await installMissingModules(dbModuleDir, dbMissingResult.missingModules);
         }
-        writePgpmPlan(results.rows, opts);
-        writePgpmFiles(results.rows, opts);
+        writePgpmPlan(appRows, opts);
+        writePgpmFiles(appRows, opts);
     }
     else {
         console.log('No sql_actions found — skipping database module. Meta/service module will still be exported.');
@@ -86,6 +94,11 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
     const metaDesc = metaExtensionDesc || `${metaExtensionName} service utilities for managing domains, APIs, and services`;
     // Detect missing modules at workspace level and prompt user
     const svcMissingResult = await detectMissingModules(project, [...SERVICE_REQUIRED_EXTENSIONS], prompter, argv);
+    // Hoisted registry fixtures reference the application package's DDL, so the
+    // service package requires it as an extension when any are present.
+    const svcExtensions = registryRows.length > 0 && appRows.length > 0
+        ? [...SERVICE_REQUIRED_EXTENSIONS, name]
+        : [...SERVICE_REQUIRED_EXTENSIONS];
     // Create/prepare the module directory (use serviceOutdir if provided)
     const svcModuleDir = await preparePackage({
         project,
@@ -93,7 +106,7 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
         outdir: svcOutdir,
         name: metaExtensionName,
         description: metaDesc,
-        extensions: [...SERVICE_REQUIRED_EXTENSIONS],
+        extensions: svcExtensions,
         prompter,
         repoName,
         username
@@ -143,6 +156,23 @@ ${META_COMMON_FOOTER}
             tablesWithContent.push(tableName);
         }
     }
+    // Append the hoisted registry fixtures after the metaschema identity
+    // fixtures they FK-reference. Their DDL prerequisites live in the
+    // application package, so those deps become cross-package requires.
+    const lastMetaChange = tablesWithContent.length > 0
+        ? `migrate/${tablesWithContent[tablesWithContent.length - 1]}`
+        : null;
+    for (const row of registryRows) {
+        const crossDeps = (row.deps ?? []).map((dep) => `${name}:${dep}`);
+        metaPackage.push({
+            name: row.name,
+            deploy: row.deploy,
+            content: row.content,
+            revert: row.revert,
+            verify: row.verify,
+            deps: lastMetaChange ? [...crossDeps, lastMetaChange] : crossDeps
+        });
+    }
     opts.replacer = metaReplacer.replacer;
     opts.name = metaExtensionName;
     opts.outdir = svcOutdir;

package/esm/export-utils.js

@@ -1,5 +1,5 @@
 import { getMissingInstallableModules, parseAuthor, PgpmPackage } from '@pgpmjs/core';
-import { mkdirSync, rmSync } from 'fs';
+import { existsSync, mkdirSync, readFileSync, rmSync, writeFileSync } from 'fs';
 import { sync as glob } from 'glob';
 import { toSnakeCase } from 'inflekt';
 import path from 'path';
@@ -260,6 +260,26 @@ export const makeReplacer = ({ schemas, name, schemaPrefix }) => {
     };
     return { replacer, replace };
 };
+/**
+ * Ensures the module's control file `requires` line contains every requested
+ * extension, preserving any extras already listed.
+ */
+const syncControlRequires = (pgpmDir, name, extensions) => {
+    const controlPath = path.join(pgpmDir, `${name}.control`);
+    if (!existsSync(controlPath))
+        return;
+    const content = readFileSync(controlPath, 'utf-8');
+    const match = content.match(/^requires\s*=\s*'([^']*)'\s*$/m);
+    const existing = match ? match[1].split(',').map((s) => s.trim()).filter(Boolean) : [];
+    const merged = [...existing, ...extensions.filter((ext) => !existing.includes(ext))];
+    if (merged.length === existing.length)
+        return;
+    const requiresLine = `requires = '${merged.join(',')}'`;
+    const updated = match
+        ? content.replace(match[0], requiresLine)
+        : `${content.trimEnd()}\n${requiresLine}\n`;
+    writeFileSync(controlPath, updated);
+};
 /**
  * Creates a PGPM package directory or resets the deploy/revert/verify directories if it exists.
  * If the module already exists and a prompter is provided, prompts the user for confirmation.
@@ -317,6 +337,9 @@ export const preparePackage = async ({ project, author, outdir, name, descriptio
             rmSync(path.resolve(pgpmDir, 'deploy'), { recursive: true, force: true });
             rmSync(path.resolve(pgpmDir, 'revert'), { recursive: true, force: true });
             rmSync(path.resolve(pgpmDir, 'verify'), { recursive: true, force: true });
+            // Re-exports over an existing package skip initModule, so sync the
+            // control file's requires with the requested extensions.
+            syncControlRequires(pgpmDir, name, extensions);
         }
     }
     finally {

package/export-migrations.js

@@ -44,6 +44,14 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
            and (category is null or category != ALL($2::text[]))
          order by id`, [databaseId, excludeCategories])
         : await pgPool.query(`select * from db_migrate.sql_actions where database_id = $1 order by id`, [databaseId]);
+    // Registry fixtures — meta_registration actions that insert into
+    // metaschema_public.* (e.g. pg_partman partition registration) — FK-reference
+    // the database/schema/table/field identity rows exported into the
+    // meta/service package. Hoist them into that package, after its metaschema
+    // fixtures, so both packages deploy cleanly in app → service order.
+    const isRegistryFixture = (row) => row.category === 'meta_registration' && /\bmetaschema_public\./.test(row.content ?? '');
+    const registryRows = results.rows.filter(isRegistryFixture);
+    const appRows = results.rows.filter((row) => !isRegistryFixture(row));
     const opts = {
         name,
         replacer,
@@ -52,7 +60,7 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
     };
     // Build description for the database extension package
     const dbExtensionDesc = extensionDesc || `${name} database schema for ${databaseName}`;
-    if (results?.rows?.length > 0) {
+    if (appRows.length > 0) {
         // Detect missing modules at workspace level and prompt user
         const dbMissingResult = await (0, export_utils_1.detectMissingModules)(project, [...export_utils_1.DB_REQUIRED_EXTENSIONS], prompter, argv);
         // Create/prepare the module directory
@@ -71,8 +79,8 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
         if (dbMissingResult.shouldInstall) {
             await (0, export_utils_1.installMissingModules)(dbModuleDir, dbMissingResult.missingModules);
         }
-        (0, core_1.writePgpmPlan)(results.rows, opts);
-        (0, core_1.writePgpmFiles)(results.rows, opts);
+        (0, core_1.writePgpmPlan)(appRows, opts);
+        (0, core_1.writePgpmFiles)(appRows, opts);
     }
     else {
         console.log('No sql_actions found — skipping database module. Meta/service module will still be exported.');
@@ -89,6 +97,11 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
     const metaDesc = metaExtensionDesc || `${metaExtensionName} service utilities for managing domains, APIs, and services`;
     // Detect missing modules at workspace level and prompt user
     const svcMissingResult = await (0, export_utils_1.detectMissingModules)(project, [...export_utils_1.SERVICE_REQUIRED_EXTENSIONS], prompter, argv);
+    // Hoisted registry fixtures reference the application package's DDL, so the
+    // service package requires it as an extension when any are present.
+    const svcExtensions = registryRows.length > 0 && appRows.length > 0
+        ? [...export_utils_1.SERVICE_REQUIRED_EXTENSIONS, name]
+        : [...export_utils_1.SERVICE_REQUIRED_EXTENSIONS];
     // Create/prepare the module directory (use serviceOutdir if provided)
     const svcModuleDir = await (0, export_utils_1.preparePackage)({
         project,
@@ -96,7 +109,7 @@ const exportMigrationsToDisk = async ({ project, options, database, databaseId,
         outdir: svcOutdir,
         name: metaExtensionName,
         description: metaDesc,
-        extensions: [...export_utils_1.SERVICE_REQUIRED_EXTENSIONS],
+        extensions: svcExtensions,
         prompter,
         repoName,
         username
@@ -146,6 +159,23 @@ ${export_utils_1.META_COMMON_FOOTER}
             tablesWithContent.push(tableName);
         }
     }
+    // Append the hoisted registry fixtures after the metaschema identity
+    // fixtures they FK-reference. Their DDL prerequisites live in the
+    // application package, so those deps become cross-package requires.
+    const lastMetaChange = tablesWithContent.length > 0
+        ? `migrate/${tablesWithContent[tablesWithContent.length - 1]}`
+        : null;
+    for (const row of registryRows) {
+        const crossDeps = (row.deps ?? []).map((dep) => `${name}:${dep}`);
+        metaPackage.push({
+            name: row.name,
+            deploy: row.deploy,
+            content: row.content,
+            revert: row.revert,
+            verify: row.verify,
+            deps: lastMetaChange ? [...crossDeps, lastMetaChange] : crossDeps
+        });
+    }
     opts.replacer = metaReplacer.replacer;
     opts.name = metaExtensionName;
     opts.outdir = svcOutdir;

package/export-utils.js

@@ -273,6 +273,26 @@ const makeReplacer = ({ schemas, name, schemaPrefix }) => {
     return { replacer, replace };
 };
 exports.makeReplacer = makeReplacer;
+/**
+ * Ensures the module's control file `requires` line contains every requested
+ * extension, preserving any extras already listed.
+ */
+const syncControlRequires = (pgpmDir, name, extensions) => {
+    const controlPath = path_1.default.join(pgpmDir, `${name}.control`);
+    if (!(0, fs_1.existsSync)(controlPath))
+        return;
+    const content = (0, fs_1.readFileSync)(controlPath, 'utf-8');
+    const match = content.match(/^requires\s*=\s*'([^']*)'\s*$/m);
+    const existing = match ? match[1].split(',').map((s) => s.trim()).filter(Boolean) : [];
+    const merged = [...existing, ...extensions.filter((ext) => !existing.includes(ext))];
+    if (merged.length === existing.length)
+        return;
+    const requiresLine = `requires = '${merged.join(',')}'`;
+    const updated = match
+        ? content.replace(match[0], requiresLine)
+        : `${content.trimEnd()}\n${requiresLine}\n`;
+    (0, fs_1.writeFileSync)(controlPath, updated);
+};
 /**
  * Creates a PGPM package directory or resets the deploy/revert/verify directories if it exists.
  * If the module already exists and a prompter is provided, prompts the user for confirmation.
@@ -330,6 +350,9 @@ const preparePackage = async ({ project, author, outdir, name, description, exte
             (0, fs_1.rmSync)(path_1.default.resolve(pgpmDir, 'deploy'), { recursive: true, force: true });
             (0, fs_1.rmSync)(path_1.default.resolve(pgpmDir, 'revert'), { recursive: true, force: true });
             (0, fs_1.rmSync)(path_1.default.resolve(pgpmDir, 'verify'), { recursive: true, force: true });
+            // Re-exports over an existing package skip initModule, so sync the
+            // control file's requires with the requested extensions.
+            syncControlRequires(pgpmDir, name, extensions);
         }
     }
     finally {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/export",
-  "version": "1.5.2",
+  "version": "1.8.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "PGPM export tools for SQL and GraphQL database migration extraction",
   "main": "index.js",
@@ -41,20 +41,20 @@
     "@pgsql/types": "^18.0.0",
     "@types/pg": "^8.20.0",
     "makage": "^0.3.0",
-    "pgsql-test": "^5.1.4"
+    "pgsql-test": "^5.4.0"
   },
   "dependencies": {
-    "@constructive-io/query-builder": "^3.1.2",
-    "@pgpmjs/core": "^7.5.1",
-    "@pgpmjs/migrate-client": "^1.2.2",
-    "@pgpmjs/types": "^2.37.2",
-    "csv-to-pg": "^4.1.2",
+    "@constructive-io/query-builder": "^3.4.0",
+    "@pgpmjs/core": "^7.8.0",
+    "@pgpmjs/migrate-client": "^1.5.0",
+    "@pgpmjs/types": "^2.40.0",
+    "csv-to-pg": "^4.4.0",
     "glob": "^13.0.6",
     "inflekt": "^0.7.1",
     "inquirerer": "^4.9.1",
     "pg": "^8.21.0",
-    "pg-cache": "^3.16.2",
-    "pg-env": "^1.19.2"
+    "pg-cache": "^3.19.0",
+    "pg-env": "^1.22.0"
   },
-  "gitHead": "217ead37de876d05763874856347a48a6f356a69"
+  "gitHead": "73f55ad24d9a92e7ef1e268526b31bfb7bb12b28"
 }