@pgpmjs/export 1.16.10 → 1.16.12

package/catalog-projection.d.ts

@@ -0,0 +1,13 @@
+/**
+ * Catalog plane projection: catalog_private.apis is trigger-derived from
+ * routing_public.apis by catalog_private.tg_apis_catalog_sync(). During
+ * migration replay the sync trigger is skipped (session_replication_role),
+ * and the catalog tables cannot be queried through the meta API (bare-name
+ * collisions with routing_public) — so the projection is materialized at
+ * export time, mirroring the trigger mapping 1:1. resolve_route() needs
+ * these rows to build resolved_config for api targets.
+ *
+ * Both the SQL and GraphQL export flows run this projection so their output
+ * stays byte-identical (cross-flow parity).
+ */
+export declare const projectCatalogApis: (apisRows: Record<string, unknown>[]) => Promise<string | undefined>;

package/catalog-projection.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.projectCatalogApis = void 0;
+const csv_to_pg_1 = require("csv-to-pg");
+/**
+ * Catalog plane projection: catalog_private.apis is trigger-derived from
+ * routing_public.apis by catalog_private.tg_apis_catalog_sync(). During
+ * migration replay the sync trigger is skipped (session_replication_role),
+ * and the catalog tables cannot be queried through the meta API (bare-name
+ * collisions with routing_public) — so the projection is materialized at
+ * export time, mirroring the trigger mapping 1:1. resolve_route() needs
+ * these rows to build resolved_config for api targets.
+ *
+ * Both the SQL and GraphQL export flows run this projection so their output
+ * stays byte-identical (cross-flow parity).
+ */
+const projectCatalogApis = async (apisRows) => {
+    if (!apisRows.length)
+        return undefined;
+    const projected = apisRows.map((r) => ({
+        id: r.id,
+        owner_scope: 'database',
+        owner_key: r.database_id,
+        is_visible: r.is_published ?? false,
+        database_id: r.database_id,
+        name: r.name,
+        dbname: r.dbname,
+        role_name: r.role_name,
+        anon_role: r.anon_role,
+        config: r.config ?? null
+    }));
+    const parser = new csv_to_pg_1.Parser({
+        schema: 'catalog_private',
+        table: 'apis',
+        fields: {
+            id: 'uuid',
+            owner_scope: 'text',
+            owner_key: 'uuid',
+            is_visible: 'boolean',
+            database_id: 'uuid',
+            name: 'text',
+            dbname: 'text',
+            role_name: 'text',
+            anon_role: 'text',
+            config: 'jsonb'
+        }
+    });
+    const parsed = await parser.parse(projected);
+    return parsed || undefined;
+};
+exports.projectCatalogApis = projectCatalogApis;

package/esm/catalog-projection.js

@@ -0,0 +1,47 @@
+import { Parser } from 'csv-to-pg';
+/**
+ * Catalog plane projection: catalog_private.apis is trigger-derived from
+ * routing_public.apis by catalog_private.tg_apis_catalog_sync(). During
+ * migration replay the sync trigger is skipped (session_replication_role),
+ * and the catalog tables cannot be queried through the meta API (bare-name
+ * collisions with routing_public) — so the projection is materialized at
+ * export time, mirroring the trigger mapping 1:1. resolve_route() needs
+ * these rows to build resolved_config for api targets.
+ *
+ * Both the SQL and GraphQL export flows run this projection so their output
+ * stays byte-identical (cross-flow parity).
+ */
+export const projectCatalogApis = async (apisRows) => {
+    if (!apisRows.length)
+        return undefined;
+    const projected = apisRows.map((r) => ({
+        id: r.id,
+        owner_scope: 'database',
+        owner_key: r.database_id,
+        is_visible: r.is_published ?? false,
+        database_id: r.database_id,
+        name: r.name,
+        dbname: r.dbname,
+        role_name: r.role_name,
+        anon_role: r.anon_role,
+        config: r.config ?? null
+    }));
+    const parser = new Parser({
+        schema: 'catalog_private',
+        table: 'apis',
+        fields: {
+            id: 'uuid',
+            owner_scope: 'text',
+            owner_key: 'uuid',
+            is_visible: 'boolean',
+            database_id: 'uuid',
+            name: 'text',
+            dbname: 'text',
+            role_name: 'text',
+            anon_role: 'text',
+            config: 'jsonb'
+        }
+    });
+    const parsed = await parser.parse(projected);
+    return parsed || undefined;
+};

