@supacloud/cli 0.12.1 → 0.12.2

package/dist/index.js

@@ -6455,13 +6455,47 @@ class HttpTransport {
 }
 
 // src/shared/tools/database-tools.ts
+import { createHash } from "node:crypto";
 import { existsSync as existsSync2, readdirSync, readFileSync as readFileSync2, statSync } from "node:fs";
 import { basename, join } from "node:path";
-function migrationVersionFromFilename(file, fallbackIndex = 0) {
+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 migrationVersionFromFilename(file) {
   const match = basename(file).match(/^(\d{8,20})[_-]/);
-  if (match)
-    return Number(match[1]);
-  return Date.now() * 1000 + fallbackIndex;
+  if (match) {
+    const version = BigInt(match[1]);
+    if (version < 1n || version > MAX_MIGRATION_VERSION) {
+      throw new Error(`Invalid migration version '${match[1]}' in ${basename(file)}: expected 1..${MAX_MIGRATION_VERSION}`);
+    }
+    if (version >= FALLBACK_MIGRATION_VERSION_BASE && version < FALLBACK_MIGRATION_VERSION_LIMIT) {
+      throw new Error(`Invalid migration version '${match[1]}' in ${basename(file)}: version range ${FALLBACK_MIGRATION_VERSION_BASE}..${FALLBACK_MIGRATION_VERSION_LIMIT - 1n} is reserved for non-timestamp migrations`);
+    }
+    return version.toString();
+  }
+  const digest = createHash("sha256").update(basename(file)).digest("hex");
+  const offset = BigInt(`0x${digest}`) % FALLBACK_MIGRATION_VERSION_RANGE;
+  return (FALLBACK_MIGRATION_VERSION_BASE + offset).toString();
+}
+function sortMigrationFiles(migrations) {
+  const sorted = [...migrations].sort((a, b) => {
+    const versionA = BigInt(a.version);
+    const versionB = BigInt(b.version);
+    if (versionA < versionB)
+      return -1;
+    if (versionA > versionB)
+      return 1;
+    return a.file.localeCompare(b.file);
+  });
+  for (let i = 1;i < sorted.length; i += 1) {
+    const previous = sorted[i - 1];
+    const current = sorted[i];
+    if (previous.version === current.version && (previous.file !== current.file || previous.name !== current.name)) {
+      throw new Error(`Migration version collision for ${current.version}: ${previous.file} and ${current.file}`);
+    }
+  }
+  return sorted;
 }
 function appliedMigrationKeys(data) {
   const rows = Array.isArray(data) ? data : data?.rows || [];
@@ -6477,6 +6511,24 @@ function appliedMigrationKeys(data) {
   }
   return keys;
 }
+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) {
+  return `${version}\x00${name}`;
+}
+function baselineMigrationKeys(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)}`)
+      continue;
+    keys.add(baselineMigrationKey(String(row.version), String(row.name)));
+  }
+  return keys;
+}
 function isAlreadyAppliedMigrationResponse(response) {
   if (response.status !== 409 || !response.data || typeof response.data !== "object")
     return false;
@@ -6695,18 +6747,18 @@ Actions: ${allActions.join(", ")}${readOnly ? " (read-only mode)" : ""}`, {
           text = `No .sql migration files found in ${dir}`;
           break;
         }
-        const migrationFiles = files.map((file, i) => ({
+        const migrationFiles = sortMigrationFiles(files.map((file) => ({
           file,
           name: basename(file, ".sql"),
-          version: migrationVersionFromFilename(file, i)
-        }));
+          version: migrationVersionFromFilename(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)}`;
+          break;
+        }
         if (args.dry_run) {
-          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)}`;
-            break;
-          }
-          const appliedKeys = appliedMigrationKeys(r.data);
+          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) => ({
@@ -6735,7 +6787,12 @@ 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))) {
+            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) {
@@ -6774,11 +6831,11 @@ Actions: ${allActions.join(", ")}${readOnly ? " (read-only mode)" : ""}`, {
           text = `No .sql migration files found in ${dir}`;
           break;
         }
-        const migrationFiles = files.map((file, i) => ({
+        const migrationFiles = sortMigrationFiles(files.map((file) => ({
           file,
           name: basename(file, ".sql"),
-          version: migrationVersionFromFilename(file, i)
-        }));
+          version: migrationVersionFromFilename(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.1",
+  "version": "0.12.2",
   "description": "Project-scoped CLI for SupaCloud users",
   "type": "module",
   "main": "./dist/index.js",