@astrojs/db 0.20.0 → 0.21.0

package/README.md

@@ -35,4 +35,4 @@ Copyright (c) 2023–present [Astro][astro]
 [community]: https://github.com/withastro/.github/blob/main/COMMUNITY_GUIDE.md
 [discord]: https://astro.build/chat/
 [issues]: https://github.com/withastro/astro/issues
-[astro-integration]: https://docs.astro.build/en/guides/integrations-guide/
+[astro-integration]: https://docs.astro.build/en/guides/integrations/

package/dist/_internal/runtime/utils.d.ts

@@ -5,5 +5,6 @@ export declare function hasPrimaryKey(column: DBColumn): boolean;
 export declare class AstroDbError extends AstroError {
     name: string;
 }
-export declare function isDbError(err: unknown): err is LibsqlError;
+export declare function getDbError(err: unknown): LibsqlError | undefined;
+export declare function isDbError(err: unknown): boolean;
 export declare function pathToFileURL(path: string): URL;

package/dist/_internal/runtime/virtual.d.ts

@@ -45,4 +45,4 @@ export declare const TRUE: import("drizzle-orm").SQL<unknown>;
 export declare const FALSE: import("drizzle-orm").SQL<unknown>;
 export { and, asc, avg, avgDistinct, between, count, countDistinct, desc, eq, exists, gt, gte, ilike, inArray, isNotNull, isNull, like, lt, lte, max, min, ne, not, notBetween, notExists, notIlike, notInArray, or, sql, sum, sumDistinct, } from 'drizzle-orm';
 export { alias } from 'drizzle-orm/sqlite-core';
-export { isDbError } from './utils.js';
+export { getDbError, isDbError } from './utils.js';

package/dist/core/cli/commands/execute/index.js

@@ -1,6 +1,6 @@
 import { existsSync } from "node:fs";
 import colors from "piccolore";
