@astrojs/db 0.11.1 → 0.11.2

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

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

package/dist/runtime/db-client.js

@@ -2,7 +2,7 @@ import { createClient } from "@libsql/client";
 import { drizzle as drizzleLibsql } from "drizzle-orm/libsql";
 import { drizzle as drizzleProxy } from "drizzle-orm/sqlite-proxy";
 import { z } from "zod";
-import { AstroDbError, safeFetch } from "./utils.js";
+import { DetailedLibsqlError, safeFetch } from "./utils.js";
 const isWebContainer = !!process.versions?.webcontainer;
 function applyTransactionNotSupported(db) {
   Object.assign(db, {
@@ -54,7 +54,10 @@ function createRemoteDatabaseClient(appToken, remoteDbURL) {
         const json = await res.json();
         remoteResult = remoteResultSchema.parse(json);
       } catch (e) {
-        throw new AstroDbError(await getUnexpectedResponseMessage(res));
+        throw new DetailedLibsqlError({
+          message: await getUnexpectedResponseMessage(res),
+          code: KNOWN_ERROR_CODES.SQL_QUERY_FAILED
+        });
       }
       if (method === "run") return remoteResult;
       const rowValues = [];
@@ -89,7 +92,10 @@ function createRemoteDatabaseClient(appToken, remoteDbURL) {
         const json = await res.json();
         remoteResults = z.array(remoteResultSchema).parse(json);
       } catch (e) {
-        throw new AstroDbError(await getUnexpectedResponseMessage(res));
+        throw new DetailedLibsqlError({
+          message: await getUnexpectedResponseMessage(res),
+          code: KNOWN_ERROR_CODES.SQL_QUERY_FAILED
+        });
       }
       let results = [];
       for (const [idx, rawResult] of remoteResults.entries()) {
@@ -125,21 +131,24 @@ const KNOWN_ERROR_CODES = {
   SQL_QUERY_FAILED: "SQL_QUERY_FAILED"
 };
 const getUnexpectedResponseMessage = async (response) => `Unexpected response from remote database:
-(Status ${response.status}) ${await response.text()}`;
+(Status ${response.status}) ${await response.clone().text()}`;
 async function parseRemoteError(response) {
   let error;
   try {
-    error = errorSchema.parse(await response.json()).error;
+    error = errorSchema.parse(await response.clone().json()).error;
   } catch (e) {
-    return new AstroDbError(await getUnexpectedResponseMessage(response));
+    return new DetailedLibsqlError({
+      message: await getUnexpectedResponseMessage(response),
+      code: KNOWN_ERROR_CODES.SQL_QUERY_FAILED
+    });
   }
-  let details = error.details?.replace(/.*SQLite error: /, "") ?? `(Code ${error.code}) 
-Error querying remote database.`;
+  let baseDetails = error.details?.replace(/.*SQLite error: /, "") ?? "Error querying remote database.";
+  const details = baseDetails.slice(baseDetails.indexOf(":") + 1).trim();
   let hint = `See the Astro DB guide for query and push instructions: https://docs.astro.build/en/guides/astro-db/#query-your-database`;
   if (error.code === KNOWN_ERROR_CODES.SQL_QUERY_FAILED && details.includes("no such table")) {
     hint = `Did you run \`astro db push\` to push your latest table schemas?`;
   }
-  return new AstroDbError(details, hint);
+  return new DetailedLibsqlError({ message: details, code: error.code, hint });
 }
 export {
   createLocalDatabaseClient,

package/dist/runtime/utils.d.ts

@@ -1,3 +1,4 @@
+import { LibsqlError } from '@libsql/client';
 import { AstroError } from 'astro/errors';
 /**
  * Small wrapper around fetch that throws an error if the response is not OK. Allows for custom error handling as well through the onNotOK callback.
@@ -6,4 +7,15 @@ export declare function safeFetch(url: Parameters<typeof fetch>[0], options?: Pa
 export declare class AstroDbError extends AstroError {
     name: string;
 }
+export declare class DetailedLibsqlError extends LibsqlError {
+    name: string;
+    hint?: string;
+    constructor({ message, code, hint, rawCode, cause, }: {
+        message: string;
+        code: string;
+        hint?: string;
+        rawCode?: number;
+        cause?: Error;
+    });
+}
 export declare function pathToFileURL(path: string): URL;

package/dist/runtime/utils.js

@@ -1,3 +1,4 @@
+import { LibsqlError } from "@libsql/client";
 import { AstroError } from "astro/errors";
 const isWindows = process?.platform === "win32";
 async function safeFetch(url, options = {}, onNotOK = () => {
@@ -12,6 +13,20 @@ async function safeFetch(url, options = {}, onNotOK = () => {
 class AstroDbError extends AstroError {
   name = "Astro DB Error";
 }
+class DetailedLibsqlError extends LibsqlError {
+  name = "Astro DB Error";
+  hint;
+  constructor({
+    message,
+    code,
+    hint,
+    rawCode,
+    cause
+  }) {
+    super(message, code, rawCode, cause);
+    this.hint = hint;
+  }
+}
 function slash(path) {
   const isExtendedLengthPath = path.startsWith("\\\\?\\");
   if (isExtendedLengthPath) {
@@ -31,6 +46,7 @@ function pathToFileURL(path) {
 }
 export {
   AstroDbError,
+  DetailedLibsqlError,
   pathToFileURL,
   safeFetch
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.11.1",
+  "version": "0.11.2",
   "description": "Add libSQL and Astro Studio support to your Astro site",
   "license": "MIT",
   "repository": {
@@ -84,12 +84,12 @@
     "@types/mocha": "^10.0.6",
     "@types/prompts": "^2.4.9",
     "@types/yargs-parser": "^21.0.3",
-    "chai": "^5.1.0",
+    "chai": "^5.1.1",
     "cheerio": "1.0.0-rc.12",
     "mocha": "^10.4.0",
     "typescript": "^5.4.5",
     "vite": "^5.2.11",
-    "astro": "4.8.0",
+    "astro": "4.8.4",
     "astro-scripts": "0.0.14"
   },
   "scripts": {

package/dist/runtime/drizzle.d.ts

@@ -1 +0,0 @@
-export { sql, eq, gt, gte, lt, lte, ne, isNull, isNotNull, inArray, notInArray, exists, notExists, between, notBetween, like, notIlike, not, asc, desc, and, or, } from 'drizzle-orm';

package/dist/runtime/drizzle.js

@@ -1,48 +0,0 @@
-import {
-  sql,
-  eq,
-  gt,
-  gte,
-  lt,
-  lte,
-  ne,
-  isNull,
-  isNotNull,
-  inArray,
-  notInArray,
-  exists,
-  notExists,
-  between,
-  notBetween,
-  like,
-  notIlike,
-  not,
-  asc,
-  desc,
-  and,
-  or
-} from "drizzle-orm";
-export {
-  and,
-  asc,
-  between,
-  desc,
-  eq,
-  exists,
-  gt,
-  gte,
-  inArray,
-  isNotNull,
-  isNull,
-  like,
-  lt,
-  lte,
-  ne,
-  not,
-  notBetween,
-  notExists,
-  notIlike,
-  notInArray,
-  or,
-  sql
-};