@astrojs/db 0.14.0 → 0.14.1

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

@@ -1,3 +1,4 @@
+import { type ManagedAppToken } from '@astrojs/studio';
 import type { AstroConfig, AstroIntegration } from 'astro';
 import './types.js';
 export type VitePlugin = Required<AstroConfig['vite']>['plugins'][number];
@@ -7,6 +8,7 @@ export type RemoteDatabaseInfo = {
     url: string;
 };
 export declare function getRemoteDatabaseInfo(): RemoteDatabaseInfo;
+export declare function getManagedRemoteToken(token?: string, dbInfo?: RemoteDatabaseInfo): Promise<ManagedAppToken>;
 export declare function getDbDirectoryUrl(root: URL | string): URL;
 export declare function defineDbIntegration(integration: AstroIntegration): AstroIntegration;
 export type Result<T> = {

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

@@ -1,5 +1,4 @@
 import { existsSync } from "node:fs";
-import { getManagedAppTokenOrExit } from "@astrojs/studio";
 import { LibsqlError } from "@libsql/client";
 import { green } from "kleur/colors";
 import {
@@ -13,6 +12,7 @@ import {
   getStudioVirtualModContents
 } from "../../../integration/vite-plugin-db.js";
 import { bundleFile, importBundledFile } from "../../../load-file.js";
+import { getManagedRemoteToken } from "../../../utils.js";
 async function cmd({
   astroConfig,
   dbConfig,
@@ -30,7 +30,7 @@ async function cmd({
   }
   let virtualModContents;
   if (flags.remote) {
-    const appToken = await getManagedAppTokenOrExit(flags.token);
+    const appToken = await getManagedRemoteToken(flags.token);
     virtualModContents = getStudioVirtualModContents({
       tables: dbConfig.tables ?? {},
       appToken: appToken.token,

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

@@ -1,10 +1,12 @@
-import { getManagedAppTokenOrExit } from "@astrojs/studio";
 import { sql } from "drizzle-orm";
 import prompts from "prompts";
 import { createRemoteDatabaseClient } from "../../../../runtime/index.js";
 import { safeFetch } from "../../../../runtime/utils.js";
 import { MIGRATION_VERSION } from "../../../consts.js";
-import { getRemoteDatabaseInfo } from "../../../utils.js";
+import {
+  getManagedRemoteToken,
+  getRemoteDatabaseInfo
+} from "../../../utils.js";
 import {
   createCurrentSnapshot,
   createEmptySnapshot,
@@ -18,8 +20,12 @@ async function cmd({
 }) {
   const isDryRun = flags.dryRun;
   const isForceReset = flags.forceReset;
-  const appToken = await getManagedAppTokenOrExit(flags.token);
-  const productionSnapshot = await getProductionCurrentSnapshot({ appToken: appToken.token });
+  const dbInfo = getRemoteDatabaseInfo();
+  const appToken = await getManagedRemoteToken(flags.token, dbInfo);
+  const productionSnapshot = await getProductionCurrentSnapshot({
+    dbInfo,
+    appToken: appToken.token
+  });
   const currentSnapshot = createCurrentSnapshot(dbConfig);
   const isFromScratch = !productionSnapshot;
   const { queries: migrationQueries, confirmations } = await getMigrationQueries({
@@ -54,6 +60,7 @@ async function cmd({
     console.log(`Pushing database schema updates...`);
     await pushSchema({
       statements: migrationQueries,
+      dbInfo,
       appToken: appToken.token,
       isDryRun,
       currentSnapshot
@@ -64,6 +71,7 @@ async function cmd({
 }
 async function pushSchema({
   statements,
+  dbInfo,
   appToken,
   isDryRun,
   currentSnapshot
@@ -77,7 +85,6 @@ async function pushSchema({
     console.info("[DRY RUN] Batch query:", JSON.stringify(requestBody, null, 2));
     return new Response(null, { status: 200 });
   }
-  const dbInfo = getRemoteDatabaseInfo();
   return dbInfo.type === "studio" ? pushToStudio(requestBody, appToken, dbInfo.url) : pushToDb(requestBody, appToken, dbInfo.url);
 }
 async function pushToDb(requestBody, appToken, remoteUrl) {

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

@@ -1,4 +1,3 @@
-import { getManagedAppTokenOrExit } from "@astrojs/studio";
 import { sql } from "drizzle-orm";
 import {
   createLocalDatabaseClient,
@@ -7,7 +6,7 @@ import {
 import { normalizeDatabaseUrl } from "../../../../runtime/index.js";
 import { DB_PATH } from "../../../consts.js";
 import { SHELL_QUERY_MISSING_ERROR } from "../../../errors.js";
-import { getAstroEnv, getRemoteDatabaseInfo } from "../../../utils.js";
+import { getAstroEnv, getManagedRemoteToken, getRemoteDatabaseInfo } from "../../../utils.js";
 async function cmd({
   flags,
   astroConfig
@@ -19,7 +18,7 @@ async function cmd({
   }
   const dbInfo = getRemoteDatabaseInfo();
   if (flags.remote) {
-    const appToken = await getManagedAppTokenOrExit(flags.token);
+    const appToken = await getManagedRemoteToken(flags.token, dbInfo);
     const db = createRemoteDatabaseClient({
       dbType: dbInfo.type,
       remoteUrl: dbInfo.url,

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

@@ -1,4 +1,4 @@
-import { getManagedAppTokenOrExit } from "@astrojs/studio";
+import { getManagedRemoteToken, getRemoteDatabaseInfo } from "../../../utils.js";
 import {
   createCurrentSnapshot,
   createEmptySnapshot,
@@ -11,8 +11,12 @@ async function cmd({
   flags
 }) {
   const isJson = flags.json;
-  const appToken = await getManagedAppTokenOrExit(flags.token);
-  const productionSnapshot = await getProductionCurrentSnapshot({ appToken: appToken.token });
+  const dbInfo = getRemoteDatabaseInfo();
+  const appToken = await getManagedRemoteToken(flags.token, dbInfo);
+  const productionSnapshot = await getProductionCurrentSnapshot({
+    dbInfo,
+    appToken: appToken.token
+  });
   const currentSnapshot = createCurrentSnapshot(dbConfig);
   const { queries: migrationQueries, confirmations } = await getMigrationQueries({
     oldSnapshot: productionSnapshot || createEmptySnapshot(),

package/dist/core/cli/migration-queries.d.ts

@@ -1,4 +1,5 @@
 import type { DBConfig, DBSnapshot, ResolvedDBTable } from '../types.js';
+import type { RemoteDatabaseInfo } from '../utils.js';
 export declare function getMigrationQueries({ oldSnapshot, newSnapshot, reset, }: {
     oldSnapshot: DBSnapshot;
     newSnapshot: DBSnapshot;
@@ -16,6 +17,7 @@ export declare function getTableChangeQueries({ tableName, oldTable, newTable, }
     confirmations: string[];
 }>;
 export declare function getProductionCurrentSnapshot(options: {
+    dbInfo: RemoteDatabaseInfo;
     appToken: string;
 }): Promise<DBSnapshot | undefined>;
 export declare function createCurrentSnapshot({ tables }: DBConfig): DBSnapshot;

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

@@ -20,7 +20,6 @@ import {
   schemaTypeToSqlType
 } from "../queries.js";
 import { columnSchema } from "../schemas.js";
-import { getRemoteDatabaseInfo } from "../utils.js";
 const sqlite = new SQLiteAsyncDialect();
 const genTempTableName = customAlphabet("abcdefghijklmnopqrstuvwxyz", 10);
 async function getMigrationQueries({
@@ -305,8 +304,7 @@ function hasRuntimeDefault(column) {
   return !!(column.schema.default && isSerializedSQL(column.schema.default));
 }
 function getProductionCurrentSnapshot(options) {
-  const dbInfo = getRemoteDatabaseInfo();
-  return dbInfo.type === "studio" ? getStudioCurrentSnapshot(options.appToken, dbInfo.url) : getDbCurrentSnapshot(options.appToken, dbInfo.url);
+  return options.dbInfo.type === "studio" ? getStudioCurrentSnapshot(options.appToken, options.dbInfo.url) : getDbCurrentSnapshot(options.appToken, options.dbInfo.url);
 }
 async function getDbCurrentSnapshot(appToken, remoteUrl) {
   const client = createRemoteDatabaseClient({

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

@@ -27,7 +27,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"0.14.0"}`
+        `v${"0.14.1"}`
       )} ${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 { getManagedAppTokenOrExit } from "@astrojs/studio";
 import { LibsqlError } from "@libsql/client";
 import { blue, yellow } from "kleur/colors";
 import {
@@ -16,7 +15,7 @@ import { CONFIG_FILE_NAMES, DB_PATH } 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";
-import { getDbDirectoryUrl } from "../utils.js";
+import { getDbDirectoryUrl, getManagedRemoteToken } from "../utils.js";
 import { fileURLIntegration } from "./file-url.js";
 import { getDtsContent } from "./typegen.js";
 import {
@@ -24,7 +23,7 @@ import {
   vitePluginDb
 } from "./vite-plugin-db.js";
 function astroDBIntegration() {
-  let connectToStudio = false;
+  let connectToRemote = false;
   let configFileDependencies = [];
   let root;
   let appToken;
@@ -57,11 +56,11 @@ function astroDBIntegration() {
         if (command === "preview") return;
         let dbPlugin = void 0;
         const args = parseArgs(process.argv.slice(3));
-        connectToStudio = process.env.ASTRO_INTERNAL_TEST_REMOTE || args["remote"];
-        if (connectToStudio) {
-          appToken = await getManagedAppTokenOrExit();
+        connectToRemote = process.env.ASTRO_INTERNAL_TEST_REMOTE || args["remote"];
+        if (connectToRemote) {
+          appToken = await getManagedRemoteToken();
           dbPlugin = vitePluginDb({
-            connectToStudio,
+            connectToStudio: connectToRemote,
             appToken: appToken.token,
             tables,
             root: config.root,
@@ -95,7 +94,7 @@ function astroDBIntegration() {
         seedFiles.get = () => integrationSeedPaths;
         configFileDependencies = dependencies;
         const localDbUrl = new URL(DB_PATH, config.root);
-        if (!connectToStudio && !existsSync(localDbUrl)) {
+        if (!connectToRemote && !existsSync(localDbUrl)) {
           await mkdir(dirname(fileURLToPath(localDbUrl)), { recursive: true });
           await writeFile(localDbUrl, "");
         }
@@ -120,9 +119,9 @@ function astroDBIntegration() {
         });
         setTimeout(() => {
           logger.info(
-            connectToStudio ? "Connected to remote database." : "New local database created."
+            connectToRemote ? "Connected to remote database." : "New local database created."
           );
-          if (connectToStudio) return;
+          if (connectToRemote) return;
           const localSeedPaths = SEED_DEV_FILE_NAME.map(
             (name) => new URL(name, getDbDirectoryUrl(root))
           );
@@ -134,12 +133,12 @@ function astroDBIntegration() {
         }, 100);
       },
       "astro:build:start": async ({ logger }) => {
-        if (!connectToStudio && !databaseFileEnvDefined() && (output === "server" || output === "hybrid")) {
+        if (!connectToRemote && !databaseFileEnvDefined() && (output === "server" || output === "hybrid")) {
           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);
         }
-        logger.info("database: " + (connectToStudio ? yellow("remote") : blue("local database.")));
+        logger.info("database: " + (connectToRemote ? yellow("remote") : blue("local database.")));
       },
       "astro:build:setup": async ({ vite }) => {
         tempViteServer = await getTempViteServer({ viteConfig: vite });

package/dist/core/utils.d.ts

@@ -1,3 +1,4 @@
+import { type ManagedAppToken } from '@astrojs/studio';
 import type { AstroConfig, AstroIntegration } from 'astro';
 import './types.js';
 export type VitePlugin = Required<AstroConfig['vite']>['plugins'][number];
@@ -7,6 +8,7 @@ export type RemoteDatabaseInfo = {
     url: string;
 };
 export declare function getRemoteDatabaseInfo(): RemoteDatabaseInfo;
+export declare function getManagedRemoteToken(token?: string, dbInfo?: RemoteDatabaseInfo): Promise<ManagedAppToken>;
 export declare function getDbDirectoryUrl(root: URL | string): URL;
 export declare function defineDbIntegration(integration: AstroIntegration): AstroIntegration;
 export type Result<T> = {

package/dist/core/utils.js

@@ -1,4 +1,4 @@
-import { getAstroStudioEnv } from "@astrojs/studio";
+import { getAstroStudioEnv, getManagedAppTokenOrExit } from "@astrojs/studio";
 import { loadEnv } from "vite";
 import "./types.js";
 function getAstroEnv(envMode = "") {
@@ -23,6 +23,18 @@ function getRemoteDatabaseInfo() {
     url: "https://db.services.astro.build"
   };
 }
+function getManagedRemoteToken(token, dbInfo) {
+  dbInfo ??= getRemoteDatabaseInfo();
+  if (dbInfo.type === "studio") {
+    return getManagedAppTokenOrExit(token);
+  }
+  const astroEnv = getAstroEnv();
+  return Promise.resolve({
+    token: token ?? astroEnv.ASTRO_DB_APP_TOKEN,
+    renew: () => Promise.resolve(),
+    destroy: () => Promise.resolve()
+  });
+}
 function getDbDirectoryUrl(root) {
   return new URL("db/", root);
 }
@@ -38,6 +50,7 @@ export {
   defineDbIntegration,
   getAstroEnv,
   getDbDirectoryUrl,
+  getManagedRemoteToken,
   getRemoteDatabaseInfo,
   mapObject
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.14.0",
+  "version": "0.14.1",
   "description": "Add libSQL and Astro Studio support to your Astro site",
   "license": "MIT",
   "repository": {
@@ -84,7 +84,7 @@
     "cheerio": "1.0.0",
     "typescript": "^5.5.4",
     "vite": "^5.4.2",
-    "astro": "4.15.0",
+    "astro": "4.15.3",
     "astro-scripts": "0.0.14"
   },
   "scripts": {