aiex-cli 0.0.1-beta.9 → 0.0.2-beta.1

package/dist/{completions-ygS1okck.mjs → completions-C3rmTwXZ.mjs}

@@ -1,5 +1,6 @@
 import path from "node:path";
 import process from "node:process";
+import { readFileSync } from "jsonfile";
 import fs from "node:fs";
 
 //#region src/core/completions.ts
@@ -27,8 +28,7 @@ function getFileCompletions(pattern) {
 }
 function getJsonModelNames(configPath) {
 	try {
-		const content = fs.readFileSync(configPath, "utf-8");
-		const config = JSON.parse(content);
+		const config = readFileSync(configPath);
 		if (config.provider?.models) return config.provider.models.map((m) => m.name);
 	} catch {}
 	return [];

package/dist/core/schema-sqlite/migrate-helper.mjs

@@ -1,10 +1,12 @@
 import { createRequire } from "node:module";
+import fs from "node:fs/promises";
 import path from "node:path";
 import process from "node:process";
+import { readFile, writeFile } from "jsonfile";
 import { fileURLToPath } from "node:url";
-import fs from "node:fs/promises";
 import Database from "better-sqlite3";
 import * as esbuild from "esbuild";
+import lockfile from "proper-lockfile";
 
 //#region src/core/schema-sqlite/migration-name.ts
 function sanitizeMigrationName(name) {
@@ -62,11 +64,10 @@ async function loadSchemaExports(schemaPath) {
 async function loadPrevSnapshot(migrationsPath) {
 	const metaPath = path.join(migrationsPath, "meta", "_journal.json");
 	try {
-		const journal = JSON.parse(await fs.readFile(metaPath, "utf-8"));
+		const journal = await readFile(metaPath);
 		if (!journal.entries?.length) return null;
 		const latestEntry = journal.entries[journal.entries.length - 1];
-		const snapshotPath = path.join(migrationsPath, "meta", `${latestEntry.tag}_snapshot.json`);
-		return JSON.parse(await fs.readFile(snapshotPath, "utf-8"));
+		return await readFile(path.join(migrationsPath, "meta", `${latestEntry.tag}_snapshot.json`));
 	} catch {
 		return null;
 	}
@@ -77,7 +78,7 @@ async function saveSnapshot(migrationsPath, snapshot, migrationName) {
 	const journalPath = path.join(metaPath, "_journal.json");
 	let journal;
 	try {
-		journal = JSON.parse(await fs.readFile(journalPath, "utf-8"));
+		journal = await readFile(journalPath);
 	} catch {
 		journal = {
 			version: "6",
@@ -88,8 +89,10 @@ async function saveSnapshot(migrationsPath, snapshot, migrationName) {
 	const idx = journal.entries.length + 1;
 	const suffix = sanitizeMigrationName(migrationName) || snapshot.id.replace(/-/g, "_").substring(0, 8);
 	const tag = `${String(idx).padStart(4, "0")}_${suffix}`;
-	const snapshotPath = path.join(metaPath, `${tag}_snapshot.json`);
-	await fs.writeFile(snapshotPath, JSON.stringify(snapshot, null, 2));
+	await writeFile(path.join(metaPath, `${tag}_snapshot.json`), snapshot, {
+		spaces: 2,
+		EOL: "\n"
+	});
 	journal.entries.push({
 		idx,
 		version: snapshot.id,
@@ -97,7 +100,10 @@ async function saveSnapshot(migrationsPath, snapshot, migrationName) {
 		tag,
 		breakpoints: true
 	});
-	await fs.writeFile(journalPath, JSON.stringify(journal, null, 2));
+	await writeFile(journalPath, journal, {
+		spaces: 2,
+		EOL: "\n"
+	});
 	return tag;
 }
 async function saveMigrationFile(migrationsPath, tag, sqlStatements) {
@@ -119,35 +125,22 @@ function applyMigrationWithTransaction(dbPath, sqlStatements) {
 	}
 }
 const LOCK_FILE = ".migrate.lock";
-async function acquireLock(aiexDir) {
-	const lockPath = path.join(aiexDir, LOCK_FILE);
+async function acquireMigrationLock(aiexDir) {
 	await fs.mkdir(aiexDir, { recursive: true });
 	try {
-		const fd = await fs.open(lockPath, "wx");
-		await fd.write(`${process.pid}\n${Date.now()}`);
-		await fd.close();
-	} catch (e) {
-		if (e.code === "EEXIST") try {
-			const [pidStr, timestampStr] = (await fs.readFile(lockPath, "utf-8")).split("\n");
-			const lockPid = Number.parseInt(pidStr, 10);
-			const lockTime = Number.parseInt(timestampStr, 10);
-			const lockAge = Date.now() - lockTime;
-			if (lockAge > 3e5) {
-				await fs.unlink(lockPath);
-				return acquireLock(aiexDir);
-			}
-			throw new Error(`Migration is already running (PID ${lockPid}, started ${Math.round(lockAge / 1e3)}s ago). Wait for it to complete or remove ${lockPath} if stale.`);
-		} catch {
-			await fs.unlink(lockPath).catch(() => {});
-			return acquireLock(aiexDir);
-		}
-		throw e;
+		return await lockfile.lock(aiexDir, {
+			lockfilePath: path.join(aiexDir, LOCK_FILE),
+			realpath: false,
+			stale: 3e5,
+			update: 1e4,
+			retries: 0
+		});
+	} catch (error) {
+		const lockPath = path.join(aiexDir, LOCK_FILE);
+		const message = error instanceof Error ? error.message : String(error);
+		throw new Error(`Migration is already running or the lock could not be acquired. Wait for it to complete or remove ${lockPath} if stale. ${message}`);
 	}
 }
-async function releaseLock(aiexDir) {
-	const lockPath = path.join(aiexDir, LOCK_FILE);
-	await fs.unlink(lockPath).catch(() => {});
-}
 async function main() {
 	const args = process.argv.slice(2);
 	const schemaPath = args[0];
@@ -159,11 +152,16 @@ async function main() {
 		process.exit(1);
 	}
 	try {
-		const aiexDir = path.dirname(path.dirname(migrationsPath));
-		await acquireLock(aiexDir);
+		const releaseLock = await acquireMigrationLock(path.dirname(path.dirname(migrationsPath)));
 		try {
 			const exports = await loadSchemaExports(schemaPath);
-			const prevSnapshot = await loadPrevSnapshot(migrationsPath);
+			let dbMissing = false;
+			try {
+				await fs.access(dbPath);
+			} catch {
+				dbMissing = true;
+			}
+			const prevSnapshot = dbMissing ? null : await loadPrevSnapshot(migrationsPath);
 			const currentSnapshot = await generateSQLiteDrizzleJson(exports, prevSnapshot?.id);
 			const sqlStatements = await generateSQLiteMigration(prevSnapshot || EMPTY_SNAPSHOT, currentSnapshot);
 			if (sqlStatements.length === 0) {
@@ -182,7 +180,7 @@ async function main() {
 				tag
 			}));
 		} finally {
-			await releaseLock(aiexDir);
+			await releaseLock();
 		}
 	} catch (error) {
 		const message = error instanceof Error ? error.message : String(error);