datasette-ts 0.0.6 → 0.0.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "datasette-ts",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "private": false,
   "type": "module",
   "bin": {

package/scripts/cloudflare-deploy-helpers.mjs

@@ -14,11 +14,16 @@ export async function dumpSqliteForD1(options) {
     options.outputName ?? path.basename(options.dbFile, path.extname(options.dbFile));
   const outputPath = path.join(options.outputDir, `${baseName}.sql`);
   const rawPath = path.join(options.outputDir, `${baseName}.raw.sql`);
+  const log = typeof options.log === "function" ? options.log : null;
+  const progressIntervalMs =
+    typeof options.progressIntervalMs === "number" && Number.isFinite(options.progressIntervalMs)
+      ? options.progressIntervalMs
+      : 5000;
 
   await mkdir(options.outputDir, { recursive: true });
-  await dumpSqliteToFile(options.dbFile, rawPath);
+  await dumpSqliteToFile(options.dbFile, rawPath, { log, progressIntervalMs });
   try {
-    await normalizeDumpFile(rawPath, outputPath);
+    await normalizeDumpFile(rawPath, outputPath, { log });
   } finally {
     await unlink(rawPath).catch(() => undefined);
   }
@@ -163,9 +168,12 @@ function escapeIdentifier(name) {
   return `"${escaped}"`;
 }
 
-async function normalizeDumpFile(inputPath, outputPath) {
+async function normalizeDumpFile(inputPath, outputPath, { log } = {}) {
   const tablesInOrder = [];
   const viewsInOrder = [];
+  if (log) {
+    log(`Normalizing D1 import SQL: ${outputPath}`);
+  }
   await forEachLine(inputPath, (line) => {
     const tableMatch = line.match(/^CREATE TABLE\s+("?[^"]+"?)/i);
     if (tableMatch) {
@@ -196,9 +204,16 @@ async function normalizeDumpFile(inputPath, outputPath) {
   });
   outputStream.end();
   await once(outputStream, "finish");
+  if (log) {
+    const { size } = await stat(outputPath);
+    log(`D1 import SQL ready (${formatBytes(size)})`);
+  }
 }
 
-async function dumpSqliteToFile(dbFile, outputPath) {
+async function dumpSqliteToFile(dbFile, outputPath, { log, progressIntervalMs } = {}) {
+  if (log) {
+    log(`Dumping SQLite database via sqlite3 .dump`);
+  }
   const child = spawn("sqlite3", [dbFile, ".dump"], {
     stdio: ["ignore", "pipe", "pipe"],
   });
@@ -221,13 +236,24 @@ async function dumpSqliteToFile(dbFile, outputPath) {
     outputStream.destroy(error);
   });
 
-  await pipeline(stdout, outputStream);
+  const stopProgress = log
+    ? startProgressLogger(outputPath, log, progressIntervalMs)
+    : () => undefined;
+  try {
+    await pipeline(stdout, outputStream);
+  } finally {
+    stopProgress();
+  }
   const [code, signal] = await once(child, "close");
   if (code !== 0) {
     const suffix = signal ? ` (signal ${signal})` : "";
     const message = stderr.trim() || `sqlite3 exited with code ${code ?? "unknown"}${suffix}`;
     throw new Error(message);
   }
+  if (log) {
+    const { size } = await stat(outputPath);
+    log(`SQLite dump completed (${formatBytes(size)})`);
+  }
 }
 
 async function forEachLine(filePath, handler) {
@@ -249,6 +275,32 @@ async function writeLine(stream, line) {
   }
 }
 
+function startProgressLogger(filePath, log, intervalMs) {
+  const interval = setInterval(() => {
+    void stat(filePath)
+      .then((info) => {
+        log(`Dump size: ${formatBytes(info.size)}`);
+      })
+      .catch(() => undefined);
+  }, intervalMs);
+  return () => clearInterval(interval);
+}
+
+function formatBytes(bytes) {
+  if (!Number.isFinite(bytes) || bytes < 0) {
+    return "0 B";
+  }
+  const units = ["B", "KB", "MB", "GB", "TB"];
+  let value = bytes;
+  let index = 0;
+  while (value >= 1024 && index < units.length - 1) {
+    value /= 1024;
+    index += 1;
+  }
+  const rounded = index === 0 ? value.toFixed(0) : value.toFixed(1);
+  return `${rounded} ${units[index]}`;
+}
+
 async function hashFile(filePath) {
   return new Promise((resolve, reject) => {
     const hash = createHash("sha256");