@astrojs/db 0.14.3 → 0.14.4

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

@@ -0,0 +1,22 @@
+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.
+ */
+export declare function safeFetch(url: Parameters<typeof fetch>[0], options?: Parameters<typeof fetch>[1], onNotOK?: (response: Response) => void | Promise<void>): Promise<Response>;
+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 isDbError(err: unknown): err is LibsqlError;
+export declare function pathToFileURL(path: string): URL;

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

@@ -1,6 +1,4 @@
-import { LibsqlError } from '@libsql/client';
 import type { BooleanColumnInput, ColumnsConfig, DBConfigInput, DateColumnInput, JsonColumnInput, NumberColumnOpts, TableConfig, TextColumnOpts } from '../core/types.js';
-export declare function isDbError(err: unknown): err is LibsqlError;
 export declare const column: {
     number: <T extends NumberColumnOpts>(opts?: T) => {
         type: "number";
@@ -47,3 +45,4 @@ export declare const TRUE: import("drizzle-orm").SQL<unknown>;
 export declare const FALSE: import("drizzle-orm").SQL<unknown>;
 export { sql, eq, gt, gte, lt, lte, ne, isNull, isNotNull, inArray, notInArray, exists, notExists, between, notBetween, like, notIlike, not, asc, desc, and, or, count, countDistinct, avg, avgDistinct, sum, sumDistinct, max, min, } from 'drizzle-orm';
 export { alias } from 'drizzle-orm/sqlite-core';
+export { isDbError } from './utils.js';

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

@@ -1,6 +1,6 @@
 import { existsSync } from "node:fs";
-import { LibsqlError } from "@libsql/client";
 import { green } from "kleur/colors";
+import { isDbError } from "../../../../runtime/utils.js";
 import {
   EXEC_DEFAULT_EXPORT_ERROR,
   EXEC_ERROR,
@@ -53,10 +53,8 @@ async function cmd({
     await mod.default();
     console.info(`${green("\u2714")} File run successfully.`);
   } catch (e) {
-    if (e instanceof LibsqlError) {
-      throw new Error(EXEC_ERROR(e.message));
-    }
-    throw e;
+    if (isDbError(e)) throw new Error(EXEC_ERROR(e.message));
+    else throw e;
   }
 }
 export {

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

@@ -9,8 +9,8 @@ import {
 } from "@astrojs/studio";
 import { slug } from "github-slugger";
 import { bgRed, cyan } from "kleur/colors";
-import ora from "ora";
 import prompts from "prompts";
+import yoctoSpinner from "yocto-spinner";
 import { safeFetch } from "../../../../runtime/utils.js";
 async function cmd() {
   const sessionToken = await getSessionIdFromFile();
@@ -30,14 +30,14 @@ async function cmd() {
     const workspaceId = await promptWorkspace(sessionToken);
     const newProjectName = await promptNewProjectName();
     const newProjectRegion = await promptNewProjectRegion();
-    const spinner = ora("Creating new project...").start();
+    const spinner = yoctoSpinner({ text: "Creating new project..." }).start();
     const newProjectData = await createNewProject({
       workspaceId,
       name: newProjectName,
       region: newProjectRegion
     });
     await new Promise((r) => setTimeout(r, 4e3));
-    spinner.succeed("Project created!");
+    spinner.success("Project created!");
     return await linkProject(newProjectData.id);
   }
 }

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

@@ -4,8 +4,8 @@ import { SESSION_LOGIN_FILE, getAstroStudioUrl } from "@astrojs/studio";
 import { listen } from "async-listen";
 import { cyan } from "kleur/colors";
 import open from "open";
-import ora from "ora";
 import prompt from "prompts";
+import yoctoSpinner from "yocto-spinner";
 const isWebContainer = (
   // Stackblitz heuristic
   process.versions?.webcontainer ?? // GitHub Codespaces heuristic
@@ -38,9 +38,9 @@ async function cmd({
     console.log(cyan(loginUrl.href));
     console.log(`If something goes wrong, copy-and-paste the URL into your browser.`);
     open(loginUrl.href);
-    const spinner = ora("Waiting for confirmation...");
+    const spinner = yoctoSpinner({ text: "Waiting for confirmation..." });
     session = await promise;
-    spinner.succeed("Successfully logged in");
+    spinner.success("Successfully logged in");
   }
   await mkdir(new URL(".", SESSION_LOGIN_FILE), { recursive: true });
   await writeFile(SESSION_LOGIN_FILE, `${session}`);

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

@@ -1,5 +1,4 @@
 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";
@@ -8,7 +7,7 @@ import { customAlphabet } from "nanoid";
 import { hasPrimaryKey } from "../../runtime/index.js";
 import { createRemoteDatabaseClient } from "../../runtime/index.js";
 import { isSerializedSQL } from "../../runtime/types.js";
-import { safeFetch } from "../../runtime/utils.js";
+import { isDbError, safeFetch } from "../../runtime/utils.js";
 import { MIGRATION_VERSION } from "../consts.js";
 import { RENAME_COLUMN_ERROR, RENAME_TABLE_ERROR } from "../errors.js";
 import {
@@ -320,7 +319,7 @@ async function getDbCurrentSnapshot(appToken, remoteUrl) {
     );
     return JSON.parse(res.snapshot);
   } catch (error) {
-    if (error instanceof LibsqlError && // If the schema was never pushed to the database yet the table won't exist.
+    if (isDbError(error) && // 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.

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

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

package/dist/core/integration/index.js

@@ -2,7 +2,6 @@ import { existsSync } from "node:fs";
 import { mkdir, writeFile } from "node:fs/promises";
 import { dirname } from "node:path";
 import { fileURLToPath } from "node:url";
-import { LibsqlError } from "@libsql/client";
 import { blue, yellow } from "kleur/colors";
 import {
   createServer,
@@ -10,8 +9,8 @@ import {
   mergeConfig
 } from "vite";
 import parseArgs from "yargs-parser";
-import { AstroDbError } from "../../runtime/utils.js";
-import { CONFIG_FILE_NAMES, DB_PATH } from "../consts.js";
+import { AstroDbError, isDbError } 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";
 import { SEED_DEV_FILE_NAME } from "../queries.js";
@@ -19,7 +18,6 @@ import { getDbDirectoryUrl, getManagedRemoteToken } from "../utils.js";
 import { fileURLIntegration } from "./file-url.js";
 import { getDtsContent } from "./typegen.js";
 import {
-  resolved,
   vitePluginDb
 } from "./vite-plugin-db.js";
 function astroDBIntegration() {
@@ -45,14 +43,13 @@ function astroDBIntegration() {
     inProgress: false
   };
   let command;
-  let output = "server";
+  let finalBuildOutput;
   return {
     name: "astro:db",
     hooks: {
       "astro:config:setup": async ({ updateConfig, config, command: _command, logger }) => {
         command = _command;
         root = config.root;
-        output = config.output;
         if (command === "preview") return;
         let dbPlugin = void 0;
         const args = parseArgs(process.argv.slice(3));
@@ -87,8 +84,9 @@ function astroDBIntegration() {
           }
         });
       },
-      "astro:config:done": async ({ config, injectTypes }) => {
+      "astro:config:done": async ({ config, injectTypes, buildOutput }) => {
         if (command === "preview") return;
+        finalBuildOutput = buildOutput;
         const { dbConfig, dependencies, integrationSeedPaths } = await resolveDbConfig(config);
         tables.get = () => dbConfig.tables;
         seedFiles.get = () => integrationSeedPaths;
@@ -126,14 +124,14 @@ function astroDBIntegration() {
             (name) => new URL(name, getDbDirectoryUrl(root))
           );
           if (seedFiles.get().length || localSeedPaths.find((path) => existsSync(path))) {
-            server.ssrLoadModule(resolved.module).catch((e) => {
+            server.ssrLoadModule(VIRTUAL_MODULE_ID).catch((e) => {
               logger.error(e instanceof Error ? e.message : String(e));
             });
           }
         }, 100);
       },
       "astro:build:start": async ({ logger }) => {
-        if (!connectToRemote && !databaseFileEnvDefined() && (output === "server" || output === "hybrid")) {
+        if (!connectToRemote && !databaseFileEnvDefined() && finalBuildOutput === "server") {
           const message = `Attempting to build without the --remote flag or the ASTRO_DATABASE_FILE environment variable defined. You probably want to pass --remote to astro build.`;
           const hint = "Learn more connecting to Studio: https://docs.astro.build/en/guides/astro-db/#connect-to-astro-studio";
           throw new AstroDbError(message, hint);
@@ -171,7 +169,7 @@ async function executeSeedFile({
   try {
     await mod.default();
   } catch (e) {
-    if (e instanceof LibsqlError) {
+    if (isDbError(e)) {
       throw new AstroDbError(EXEC_ERROR(e.message));
     }
     throw e;

package/dist/runtime/utils.d.ts

@@ -18,4 +18,5 @@ export declare class DetailedLibsqlError extends LibsqlError {
         cause?: Error;
     });
 }
+export declare function isDbError(err: unknown): err is LibsqlError;
 export declare function pathToFileURL(path: string): URL;

package/dist/runtime/utils.js

@@ -27,6 +27,9 @@ class DetailedLibsqlError extends LibsqlError {
     this.hint = hint;
   }
 }
+function isDbError(err) {
+  return err instanceof LibsqlError || err instanceof Error && err.libsqlError === true;
+}
 function slash(path) {
   const isExtendedLengthPath = path.startsWith("\\\\?\\");
   if (isExtendedLengthPath) {
@@ -47,6 +50,7 @@ function pathToFileURL(path) {
 export {
   AstroDbError,
   DetailedLibsqlError,
+  isDbError,
   pathToFileURL,
   safeFetch
 };

package/dist/runtime/virtual.js

@@ -1,4 +1,3 @@
-import { LibsqlError } from "@libsql/client";
 import { sql as _sql } from "drizzle-orm";
 function createColumn(type, schema) {
   return {
@@ -9,9 +8,6 @@ function createColumn(type, schema) {
     schema
   };
 }
-function isDbError(err) {
-  return err instanceof LibsqlError;
-}
 const column = {
   number: (opts = {}) => {
     return createColumn("number", opts);
@@ -71,6 +67,7 @@ import {
   min
 } from "drizzle-orm";
 import { alias } from "drizzle-orm/sqlite-core";
+import { isDbError } from "./utils.js";
 export {
   FALSE,
   NOW,

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@astrojs/db",
-  "version": "0.14.3",
+  "version": "0.14.4",
   "description": "Add libSQL and Astro Studio support to your Astro site",
   "license": "MIT",
   "repository": {
     "type": "git",
-    "url": "https://github.com/withastro/astro.git",
+    "url": "git+https://github.com/withastro/astro.git",
     "directory": "packages/db"
   },
   "bugs": "https://github.com/withastro/astro/issues",
@@ -68,13 +68,13 @@
     "drizzle-orm": "^0.31.2",
     "github-slugger": "^2.0.0",
     "kleur": "^4.1.5",
-    "nanoid": "^5.0.7",
+    "nanoid": "^5.0.9",
     "open": "^10.1.0",
-    "ora": "^8.1.0",
     "prompts": "^2.4.2",
     "yargs-parser": "^21.1.1",
+    "yocto-spinner": "^0.1.0",
     "zod": "^3.23.8",
-    "@astrojs/studio": "0.1.1"
+    "@astrojs/studio": "0.1.2"
   },
   "devDependencies": {
     "@types/deep-diff": "^1.0.5",
@@ -82,8 +82,8 @@
     "@types/yargs-parser": "^21.0.3",
     "cheerio": "1.0.0",
     "typescript": "^5.6.3",
-    "vite": "^5.4.9",
-    "astro": "4.16.7",
+    "vite": "^6.0.1",
+    "astro": "5.0.6",
     "astro-scripts": "0.0.14"
   },
   "scripts": {