-import { isDbError } from "../../../../runtime/utils.js";
+import { getDbError } from "../../../../runtime/utils.js";
 import {
   EXEC_DEFAULT_EXPORT_ERROR,
   EXEC_ERROR,
@@ -56,7 +56,8 @@ async function cmd({
     await mod.default();
     console.info(`${colors.green("\u2714")} File run successfully.`);
   } catch (e) {
-    if (isDbError(e)) throw new Error(EXEC_ERROR(e.message));
+    const dbError = getDbError(e);
+    if (dbError) throw new Error(EXEC_ERROR(dbError.message));
     else throw e;
   }
 }

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

@@ -1,11 +1,11 @@
 import { stripVTControlCharacters } from "node:util";
-import deepDiff from "deep-diff";
+import diff from "microdiff";
 import { sql } from "drizzle-orm";
 import { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core";
 import { customAlphabet } from "nanoid";
 import color from "piccolore";
 import { isSerializedSQL } from "../../runtime/types.js";
-import { hasPrimaryKey, isDbError } from "../../runtime/utils.js";
+import { getDbError, hasPrimaryKey } from "../../runtime/utils.js";
 import { MIGRATION_VERSION } from "../consts.js";
 import { createClient } from "../db-client/libsql-node.js";
 import { RENAME_COLUMN_ERROR, RENAME_TABLE_ERROR } from "../errors.js";
@@ -87,7 +87,7 @@ async function getTableChangeQueries({
   const updated = getUpdatedColumns(oldTable.columns, newTable.columns);
   const added = getAdded(oldTable.columns, newTable.columns);
   const dropped = getDropped(oldTable.columns, newTable.columns);
-  const hasForeignKeyChanges = Boolean(deepDiff(oldTable.foreignKeys, newTable.foreignKeys));
+  const hasForeignKeyChanges = diff(oldTable.foreignKeys ?? [], newTable.foreignKeys ?? []).length > 0;
   if (!hasForeignKeyChanges && isEmpty(updated) && isEmpty(added) && isEmpty(dropped)) {
     return {
       queries: getChangeIndexQueries({
@@ -264,7 +264,7 @@ function getUpdated(oldObj, newObj) {
   for (const [key, value] of Object.entries(newObj)) {
     const oldValue = oldObj[key];
     if (!oldValue) continue;
-    if (deepDiff(oldValue, value)) updated[key] = value;
+    if (diff(oldValue, value).length > 0) updated[key] = value;
   }
   return updated;
 }
@@ -282,8 +282,8 @@ function getUpdatedColumns(oldColumns, newColumns) {
         oldColumn = asNewColumn.data;
       }
     }
-    const diff = deepDiff(oldColumn, newColumn);
-    if (diff) {
+    const diffResult = diff(oldColumn, newColumn);
+    if (diffResult.length > 0) {
       updated[key] = { old: oldColumn, new: newColumn };
     }
   }
@@ -320,13 +320,14 @@ async function getDbCurrentSnapshot(appToken, remoteUrl) {
     );
     return JSON.parse(res.snapshot);
   } catch (error) {
-    if (isDbError(error) && // If the schema was never pushed to the database yet the table won't exist.
+    const dbError = getDbError(error);
+    if (dbError && // 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
+    (dbError.code === "SQLITE_UNKNOWN" && dbError.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")) {
+    dbError.code === "SQLITE_ERROR" && dbError.message === "SQLITE_ERROR: no such table: _astro_db_snapshot")) {
       return;
     }
     throw error;

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

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

package/dist/core/integration/index.js

@@ -10,7 +10,7 @@ import {
 } from "vite";
 import parseArgs from "yargs-parser";
 import * as z from "zod/v4";
-import { AstroDbError, isDbError } from "../../runtime/utils.js";
+import { AstroDbError, getDbError } from "../../runtime/utils.js";
 import { CONFIG_FILE_NAMES, DB_PATH, VIRTUAL_MODULE_ID } from "../consts.js";
 import { EXEC_DEFAULT_EXPORT_ERROR, EXEC_ERROR } from "../errors.js";
 import { resolveDbConfig } from "../load-file.js";
@@ -186,8 +186,9 @@ async function executeSeedFile({
   try {
     await mod.default();
   } catch (e) {
-    if (isDbError(e)) {
-      throw new AstroDbError(EXEC_ERROR(e.message));
+    const dbError = getDbError(e);
+    if (dbError) {
+      throw new AstroDbError(EXEC_ERROR(dbError.message));
     }
     throw e;
   }

package/dist/runtime/utils.d.ts

@@ -5,5 +5,6 @@ export declare function hasPrimaryKey(column: DBColumn): boolean;
 export declare class AstroDbError extends AstroError {
     name: string;
 }
-export declare function isDbError(err: unknown): err is LibsqlError;
+export declare function getDbError(err: unknown): LibsqlError | undefined;
+export declare function isDbError(err: unknown): boolean;
 export declare function pathToFileURL(path: string): URL;

package/dist/runtime/utils.js

@@ -7,8 +7,16 @@ const isWindows = process?.platform === "win32";
 class AstroDbError extends AstroError {
   name = "Astro DB Error";
 }
+function getDbError(err) {
+  if (err instanceof LibsqlError) return err;
+  if (err instanceof Error && err.libsqlError === true) return err;
+  if (err instanceof Error && err.cause != null && err.cause !== err) {
+    return getDbError(err.cause);
+  }
+  return void 0;
+}
 function isDbError(err) {
-  return err instanceof LibsqlError || err instanceof Error && err.libsqlError === true;
+  return getDbError(err) !== void 0;
 }
 function slash(path) {
   const isExtendedLengthPath = path.startsWith("\\\\?\\");
@@ -29,6 +37,7 @@ function pathToFileURL(path) {
 }
 export {
   AstroDbError,
+  getDbError,
   hasPrimaryKey,
   isDbError,
   pathToFileURL

package/dist/runtime/virtual.js

@@ -68,7 +68,7 @@ import {
   sumDistinct
 } from "drizzle-orm";
 import { alias } from "drizzle-orm/sqlite-core";
-import { isDbError } from "./utils.js";
+import { getDbError, isDbError } from "./utils.js";
 export {
   FALSE,
   NOW,
@@ -87,6 +87,7 @@ export {
   desc,
   eq,
   exists,
+  getDbError,
   gt,
   gte,
   ilike,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.20.0",
+  "version": "0.21.0",
   "description": "Add libSQL support to your Astro site",
   "license": "MIT",
   "repository": {
@@ -65,21 +65,20 @@
   "dependencies": {
     "@clack/prompts": "^1.0.1",
     "@libsql/client": "^0.17.0",
-    "deep-diff": "^1.0.2",
-    "drizzle-orm": "^0.42.0",
+    "drizzle-orm": "^0.45.2",
+    "microdiff": "^1.5.0",
     "nanoid": "^5.1.6",
     "piccolore": "^0.1.3",
     "yargs-parser": "^22.0.0",
     "zod": "^4.3.6"
   },
   "devDependencies": {
-    "@types/deep-diff": "^1.0.5",
     "@types/yargs-parser": "^21.0.3",
     "cheerio": "1.2.0",
     "expect-type": "^1.3.0",
     "typescript": "^5.9.3",
-    "vite": "^7.3.1",
-    "astro": "6.0.0",
+    "vite": "^7.3.2",
+    "astro": "6.1.10",
     "astro-scripts": "0.0.14"
   },
   "scripts": {
@@ -88,7 +87,8 @@
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
     "test": "pnpm run test:integration && pnpm run test:types",
-    "test:integration": "astro-scripts test \"test/**/*.test.js\"",
-    "test:types": "tsc --project test/types/tsconfig.json"
+    "test:integration": "astro-scripts test \"test/**/*.test.ts\"",
+    "test:types": "tsc --project test/types/tsconfig.json",
+    "typecheck:tests": "tsc --build tsconfig.test.json"
   }
 }

package/virtual.d.ts

@@ -12,6 +12,7 @@ declare module 'astro:db' {
 	export const defineDb: RuntimeConfig['defineDb'];
 	export const defineTable: RuntimeConfig['defineTable'];
 	export const isDbError: RuntimeConfig['isDbError'];
+	export const getDbError: RuntimeConfig['getDbError'];
 
 	export const eq: RuntimeConfig['eq'];
 	export const gt: RuntimeConfig['gt'];