@astrojs/db 0.14.1 → 0.14.3

package/dist/core/cli/migration-queries.js

@@ -1,9 +1,10 @@
+import { stripVTControlCharacters } from "node:util";
+import { LibsqlError } from "@libsql/client";
 import deepDiff from "deep-diff";
 import { sql } from "drizzle-orm";
 import { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core";
 import * as color from "kleur/colors";
 import { customAlphabet } from "nanoid";
-import stripAnsi from "strip-ansi";
 import { hasPrimaryKey } from "../../runtime/index.js";
 import { createRemoteDatabaseClient } from "../../runtime/index.js";
 import { isSerializedSQL } from "../../runtime/types.js";
@@ -319,7 +320,13 @@ async function getDbCurrentSnapshot(appToken, remoteUrl) {
     );
     return JSON.parse(res.snapshot);
   } catch (error) {
-    if (error.code === "SQLITE_UNKNOWN") {
+    if (error instanceof LibsqlError && // If the schema was never pushed to the database yet the table won't exist.
+    // Treat a missing snapshot table as an empty table.
+    // When connecting to a remote database in that condition
+    // the query will fail with the following error code and message.
+    (error.code === "SQLITE_UNKNOWN" && error.message === "SQLITE_UNKNOWN: SQLite error: no such table: _astro_db_snapshot" || // When connecting to a local or in-memory database that does not have a snapshot table yet
+    // the query will fail with the following error code and message.
+    error.code === "SQLITE_ERROR" && error.message === "SQLITE_ERROR: no such table: _astro_db_snapshot")) {
       return;
     }
     throw error;
@@ -376,7 +383,7 @@ function formatDataLossMessage(confirmations, isColor = true) {
   );
   let finalMessage = messages.join("\n");
   if (!isColor) {
-    finalMessage = stripAnsi(finalMessage);
+    finalMessage = stripVTControlCharacters(finalMessage);
   }
   return finalMessage;
 }

package/dist/core/cli/print-help.js

@@ -27,7 +27,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"0.14.1"}`
+        `v${"0.14.3"}`
       )} ${headline}`
     );
   }

package/dist/core/integration/index.js

@@ -111,7 +111,7 @@ function astroDBIntegration() {
           ...CONFIG_FILE_NAMES.map((c) => new URL(c, getDbDirectoryUrl(root))),
           ...configFileDependencies.map((c) => new URL(c, root))
         ];
-        server.watcher.on("all", (event, relativeEntry) => {
+        server.watcher.on("all", (_event, relativeEntry) => {
           const entry = new URL(relativeEntry, root);
           if (filesToWatch.some((f) => entry.href === f.href)) {
             server.restart();

package/dist/core/integration/vite-plugin-db.js

@@ -74,12 +74,13 @@ function getLocalVirtualModContents({
   tables,
   root
 }) {
+  const { ASTRO_DATABASE_FILE } = getAstroEnv();
   const dbInfo = getRemoteDatabaseInfo();
   const dbUrl = new URL(DB_PATH, root);
   return `
 import { asDrizzleTable, createLocalDatabaseClient, normalizeDatabaseUrl } from ${RUNTIME_IMPORT};
 
-const dbUrl = normalizeDatabaseUrl(import.meta.env.ASTRO_DATABASE_FILE, ${JSON.stringify(dbUrl)});
+const dbUrl = normalizeDatabaseUrl(${JSON.stringify(ASTRO_DATABASE_FILE)}, ${JSON.stringify(dbUrl)});
 export const db = createLocalDatabaseClient({ dbUrl, enableTransactions: ${dbInfo.url === "libsql"} });
 
 export * from ${RUNTIME_VIRTUAL_IMPORT};
@@ -107,7 +108,11 @@ function getStudioVirtualModContents({
   }
   function dbUrlArg() {
     const dbStr = JSON.stringify(dbInfo.url);
-    return dbInfo.type === "studio" ? `import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL ?? ${dbStr}` : `import.meta.env.ASTRO_DB_REMOTE_URL ?? ${dbStr}`;
+    if (isBuild) {
+      return dbInfo.type === "studio" ? `import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL ?? ${dbStr}` : `import.meta.env.ASTRO_DB_REMOTE_URL ?? ${dbStr}`;
+    } else {
+      return dbStr;
+    }
   }
   return `
 import {asDrizzleTable, createRemoteDatabaseClient} from ${RUNTIME_IMPORT};

package/dist/runtime/db-client.js

@@ -31,15 +31,21 @@ const remoteResultSchema = z.object({
 });
 function createRemoteDatabaseClient(options) {
   const remoteUrl = new URL(options.remoteUrl);
-  return options.dbType === "studio" ? createStudioDatabaseClient(options.appToken, remoteUrl) : createRemoteLibSQLClient(options.appToken, remoteUrl);
+  return options.dbType === "studio" ? createStudioDatabaseClient(options.appToken, remoteUrl) : createRemoteLibSQLClient(options.appToken, remoteUrl, options.remoteUrl.toString());
 }
-function createRemoteLibSQLClient(appToken, remoteDbURL) {
+function createRemoteLibSQLClient(appToken, remoteDbURL, rawUrl) {
   const options = Object.fromEntries(remoteDbURL.searchParams.entries());
   remoteDbURL.search = "";
+  let url = remoteDbURL.toString();
+  if (remoteDbURL.protocol === "memory:") {
+    url = ":memory:";
+  } else if (remoteDbURL.protocol === "file:" && remoteDbURL.pathname.startsWith("/") && !rawUrl.startsWith("file:/")) {
+    url = "file:" + remoteDbURL.pathname.substring(1);
+  }
   const client = createClient({
     ...options,
     authToken: appToken,
-    url: remoteDbURL.protocol === "memory:" ? ":memory:" : remoteDbURL.toString()
+    url
   });
   return drizzleLibsql(client);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.14.1",
+  "version": "0.14.3",
   "description": "Add libSQL and Astro Studio support to your Astro site",
   "license": "MIT",
   "repository": {
@@ -62,7 +62,7 @@
     "astro-integration"
   ],
   "dependencies": {
-    "@libsql/client": "^0.10.0",
+    "@libsql/client": "^0.14.0",
     "async-listen": "^3.0.1",
     "deep-diff": "^1.0.2",
     "drizzle-orm": "^0.31.2",
@@ -72,7 +72,6 @@
     "open": "^10.1.0",
     "ora": "^8.1.0",
     "prompts": "^2.4.2",
-    "strip-ansi": "^7.1.0",
     "yargs-parser": "^21.1.1",
     "zod": "^3.23.8",
     "@astrojs/studio": "0.1.1"
@@ -82,9 +81,9 @@
     "@types/prompts": "^2.4.9",
     "@types/yargs-parser": "^21.0.3",
     "cheerio": "1.0.0",
-    "typescript": "^5.5.4",
-    "vite": "^5.4.2",
-    "astro": "4.15.3",
+    "typescript": "^5.6.3",
+    "vite": "^5.4.9",
+    "astro": "4.16.7",
     "astro-scripts": "0.0.14"
   },
   "scripts": {