package/esm/export-graphql-meta.js

@@ -8,6 +8,7 @@
  */
 import { Parser } from 'csv-to-pg';
 import { toSnakeCase } from 'inflekt';
+import { projectCatalogApis } from './catalog-projection';
 import { getTimestampDefaultColumnsForTable, META_TABLE_CONFIG, META_TABLE_ORDER } from './export-utils';
 import { buildFieldsFragment, getGraphQLQueryName, getGraphQLTypeName, graphqlRowToPostgresRow, intervalToPostgres, mapGraphQLTypeToFieldType } from './graphql-naming';
 import { lookupByGqlType } from './type-map';
@@ -100,6 +101,18 @@ const buildDynamicFieldsFromGraphQL = async (client, tableConfig) => {
  */
 export const exportGraphQLMeta = async ({ client, database_id }) => {
     const sql = {};
+    // Raw rows per key (post GraphQL→Postgres conversion), kept for derived
+    // projections (see catalog plane derivation below).
+    const rawRows = {};
+    // Binding tables (hostname_bindings, route_bindings) carry no database_id;
+    // tenant ownership flows through domain_id → routing_public.domains. Fetch
+    // the tenant's domain ids once so those keys can be filtered by
+    // domainId IN (...).
+    let domainIds = [];
+    if (META_TABLE_ORDER.some((k) => META_TABLE_CONFIG[k]?.filterViaDomainIds)) {
+        const domainRows = await client.fetchAllNodes(getGraphQLQueryName('domains'), 'id', { databaseId: database_id });
+        domainIds = domainRows.map((r) => r.id);
+    }
     const queryAndParse = async (key) => {
         const tableConfig = META_TABLE_CONFIG[key];
         if (!tableConfig)
@@ -107,8 +120,7 @@ export const exportGraphQLMeta = async ({ client, database_id }) => {
         // Schema-qualified manifest keys (e.g. catalog_private.apis)
         // mark tables whose name collides with a table in another plane. GraphQL
         // type/query names are derived from the bare table name, so these cannot
-        // be addressed unambiguously through the meta API — only the SQL flow
-        // exports them.
+        // be addressed unambiguously through the meta API in a mixed build.
         if (key.includes('.'))
             return;
         // Build fields dynamically: either from hardcoded config or via introspection
@@ -121,7 +133,9 @@ export const exportGraphQLMeta = async ({ client, database_id }) => {
         // The 'database' table is fetched by id, not by database_id
         const condition = key === 'database'
             ? { id: database_id }
-            : { databaseId: database_id };
+            : tableConfig.filterViaDomainIds
+                ? { domainId: domainIds }
+                : { databaseId: database_id };
         try {
             const rows = await client.fetchAllNodes(graphqlQueryName, graphqlFieldsFragment, condition);
             if (rows.length > 0) {
@@ -170,6 +184,7 @@ export const exportGraphQLMeta = async ({ client, database_id }) => {
                 }
                 if (Object.keys(dynamicFields).length === 0)
                     return;
+                rawRows[key] = pgRows;
                 // Omit columnDefaults columns from row data so the Parser never sees them.
                 // configFields already excludes them (via buildDynamicFieldsFromGraphQL),
                 // so dynamicFields won't contain them either — but the pgRow data still does.
@@ -220,5 +235,18 @@ export const exportGraphQLMeta = async ({ client, database_id }) => {
     for (const keys of keysBySchema.values()) {
         await Promise.all(keys.map(key => queryAndParse(key)));
     }
+    // Catalog plane projection: catalog_private.apis is trigger-derived from
+    // routing_public.apis (catalog_private.tg_apis_catalog_sync). The sync
+    // trigger is skipped during migration replay (session_replication_role),
+    // and the catalog tables can't be queried through the meta API (bare-name
+    // collisions with routing_public) — so the projection is materialized here.
+    // Shared with the SQL flow (see catalog-projection.ts) for cross-flow parity.
+    const apisRows = rawRows['apis'];
+    if (sql['apis'] && apisRows?.length) {
+        const parsed = await projectCatalogApis(apisRows);
+        if (parsed) {
+            sql['catalog_private.apis'] = parsed;
+        }
+    }
     return sql;
 };

package/esm/export-meta.js

@@ -1,5 +1,6 @@
 import { Parser } from 'csv-to-pg';
 import { getPgPool } from 'pg-cache';
+import { projectCatalogApis } from './catalog-projection';
 import { getTableColumnsWithDefaults, isTimestampDefaultColumn, mapPgTypeToFieldType, META_TABLE_CONFIG, META_TABLE_ORDER } from './export-utils';
 /**
  * Build dynamic fields config from the database via information_schema.
@@ -60,6 +61,9 @@ export const exportMeta = async ({ opts, dbname, database_id }) => {
         database: dbname
     });
     const sql = {};
+    // Raw rows per key (post column-default stripping), kept for derived
+    // projections (see catalog plane projection below).
+    const rawRows = {};
     // Cache for dynamically built parsers and their field configs
     const parsers = {};
     const parserFields = {};
@@ -124,6 +128,7 @@ export const exportMeta = async ({ opts, dbname, database_id }) => {
                         }
                     }
                 }
+                rawRows[key] = result.rows;
                 const parsed = await parser.parse(result.rows);
                 if (parsed) {
                     sql[key] = parsed;
@@ -143,8 +148,26 @@ export const exportMeta = async ({ opts, dbname, database_id }) => {
     // itself, which is keyed by id.
     for (const key of META_TABLE_ORDER) {
         const tableConfig = META_TABLE_CONFIG[key];
-        const filterColumn = key === 'database' ? 'id' : 'database_id';
-        await queryAndParse(key, `SELECT * FROM ${tableConfig.schema}.${tableConfig.table} WHERE ${filterColumn} = $1 ORDER BY id`);
+        // Binding tables (hostname_bindings, route_bindings) carry no database_id;
+        // tenant ownership flows through domain_id → routing_public.domains.
+        const filterSql = key === 'database'
+            ? 'id = $1'
+            : tableConfig.filterViaDomainIds
+                ? 'domain_id IN (SELECT id FROM routing_public.domains WHERE database_id = $1)'
+                : 'database_id = $1';
+        await queryAndParse(key, `SELECT * FROM ${tableConfig.schema}.${tableConfig.table} WHERE ${filterSql} ORDER BY id`);
+    }
+    // Catalog plane projection: catalog_private.apis is trigger-derived from
+    // routing_public.apis (catalog_private.tg_apis_catalog_sync). The sync
+    // trigger is skipped during migration replay (session_replication_role),
+    // so the projection is materialized here. Shared with the GraphQL flow
+    // (see catalog-projection.ts) for cross-flow parity.
+    const apisRows = rawRows['apis'];
+    if (sql['apis'] && apisRows?.length) {
+        const parsed = await projectCatalogApis(apisRows);
+        if (parsed) {
+            sql['catalog_private.apis'] = parsed;
+        }
     }
     return sql;
 };

package/esm/export-utils.js

@@ -143,6 +143,12 @@ SET session_replication_role TO DEFAULT;
  * values must come from DDL defaults at deploy time.
  */
 export const META_TABLE_OVERRIDES = {
+    hostname_bindings: {
+        filterViaDomainIds: true
+    },
+    route_bindings: {
+        filterViaDomainIds: true
+    },
     sites: {
         typeOverrides: {
             og_image: 'image',

package/esm/graphql-client.js

@@ -121,6 +121,8 @@ export class GraphQLClient {
         if (condition && Object.keys(condition).length > 0) {
             const filterParts = Object.entries(condition)
                 .map(([k, v]) => {
+                if (Array.isArray(v))
+                    return `${k}: { in: [${v.map((item) => `"${item}"`).join(', ')}] }`;
                 if (typeof v === 'string')
                     return `${k}: { equalTo: "${v}" }`;
                 if (typeof v === 'boolean')

package/esm/meta-export-tables.json

@@ -591,6 +591,16 @@
             "schema": "routing_public",
             "table": "routes"
         },
+        {
+            "key": "hostname_bindings",
+            "schema": "routing_public",
+            "table": "hostname_bindings"
+        },
+        {
+            "key": "route_bindings",
+            "schema": "routing_public",
+            "table": "route_bindings"
+        },
         {
             "key": "site_app_links",
             "schema": "routing_public",
@@ -671,11 +681,6 @@
             "schema": "catalog_private",
             "table": "domains"
         },
-        {
-            "key": "functions",
-            "schema": "catalog_private",
-            "table": "functions"
-        },
         {
             "key": "namespaces",
             "schema": "catalog_private",
@@ -957,6 +962,12 @@
             "created_at",
             "updated_at"
         ],
+        "routing_public.hostname_bindings": [
+            "updated_at"
+        ],
+        "routing_public.route_bindings": [
+            "updated_at"
+        ],
         "routing_public.site_app_links": [
             "created_at",
             "updated_at"

package/export-graphql-meta.js

@@ -11,6 +11,7 @@ exports.exportGraphQLMeta = void 0;
  */
 const csv_to_pg_1 = require("csv-to-pg");
 const inflekt_1 = require("inflekt");
+const catalog_projection_1 = require("./catalog-projection");
 const export_utils_1 = require("./export-utils");
 const graphql_naming_1 = require("./graphql-naming");
 const type_map_1 = require("./type-map");
@@ -103,6 +104,18 @@ const buildDynamicFieldsFromGraphQL = async (client, tableConfig) => {
  */
 const exportGraphQLMeta = async ({ client, database_id }) => {
     const sql = {};
+    // Raw rows per key (post GraphQL→Postgres conversion), kept for derived
+    // projections (see catalog plane derivation below).
+    const rawRows = {};
+    // Binding tables (hostname_bindings, route_bindings) carry no database_id;
+    // tenant ownership flows through domain_id → routing_public.domains. Fetch
+    // the tenant's domain ids once so those keys can be filtered by
+    // domainId IN (...).
+    let domainIds = [];
+    if (export_utils_1.META_TABLE_ORDER.some((k) => export_utils_1.META_TABLE_CONFIG[k]?.filterViaDomainIds)) {
+        const domainRows = await client.fetchAllNodes((0, graphql_naming_1.getGraphQLQueryName)('domains'), 'id', { databaseId: database_id });
+        domainIds = domainRows.map((r) => r.id);
+    }
     const queryAndParse = async (key) => {
         const tableConfig = export_utils_1.META_TABLE_CONFIG[key];
         if (!tableConfig)
@@ -110,8 +123,7 @@ const exportGraphQLMeta = async ({ client, database_id }) => {
         // Schema-qualified manifest keys (e.g. catalog_private.apis)
         // mark tables whose name collides with a table in another plane. GraphQL
         // type/query names are derived from the bare table name, so these cannot
-        // be addressed unambiguously through the meta API — only the SQL flow
-        // exports them.
+        // be addressed unambiguously through the meta API in a mixed build.
         if (key.includes('.'))
             return;
         // Build fields dynamically: either from hardcoded config or via introspection
@@ -124,7 +136,9 @@ const exportGraphQLMeta = async ({ client, database_id }) => {
         // The 'database' table is fetched by id, not by database_id
         const condition = key === 'database'
             ? { id: database_id }
-            : { databaseId: database_id };
+            : tableConfig.filterViaDomainIds
+                ? { domainId: domainIds }
+                : { databaseId: database_id };
         try {
             const rows = await client.fetchAllNodes(graphqlQueryName, graphqlFieldsFragment, condition);
             if (rows.length > 0) {
@@ -173,6 +187,7 @@ const exportGraphQLMeta = async ({ client, database_id }) => {
                 }
                 if (Object.keys(dynamicFields).length === 0)
                     return;
+                rawRows[key] = pgRows;
                 // Omit columnDefaults columns from row data so the Parser never sees them.
                 // configFields already excludes them (via buildDynamicFieldsFromGraphQL),
                 // so dynamicFields won't contain them either — but the pgRow data still does.
@@ -223,6 +238,19 @@ const exportGraphQLMeta = async ({ client, database_id }) => {
     for (const keys of keysBySchema.values()) {
         await Promise.all(keys.map(key => queryAndParse(key)));
     }
+    // Catalog plane projection: catalog_private.apis is trigger-derived from
+    // routing_public.apis (catalog_private.tg_apis_catalog_sync). The sync
+    // trigger is skipped during migration replay (session_replication_role),
+    // and the catalog tables can't be queried through the meta API (bare-name
+    // collisions with routing_public) — so the projection is materialized here.
+    // Shared with the SQL flow (see catalog-projection.ts) for cross-flow parity.
+    const apisRows = rawRows['apis'];
+    if (sql['apis'] && apisRows?.length) {
+        const parsed = await (0, catalog_projection_1.projectCatalogApis)(apisRows);
+        if (parsed) {
+            sql['catalog_private.apis'] = parsed;
+        }
+    }
     return sql;
 };
 exports.exportGraphQLMeta = exportGraphQLMeta;

package/export-meta.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.exportMeta = void 0;
 const csv_to_pg_1 = require("csv-to-pg");
 const pg_cache_1 = require("pg-cache");
+const catalog_projection_1 = require("./catalog-projection");
 const export_utils_1 = require("./export-utils");
 /**
  * Build dynamic fields config from the database via information_schema.
@@ -63,6 +64,9 @@ const exportMeta = async ({ opts, dbname, database_id }) => {
         database: dbname
     });
     const sql = {};
+    // Raw rows per key (post column-default stripping), kept for derived
+    // projections (see catalog plane projection below).
+    const rawRows = {};
     // Cache for dynamically built parsers and their field configs
     const parsers = {};
     const parserFields = {};
@@ -127,6 +131,7 @@ const exportMeta = async ({ opts, dbname, database_id }) => {
                         }
                     }
                 }
+                rawRows[key] = result.rows;
                 const parsed = await parser.parse(result.rows);
                 if (parsed) {
                     sql[key] = parsed;
@@ -146,8 +151,26 @@ const exportMeta = async ({ opts, dbname, database_id }) => {
     // itself, which is keyed by id.
     for (const key of export_utils_1.META_TABLE_ORDER) {
         const tableConfig = export_utils_1.META_TABLE_CONFIG[key];
-        const filterColumn = key === 'database' ? 'id' : 'database_id';
-        await queryAndParse(key, `SELECT * FROM ${tableConfig.schema}.${tableConfig.table} WHERE ${filterColumn} = $1 ORDER BY id`);
+        // Binding tables (hostname_bindings, route_bindings) carry no database_id;
+        // tenant ownership flows through domain_id → routing_public.domains.
+        const filterSql = key === 'database'
+            ? 'id = $1'
+            : tableConfig.filterViaDomainIds
+                ? 'domain_id IN (SELECT id FROM routing_public.domains WHERE database_id = $1)'
+                : 'database_id = $1';
+        await queryAndParse(key, `SELECT * FROM ${tableConfig.schema}.${tableConfig.table} WHERE ${filterSql} ORDER BY id`);
+    }
+    // Catalog plane projection: catalog_private.apis is trigger-derived from
+    // routing_public.apis (catalog_private.tg_apis_catalog_sync). The sync
+    // trigger is skipped during migration replay (session_replication_role),
+    // so the projection is materialized here. Shared with the GraphQL flow
+    // (see catalog-projection.ts) for cross-flow parity.
+    const apisRows = rawRows['apis'];
+    if (sql['apis'] && apisRows?.length) {
+        const parsed = await (0, catalog_projection_1.projectCatalogApis)(apisRows);
+        if (parsed) {
+            sql['catalog_private.apis'] = parsed;
+        }
     }
     return sql;
 };

package/export-utils.d.ts

@@ -62,6 +62,13 @@ export interface TableConfig {
     conflictDoNothing?: boolean;
     typeOverrides?: Record<string, FieldType>;
     gqlTypeName?: string;
+    /**
+     * Table has no database_id column; rows belong to a tenant through their
+     * domain_id FK (e.g. hostname_bindings, route_bindings). The export filters
+     * them by `domainId in (<tenant's domain ids>)` — the tenant's domain ids
+     * are pre-fetched once per export run.
+     */
+    filterViaDomainIds?: boolean;
     /** Columns whose values are environment-specific and should be excluded from the
      *  exported INSERT so that the column's DDL DEFAULT applies at deploy time.
      *  Key = column name, Value = the SQL expression the column defaults to (for documentation).

package/export-utils.js

@@ -153,6 +153,12 @@ exports.buildMetaRevertScript = buildMetaRevertScript;
  * values must come from DDL defaults at deploy time.
  */
 exports.META_TABLE_OVERRIDES = {
+    hostname_bindings: {
+        filterViaDomainIds: true
+    },
+    route_bindings: {
+        filterViaDomainIds: true
+    },
     sites: {
         typeOverrides: {
             og_image: 'image',

package/graphql-client.js

@@ -124,6 +124,8 @@ class GraphQLClient {
         if (condition && Object.keys(condition).length > 0) {
             const filterParts = Object.entries(condition)
                 .map(([k, v]) => {
+                if (Array.isArray(v))
+                    return `${k}: { in: [${v.map((item) => `"${item}"`).join(', ')}] }`;
                 if (typeof v === 'string')
                     return `${k}: { equalTo: "${v}" }`;
                 if (typeof v === 'boolean')

package/meta-export-tables.json

@@ -591,6 +591,16 @@
             "schema": "routing_public",
             "table": "routes"
         },
+        {
+            "key": "hostname_bindings",
+            "schema": "routing_public",
+            "table": "hostname_bindings"
+        },
+        {
+            "key": "route_bindings",
+            "schema": "routing_public",
+            "table": "route_bindings"
+        },
         {
             "key": "site_app_links",
             "schema": "routing_public",
@@ -671,11 +681,6 @@
             "schema": "catalog_private",
             "table": "domains"
         },
-        {
-            "key": "functions",
-            "schema": "catalog_private",
-            "table": "functions"
-        },
         {
             "key": "namespaces",
             "schema": "catalog_private",
@@ -957,6 +962,12 @@
             "created_at",
             "updated_at"
         ],
+        "routing_public.hostname_bindings": [
+            "updated_at"
+        ],
+        "routing_public.route_bindings": [
+            "updated_at"
+        ],
         "routing_public.site_app_links": [
             "created_at",
             "updated_at"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/export",
-  "version": "1.16.10",
+  "version": "1.16.12",
   "author": "Constructive <developers@constructive.io>",
   "description": "PGPM export tools for SQL and GraphQL database migration extraction",
   "main": "index.js",
@@ -41,22 +41,22 @@
     "@pgsql/types": "^18.0.0",
     "@types/pg": "^8.20.4",
     "makage": "^0.3.0",
-    "pgsql-test": "^5.10.7"
+    "pgsql-test": "^5.10.8"
   },
   "dependencies": {
     "@constructive-io/query-builder": "^3.10.4",
-    "@pgpmjs/core": "^7.25.4",
-    "@pgpmjs/migrate-client": "^1.11.10",
+    "@pgpmjs/core": "^7.25.5",
+    "@pgpmjs/migrate-client": "^1.11.11",
     "@pgpmjs/naming-spec": "^0.3.0",
-    "@pgpmjs/transform": "^0.23.4",
-    "@pgpmjs/types": "^2.50.3",
+    "@pgpmjs/transform": "^0.23.5",
+    "@pgpmjs/types": "^2.50.4",
     "csv-to-pg": "^4.10.4",
     "glob": "^13.0.6",
     "inflekt": "^0.8.1",
     "inquirerer": "^4.9.3",
     "pg": "^8.21.0",
-    "pg-cache": "^3.25.4",
-    "pg-env": "^1.29.1"
+    "pg-cache": "^3.25.5",
+    "pg-env": "^1.29.2"
   },
-  "gitHead": "d0d796b7eb0d16c8c19405a49c0ca62ce3df117b"
+  "gitHead": "eacbe10ce544848c93a4c17fc8a8474d1a788a18"
 }