@pgpmjs/core 7.17.0 → 7.17.2

package/apply/materialize.js

@@ -50,9 +50,11 @@ function makeSubsystemStripper(source, spec, instanceName) {
             `referenced object, or keep the subsystem.`);
     }
     // A change whose deploy consists entirely of subsystem statements (plus
-    // transaction control) is excluded *as a change*: its verify/revert scripts
-    // target dropped objects the classifier can't always see (bare DROPs,
-    // catalog probes), so all three scripts are blanked together.
+    // transaction control) is dropped *as a change* — removed from the plan and
+    // deploy order rather than emitted as an empty script (empty scripts collide
+    // on the deploy ledger's script-hash uniqueness). Its verify/revert scripts
+    // target dropped objects the classifier can't always see (bare DROPs, catalog
+    // probes), which is exactly why the whole change is dropped, not just blanked.
     const excludedChanges = new Set();
     for (const change of source.changes) {
         if (!change.deploy)
@@ -63,7 +65,10 @@ function makeSubsystemStripper(source, spec, instanceName) {
             excludedChanges.add(change.name);
         }
     }
-    const strip = (sql, change) => excludedChanges.has(change) ? (0, slice_1.blankScriptSql)(sql) : (0, slice_1.stripSubsystemSql)(sql, selector).sql;
+    // Surviving changes may still contain stray subsystem statements (a change
+    // that both creates a survivor and touches the excluded subsystem); strip
+    // those in place. Fully-excluded changes are dropped via `excludedChanges`.
+    const strip = (sql) => (0, slice_1.stripSubsystemSql)(sql, selector).sql;
     return { strip, excludedChanges };
 }
 /**
@@ -113,14 +118,20 @@ async function materializeApplyModule(options) {
             assumeSchemasExist: targetSchemas
         }
     });
-    // Excluded changes keep their source identity (an emptied tombstone) —
-    // renaming them into the replacement provider's namespace would be a lie.
+    // Excluded changes are dropped from the artifact entirely (plan + deploy
+    // order + dependency refs); surviving changes get their stray subsystem
+    // statements stripped before the namespace transform.
     const transpiled = (0, bundle_1.transpileBundle)(source, {
+        excludeChange: stripSubsystem
+            ? (name) => stripSubsystem.excludedChanges.has(name)
+            : undefined,
+        // Excluded changes keep their source identity so the plan-prune (which
+        // matches source names) can find them; survivors route normally.
         renameChange: stripSubsystem
             ? (name) => (stripSubsystem.excludedChanges.has(name) ? name : renameChange(name))
             : renameChange,
         transformScript: stripSubsystem
-            ? (sql, ctx) => transformScript(stripSubsystem.strip(sql, ctx.change), ctx)
+            ? (sql, ctx) => transformScript(stripSubsystem.strip(sql), ctx)
             : transformScript,
         renameModule: instanceName,
         provenance: {

package/esm/apply/materialize.js

@@ -3,7 +3,7 @@ import { tmpdir } from 'os';
 import { join, resolve } from 'path';
 import { bundleFromModule, materializeBundle, transpileBundle, verifyBundle } from '@pgpmjs/bundle';
 import { buildSchemaRouter, loadModule, makeSchemaTranspiler } from '@pgpmjs/transform';
-import { blankScriptSql, excludeSubsystem, stripSubsystemSql } from '@pgpmjs/slice';
+import { excludeSubsystem, stripSubsystemSql } from '@pgpmjs/slice';
 import { hasApplySpec, readApplySpec } from './apply-spec';
 import { loadWorkspaceRoutingProfile, resolveEffectiveApplySpec } from './profile';
 import { isReuseSpec, materializeReuseModule, resolveSharedModuleName } from './reuse';
@@ -45,9 +45,11 @@ function makeSubsystemStripper(source, spec, instanceName) {
             `referenced object, or keep the subsystem.`);
     }
     // A change whose deploy consists entirely of subsystem statements (plus
-    // transaction control) is excluded *as a change*: its verify/revert scripts
-    // target dropped objects the classifier can't always see (bare DROPs,
-    // catalog probes), so all three scripts are blanked together.
+    // transaction control) is dropped *as a change* — removed from the plan and
+    // deploy order rather than emitted as an empty script (empty scripts collide
+    // on the deploy ledger's script-hash uniqueness). Its verify/revert scripts
+    // target dropped objects the classifier can't always see (bare DROPs, catalog
+    // probes), which is exactly why the whole change is dropped, not just blanked.
     const excludedChanges = new Set();
     for (const change of source.changes) {
         if (!change.deploy)
@@ -58,7 +60,10 @@ function makeSubsystemStripper(source, spec, instanceName) {
             excludedChanges.add(change.name);
         }
     }
-    const strip = (sql, change) => excludedChanges.has(change) ? blankScriptSql(sql) : stripSubsystemSql(sql, selector).sql;
+    // Surviving changes may still contain stray subsystem statements (a change
+    // that both creates a survivor and touches the excluded subsystem); strip
+    // those in place. Fully-excluded changes are dropped via `excludedChanges`.
+    const strip = (sql) => stripSubsystemSql(sql, selector).sql;
     return { strip, excludedChanges };
 }
 /**
@@ -108,14 +113,20 @@ export async function materializeApplyModule(options) {
             assumeSchemasExist: targetSchemas
         }
     });
-    // Excluded changes keep their source identity (an emptied tombstone) —
-    // renaming them into the replacement provider's namespace would be a lie.
+    // Excluded changes are dropped from the artifact entirely (plan + deploy
+    // order + dependency refs); surviving changes get their stray subsystem
+    // statements stripped before the namespace transform.
     const transpiled = transpileBundle(source, {
+        excludeChange: stripSubsystem
+            ? (name) => stripSubsystem.excludedChanges.has(name)
+            : undefined,
+        // Excluded changes keep their source identity so the plan-prune (which
+        // matches source names) can find them; survivors route normally.
         renameChange: stripSubsystem
             ? (name) => (stripSubsystem.excludedChanges.has(name) ? name : renameChange(name))
             : renameChange,
         transformScript: stripSubsystem
-            ? (sql, ctx) => transformScript(stripSubsystem.strip(sql, ctx.change), ctx)
+            ? (sql, ctx) => transformScript(stripSubsystem.strip(sql), ctx)
             : transformScript,
         renameModule: instanceName,
         provenance: {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgpmjs/core",
-  "version": "7.17.0",
+  "version": "7.17.2",
   "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.4",
-    "@pgpmjs/bundle": "^0.12.2",
-    "@pgpmjs/env": "^2.39.1",
-    "@pgpmjs/logger": "^2.22.0",
-    "@pgpmjs/server-utils": "^3.23.3",
-    "@pgpmjs/slice": "^0.11.0",
-    "@pgpmjs/transform": "^0.12.0",
-    "@pgpmjs/types": "^2.48.0",
-    "csv-to-pg": "^4.8.0",
+    "@pgpmjs/ast": "^0.9.5",
+    "@pgpmjs/bundle": "^0.12.4",
+    "@pgpmjs/env": "^2.39.2",
+    "@pgpmjs/logger": "^2.22.1",
+    "@pgpmjs/server-utils": "^3.23.4",
+    "@pgpmjs/slice": "^0.11.2",
+    "@pgpmjs/transform": "^0.12.2",
+    "@pgpmjs/types": "^2.48.1",
+    "csv-to-pg": "^4.8.1",
     "genomic": "^5.6.2",
     "glob": "^13.0.6",
     "parse-package-name": "^1.0.0",
     "pg": "^8.21.0",
-    "pg-cache": "^3.23.3",
-    "pg-env": "^1.26.0",
+    "pg-cache": "^3.23.4",
+    "pg-env": "^1.26.1",
     "pgsql-deparser": "^18.1.1",
     "pgsql-parser": "^18.1.1",
     "yanse": "^0.2.1"
   },
-  "gitHead": "2832d5632d11eb22e1437df773706ac6a99175fe"
+  "gitHead": "a430897efa1488ec24fc636f0d5023207bba7ba7"
 }