@supacloud/cli 0.12.3 → 0.12.4

package/dist/index.js

@@ -6525,22 +6525,26 @@ function migrationRows(data) {
   const rows = Array.isArray(data) ? data : data?.rows || [];
   return Array.isArray(rows) ? rows.filter((row) => Boolean(row && typeof row === "object")) : [];
 }
-function baselineMigrationKey(version, name) {
+function migrationIdentityKey(version, name) {
   return `${version}\x00${name}`;
 }
-function baselineMigrationKeys(data) {
+function nameBoundMigrationMarkerKeys(data) {
   const keys = new Set;
   for (const row of migrationRows(data)) {
     if (row.version == null || row.name == null || !Array.isArray(row.statements))
       continue;
-    if (row.statements.length !== 1 || row.statements[0] !== `baseline:${String(row.name)}`)
+    if (row.statements.length !== 1)
       continue;
-    keys.add(baselineMigrationKey(String(row.version), String(row.name)));
+    const name = String(row.name);
+    const marker = row.statements[0];
+    if (marker !== `baseline:${name}` && marker !== `direct-apply:${name}`)
+      continue;
+    keys.add(migrationIdentityKey(String(row.version), String(row.name)));
   }
   return keys;
 }
 function historicalChecksumMarkerKeys(data, migrationFiles) {
-  const filesByKey = new Map(migrationFiles.map((migration) => [baselineMigrationKey(migration.version, migration.name), migration]));
+  const filesByKey = new Map(migrationFiles.map((migration) => [migrationIdentityKey(migration.version, migration.name), migration]));
   const keys = new Set;
   for (const row of migrationRows(data)) {
     if (row.version == null || row.name == null || !Array.isArray(row.statements) || row.statements.length !== 1)
@@ -6548,7 +6552,7 @@ function historicalChecksumMarkerKeys(data, migrationFiles) {
     const marker = row.statements[0];
     if (typeof marker !== "string" || !/^sha256:[0-9a-f]{64}$/.test(marker))
       continue;
-    const key = baselineMigrationKey(String(row.version), String(row.name));
+    const key = migrationIdentityKey(String(row.version), String(row.name));
     const migration = filesByKey.get(key);
     if (!migration)
       continue;
@@ -6809,11 +6813,11 @@ Actions: ${allActions.join(", ")}${readOnly ? " (read-only mode)" : ""}`, {
         }
         const applied = [];
         const skipped = [];
-        const baselineKeys = baselineMigrationKeys(migrationsResult.data);
+        const nameBoundMarkerKeys = nameBoundMigrationMarkerKeys(migrationsResult.data);
         const historicalChecksumKeys = historicalChecksumMarkerKeys(migrationsResult.data, migrationFiles);
         for (const { file, name, version, sql } of migrationFiles) {
-          const migrationKey = baselineMigrationKey(version, name);
-          if (baselineKeys.has(migrationKey) || historicalChecksumKeys.has(migrationKey)) {
+          const migrationKey = migrationIdentityKey(version, name);
+          if (nameBoundMarkerKeys.has(migrationKey) || historicalChecksumKeys.has(migrationKey)) {
             skipped.push(file);
             continue;
           }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@supacloud/cli",
-  "version": "0.12.3",
+  "version": "0.12.4",
   "description": "Project-scoped CLI for SupaCloud users",
   "type": "module",
   "main": "./dist/index.js",