@supacloud/cli 0.12.2 → 0.12.4

package/dist/index.js

@@ -6462,6 +6462,16 @@ var MAX_MIGRATION_VERSION = 9223372036854775807n;
 var FALLBACK_MIGRATION_VERSION_BASE = 8000000000000000000n;
 var FALLBACK_MIGRATION_VERSION_RANGE = 1000000000000000000n;
 var FALLBACK_MIGRATION_VERSION_LIMIT = FALLBACK_MIGRATION_VERSION_BASE + FALLBACK_MIGRATION_VERSION_RANGE;
+function readMigrationFile(dir, file) {
+  const rawBytes = readFileSync2(join(dir, file));
+  return {
+    file,
+    name: basename(file, ".sql"),
+    version: migrationVersionFromFilename(file),
+    sql: Buffer.from(rawBytes).toString("utf8"),
+    rawBytes
+  };
+}
 function migrationVersionFromFilename(file) {
   const match = basename(file).match(/^(\d{8,20})[_-]/);
   if (match) {
@@ -6515,17 +6525,40 @@ 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;
+    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) => [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)
+      continue;
+    const marker = row.statements[0];
+    if (typeof marker !== "string" || !/^sha256:[0-9a-f]{64}$/.test(marker))
+      continue;
+    const key = migrationIdentityKey(String(row.version), String(row.name));
+    const migration = filesByKey.get(key);
+    if (!migration)
       continue;
-    keys.add(baselineMigrationKey(String(row.version), String(row.name)));
+    const checksum = createHash("sha256").update(migration.rawBytes).digest("hex");
+    if (marker === `sha256:${checksum}`)
+      keys.add(key);
   }
   return keys;
 }
@@ -6747,11 +6780,7 @@ Actions: ${allActions.join(", ")}${readOnly ? " (read-only mode)" : ""}`, {
           text = `No .sql migration files found in ${dir}`;
           break;
         }
-        const migrationFiles = sortMigrationFiles(files.map((file) => ({
-          file,
-          name: basename(file, ".sql"),
-          version: migrationVersionFromFilename(file)
-        })));
+        const migrationFiles = sortMigrationFiles(files.map((file) => readMigrationFile(dir, file)));
         const migrationsResult = await http.get(`/v1/projects/${ref}/database/migrations`);
         if (!migrationsResult.ok) {
           text = `❌ Failed to load applied migrations (${migrationsResult.status}): ${JSON.stringify(migrationsResult.data)}`;
@@ -6761,10 +6790,7 @@ Actions: ${allActions.join(", ")}${readOnly ? " (read-only mode)" : ""}`, {
           const appliedKeys = appliedMigrationKeys(migrationsResult.data);
           const pending = migrationFiles.filter(({ name, version }) => !appliedKeys.has(name) && !appliedKeys.has(String(version)));
           const alreadyApplied = migrationFiles.filter(({ name, version }) => appliedKeys.has(name) || appliedKeys.has(String(version)));
-          const pendingWithSql = pending.map((migration) => ({
-            ...migration,
-            sql: readFileSync2(join(dir, migration.file), "utf-8")
-          }));
+          const pendingWithSql = pending;
           let vectorEnabled = null;
           if (pendingWithSql.some(({ sql }) => sqlReferencesVector(sql) || sqlCreatesVectorExtension(sql))) {
             const extResult = await execSql("SELECT extname AS name FROM pg_extension WHERE extname = 'vector';");
@@ -6787,13 +6813,14 @@ Actions: ${allActions.join(", ")}${readOnly ? " (read-only mode)" : ""}`, {
         }
         const applied = [];
         const skipped = [];
-        const baselineKeys = baselineMigrationKeys(migrationsResult.data);
-        for (const { file, name, version } of migrationFiles) {
-          if (baselineKeys.has(baselineMigrationKey(version, name))) {
+        const nameBoundMarkerKeys = nameBoundMigrationMarkerKeys(migrationsResult.data);
+        const historicalChecksumKeys = historicalChecksumMarkerKeys(migrationsResult.data, migrationFiles);
+        for (const { file, name, version, sql } of migrationFiles) {
+          const migrationKey = migrationIdentityKey(version, name);
+          if (nameBoundMarkerKeys.has(migrationKey) || historicalChecksumKeys.has(migrationKey)) {
             skipped.push(file);
             continue;
           }
-          const sql = readFileSync2(join(dir, file), "utf-8");
           const r = await http.post(`/v1/projects/${ref}/database/migrations`, { name, sql, version });
           if (r.ok) {
             applied.push(file);
@@ -6831,11 +6858,7 @@ Actions: ${allActions.join(", ")}${readOnly ? " (read-only mode)" : ""}`, {
           text = `No .sql migration files found in ${dir}`;
           break;
         }
-        const migrationFiles = sortMigrationFiles(files.map((file) => ({
-          file,
-          name: basename(file, ".sql"),
-          version: migrationVersionFromFilename(file)
-        })));
+        const migrationFiles = sortMigrationFiles(files.map((file) => readMigrationFile(dir, file)));
         const r = await http.get(`/v1/projects/${ref}/database/migrations`);
         if (!r.ok) {
           text = `❌ Failed to load applied migrations (${r.status}): ${JSON.stringify(r.data)}`;

package/package.json

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