@astrojs/db 0.15.0 → 0.16.0

package/dist/core/cli/index.js

@@ -32,18 +32,6 @@ async function cli({
       const { cmd } = await import("./commands/execute/index.js");
       return await cmd({ astroConfig, dbConfig, flags });
     }
-    case "login": {
-      const { cmd } = await import("./commands/login/index.js");
-      return await cmd({ astroConfig, dbConfig, flags });
-    }
-    case "logout": {
-      const { cmd } = await import("./commands/logout/index.js");
-      return await cmd();
-    }
-    case "link": {
-      const { cmd } = await import("./commands/link/index.js");
-      return await cmd();
-    }
     default: {
       if (command != null) {
         console.error(`Unknown command: ${command}`);
@@ -54,15 +42,15 @@ async function cli({
         headline: " ",
         tables: {
           Commands: [
-            ["push", "Push table schema updates to Astro Studio."],
-            ["verify", "Test schema updates /w Astro Studio (good for CI)."],
+            ["push", "Push table schema updates to libSQL."],
+            ["verify", "Test schema updates with libSQL (good for CI)."],
             [
               "astro db execute <file-path>",
-              "Execute a ts/js file using astro:db. Use --remote to connect to Studio."
+              "Execute a ts/js file using astro:db. Use --remote to connect to libSQL."
             ],
             [
               "astro db shell --query <sql-string>",
-              "Execute a SQL string. Use --remote to connect to Studio."
+              "Execute a SQL string. Use --remote to connect to libSQL."
             ]
           ]
         }

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

@@ -16,10 +16,7 @@ export declare function getTableChangeQueries({ tableName, oldTable, newTable, }
     queries: string[];
     confirmations: string[];
 }>;
-export declare function getProductionCurrentSnapshot(options: {
-    dbInfo: RemoteDatabaseInfo;
-    appToken: string;
-}): Promise<DBSnapshot | undefined>;
+export declare function getProductionCurrentSnapshot({ url, token, }: RemoteDatabaseInfo): Promise<DBSnapshot | undefined>;
 export declare function createCurrentSnapshot({ tables }: DBConfig): DBSnapshot;
 export declare function createEmptySnapshot(): DBSnapshot;
 export declare function formatDataLossMessage(confirmations: string[], isColor?: boolean): string;

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

@@ -4,10 +4,9 @@ import { sql } from "drizzle-orm";
 import { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core";
 import * as color from "kleur/colors";
 import { customAlphabet } from "nanoid";
-import { hasPrimaryKey } from "../../runtime/index.js";
-import { createRemoteDatabaseClient } from "../../runtime/index.js";
+import { createRemoteDatabaseClient, hasPrimaryKey } from "../../runtime/index.js";
 import { isSerializedSQL } from "../../runtime/types.js";
-import { isDbError, safeFetch } from "../../runtime/utils.js";
+import { isDbError } from "../../runtime/utils.js";
 import { MIGRATION_VERSION } from "../consts.js";
 import { RENAME_COLUMN_ERROR, RENAME_TABLE_ERROR } from "../errors.js";
 import {
@@ -303,14 +302,16 @@ function canChangeTypeWithoutQuery(oldColumn, newColumn) {
 function hasRuntimeDefault(column) {
   return !!(column.schema.default && isSerializedSQL(column.schema.default));
 }
-function getProductionCurrentSnapshot(options) {
-  return options.dbInfo.type === "studio" ? getStudioCurrentSnapshot(options.appToken, options.dbInfo.url) : getDbCurrentSnapshot(options.appToken, options.dbInfo.url);
+function getProductionCurrentSnapshot({
+  url,
+  token
+}) {
+  return getDbCurrentSnapshot(token, url);
 }
 async function getDbCurrentSnapshot(appToken, remoteUrl) {
   const client = createRemoteDatabaseClient({
-    dbType: "libsql",
-    appToken,
-    remoteUrl
+    token: appToken,
+    url: remoteUrl
   });
   try {
     const res = await client.get(
@@ -331,30 +332,6 @@ async function getDbCurrentSnapshot(appToken, remoteUrl) {
     throw error;
   }
 }
-async function getStudioCurrentSnapshot(appToken, remoteUrl) {
-  const url = new URL("/db/schema", remoteUrl);
-  const response = await safeFetch(
-    url,
-    {
-      method: "POST",
-      headers: new Headers({
-        Authorization: `Bearer ${appToken}`
-      })
-    },
-    async (res) => {
-      console.error(`${url.toString()} failed: ${res.status} ${res.statusText}`);
-      console.error(await res.text());
-      throw new Error(`/db/schema fetch failed: ${res.status} ${res.statusText}`);
-    }
-  );
-  const result = await response.json();
-  if (!result.success) {
-    console.error(`${url.toString()} unsuccessful`);
-    console.error(await response.text());
-    throw new Error(`/db/schema fetch unsuccessful`);
-  }
-  return result.data;
-}
 function getDropTableQueriesForSnapshot(snapshot) {
   const queries = [];
   for (const tableName of Object.keys(snapshot.schema)) {

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

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

package/dist/core/integration/index.js

@@ -14,7 +14,7 @@ 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";
-import { getDbDirectoryUrl, getManagedRemoteToken } from "../utils.js";
+import { getDbDirectoryUrl, getRemoteDatabaseInfo } from "../utils.js";
 import { fileURLIntegration } from "./file-url.js";
 import { getDtsContent } from "./typegen.js";
 import {
@@ -24,7 +24,6 @@ function astroDBIntegration() {
   let connectToRemote = false;
   let configFileDependencies = [];
   let root;
-  let appToken;
   let tempViteServer;
   let tables = {
     get() {
@@ -55,10 +54,9 @@ function astroDBIntegration() {
         const args = parseArgs(process.argv.slice(3));
         connectToRemote = process.env.ASTRO_INTERNAL_TEST_REMOTE || args["remote"];
         if (connectToRemote) {
-          appToken = await getManagedRemoteToken();
           dbPlugin = vitePluginDb({
-            connectToStudio: connectToRemote,
-            appToken: appToken.token,
+            connectToRemote,
+            appToken: getRemoteDatabaseInfo().token,
             tables,
             root: config.root,
             srcDir: config.srcDir,
@@ -67,7 +65,7 @@ function astroDBIntegration() {
           });
         } else {
           dbPlugin = vitePluginDb({
-            connectToStudio: false,
+            connectToRemote,
             tables,
             seedFiles,
             root: config.root,
@@ -133,7 +131,7 @@ function astroDBIntegration() {
       "astro:build:start": async ({ logger }) => {
         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";
+          const hint = "Learn more connecting to libSQL: https://docs.astro.build/en/guides/astro-db/#connect-a-libsql-database-for-production";
           throw new AstroDbError(message, hint);
         }
         logger.info("database: " + (connectToRemote ? yellow("remote") : blue("local database.")));
@@ -145,7 +143,6 @@ function astroDBIntegration() {
         };
       },
       "astro:build:done": async ({}) => {
-        await appToken?.destroy();
         await tempViteServer?.close();
       }
     }

package/dist/core/integration/vite-plugin-db.d.ts

@@ -12,7 +12,7 @@ export type SeedHandler = {
     execute: (fileUrl: URL) => Promise<void>;
 };
 type VitePluginDBParams = {
-    connectToStudio: false;
+    connectToRemote: false;
     tables: LateTables;
     seedFiles: LateSeedFiles;
     srcDir: URL;
@@ -21,7 +21,7 @@ type VitePluginDBParams = {
     output: AstroConfig['output'];
     seedHandler: SeedHandler;
 } | {
-    connectToStudio: true;
+    connectToRemote: true;
     tables: LateTables;
     appToken: string;
     srcDir: URL;
@@ -31,11 +31,11 @@ type VitePluginDBParams = {
 };
 export declare function vitePluginDb(params: VitePluginDBParams): VitePlugin;
 export declare function getConfigVirtualModContents(): string;
-export declare function getLocalVirtualModContents({ tables, root, }: {
+export declare function getLocalVirtualModContents({ tables, root }: {
     tables: DBTables;
     root: URL;
 }): string;
-export declare function getStudioVirtualModContents({ tables, appToken, isBuild, output, }: {
+export declare function getRemoteVirtualModContents({ tables, appToken, isBuild, output, }: {
     tables: DBTables;
     appToken: string;
     isBuild: boolean;

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

@@ -6,7 +6,7 @@ import { createLocalDatabaseClient } from "../../runtime/db-client.js";
 import { normalizeDatabaseUrl } from "../../runtime/index.js";
 import { DB_PATH, RUNTIME_IMPORT, RUNTIME_VIRTUAL_IMPORT, VIRTUAL_MODULE_ID } from "../consts.js";
 import { getResolvedFileUrl } from "../load-file.js";
-import { SEED_DEV_FILE_NAME, getCreateIndexQueries, getCreateTableQuery } from "../queries.js";
+import { getCreateIndexQueries, getCreateTableQuery, SEED_DEV_FILE_NAME } from "../queries.js";
 import {
   getAstroEnv,
   getDbDirectoryUrl,
@@ -33,8 +33,8 @@ function vitePluginDb(params) {
     },
     async load(id) {
       if (id !== resolved.module && id !== resolved.importedFromSeedFile) return;
-      if (params.connectToStudio) {
-        return getStudioVirtualModContents({
+      if (params.connectToRemote) {
+        return getRemoteVirtualModContents({
           appToken: params.appToken,
           tables: params.tables.get(),
           isBuild: command === "build",
@@ -70,10 +70,7 @@ function vitePluginDb(params) {
 function getConfigVirtualModContents() {
   return `export * from ${RUNTIME_VIRTUAL_IMPORT}`;
 }
-function getLocalVirtualModContents({
-  tables,
-  root
-}) {
+function getLocalVirtualModContents({ tables, root }) {
   const { ASTRO_DATABASE_FILE } = getAstroEnv();
   const dbInfo = getRemoteDatabaseInfo();
   const dbUrl = new URL(DB_PATH, root);
@@ -87,7 +84,7 @@ export * from ${RUNTIME_VIRTUAL_IMPORT};
 
 ${getStringifiedTableExports(tables)}`;
 }
-function getStudioVirtualModContents({
+function getRemoteVirtualModContents({
   tables,
   appToken,
   isBuild,
@@ -96,11 +93,10 @@ function getStudioVirtualModContents({
   const dbInfo = getRemoteDatabaseInfo();
   function appTokenArg() {
     if (isBuild) {
-      const envPrefix = dbInfo.type === "studio" ? "ASTRO_STUDIO" : "ASTRO_DB";
       if (output === "server") {
-        return `process.env.${envPrefix}_APP_TOKEN`;
+        return `process.env.ASTRO_DB_APP_TOKEN`;
       } else {
-        return `process.env.${envPrefix}_APP_TOKEN ?? ${JSON.stringify(appToken)}`;
+        return `process.env.ASTRO_DB_APP_TOKEN ?? ${JSON.stringify(appToken)}`;
       }
     } else {
       return JSON.stringify(appToken);
@@ -109,7 +105,7 @@ function getStudioVirtualModContents({
   function dbUrlArg() {
     const dbStr = JSON.stringify(dbInfo.url);
     if (isBuild) {
-      return dbInfo.type === "studio" ? `import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL ?? ${dbStr}` : `import.meta.env.ASTRO_DB_REMOTE_URL ?? ${dbStr}`;
+      return `import.meta.env.ASTRO_DB_REMOTE_URL ?? ${dbStr}`;
     } else {
       return dbStr;
     }
@@ -118,9 +114,8 @@ function getStudioVirtualModContents({
 import {asDrizzleTable, createRemoteDatabaseClient} from ${RUNTIME_IMPORT};
 
 export const db = await createRemoteDatabaseClient({
-  dbType: ${JSON.stringify(dbInfo.type)},
-  remoteUrl: ${dbUrlArg()},
-  appToken: ${appTokenArg()},
+  url: ${dbUrlArg()},
+  token: ${appTokenArg()},
 });
 
 export * from ${RUNTIME_VIRTUAL_IMPORT};
@@ -137,10 +132,9 @@ function getStringifiedTableExports(tables) {
 }
 const sqlite = new SQLiteAsyncDialect();
 async function recreateTables({ tables, root }) {
-  const dbInfo = getRemoteDatabaseInfo();
   const { ASTRO_DATABASE_FILE } = getAstroEnv();
   const dbUrl = normalizeDatabaseUrl(ASTRO_DATABASE_FILE, new URL(DB_PATH, root).href);
-  const db = createLocalDatabaseClient({ dbUrl, enableTransactions: dbInfo.type === "libsql" });
+  const db = createLocalDatabaseClient({ dbUrl });
   const setupQueries = [];
   for (const [name, table] of Object.entries(tables.get() ?? {})) {
     const dropQuery = sql.raw(`DROP TABLE IF EXISTS ${sqlite.escapeName(name)}`);
@@ -153,10 +147,7 @@ async function recreateTables({ tables, root }) {
     ...setupQueries.map((q) => db.run(q))
   ]);
 }
-function getResolvedSeedFiles({
-  root,
-  seedFiles
-}) {
+function getResolvedSeedFiles({ root, seedFiles }) {
   const localSeedFiles = SEED_DEV_FILE_NAME.map((name) => new URL(name, getDbDirectoryUrl(root)));
   const integrationSeedFiles = seedFiles.get().map((s) => getResolvedFileUrl(root, s));
   return [...integrationSeedFiles, ...localSeedFiles];
@@ -164,6 +155,6 @@ function getResolvedSeedFiles({
 export {
   getConfigVirtualModContents,
   getLocalVirtualModContents,
-  getStudioVirtualModContents,
+  getRemoteVirtualModContents,
   vitePluginDb
 };

package/dist/core/load-file.d.ts

@@ -18,10 +18,10 @@ export declare function resolveDbConfig({ root, integrations, }: Pick<AstroConfi
                     optional: boolean;
                     unique: boolean;
                     deprecated: boolean;
+                    default?: boolean | import("../runtime/types.js").SerializedSQL | undefined;
                     name?: string | undefined;
                     label?: string | undefined;
                     collection?: string | undefined;
-                    default?: boolean | import("../runtime/types.js").SerializedSQL | undefined;
                 };
             } | {
                 type: "number";
@@ -37,8 +37,8 @@ export declare function resolveDbConfig({ root, integrations, }: Pick<AstroConfi
                     default?: number | import("../runtime/types.js").SerializedSQL | undefined;
                 } | {
                     primaryKey: true;
-                    optional?: false | undefined;
                     default?: undefined;
+                    optional?: false | undefined;
                 })) & {
                     references?: import("./types.js").NumberColumn;
                 };
@@ -47,10 +47,10 @@ export declare function resolveDbConfig({ root, integrations, }: Pick<AstroConfi
                 schema: ({
                     unique: boolean;
                     deprecated: boolean;
+                    default?: string | import("../runtime/types.js").SerializedSQL | undefined;
                     name?: string | undefined;
                     label?: string | undefined;
                     collection?: string | undefined;
-                    default?: string | import("../runtime/types.js").SerializedSQL | undefined;
                     multiline?: boolean | undefined;
                 } & ({
                     optional: boolean;
@@ -67,10 +67,10 @@ export declare function resolveDbConfig({ root, integrations, }: Pick<AstroConfi
                     optional: boolean;
                     unique: boolean;
                     deprecated: boolean;
+                    default?: string | import("../runtime/types.js").SerializedSQL | undefined;
                     name?: string | undefined;
                     label?: string | undefined;
                     collection?: string | undefined;
-                    default?: string | import("../runtime/types.js").SerializedSQL | undefined;
                 };
             } | {
                 type: "json";
@@ -78,10 +78,10 @@ export declare function resolveDbConfig({ root, integrations, }: Pick<AstroConfi
                     optional: boolean;
                     unique: boolean;
                     deprecated: boolean;
+                    default?: unknown;
                     name?: string | undefined;
                     label?: string | undefined;
                     collection?: string | undefined;
-                    default?: unknown;
                 };
             }>;
             foreignKeys?: (Omit<{

package/dist/core/load-file.js

@@ -115,8 +115,6 @@ async function bundleFile({
     sourcemap: "inline",
     metafile: true,
     define: {
-      "import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL": "undefined",
-      "import.meta.env.ASTRO_DB_REMOTE_DB_URL": "undefined",
       "import.meta.env.ASTRO_DATABASE_FILE": JSON.stringify(ASTRO_DATABASE_FILE ?? "")
     },
     plugins: [

package/dist/core/queries.d.ts

@@ -1,4 +1,4 @@
-import type { BooleanColumn, ColumnType, DBColumn, DBTable, DateColumn, JsonColumn, NumberColumn, TextColumn } from './types.js';
+import type { BooleanColumn, ColumnType, DateColumn, DBColumn, DBTable, JsonColumn, NumberColumn, TextColumn } from './types.js';
 export declare const SEED_DEV_FILE_NAME: string[];
 export declare function getDropTableIfExistsQuery(tableName: string): string;
 export declare function getCreateTableQuery(tableName: string, table: DBTable): string;
@@ -19,8 +19,8 @@ export declare function getReferencesConfig(column: DBColumn): {
         default?: number | import("../runtime/types.js").SerializedSQL | undefined;
     } | {
         primaryKey: true;
-        optional?: false | undefined;
         default?: undefined;
+        optional?: false | undefined;
     })) & {
         references?: NumberColumn;
     };
@@ -29,10 +29,10 @@ export declare function getReferencesConfig(column: DBColumn): {
     schema: ({
         unique: boolean;
         deprecated: boolean;
+        default?: string | import("../runtime/types.js").SerializedSQL | undefined;
         name?: string | undefined;
         label?: string | undefined;
         collection?: string | undefined;
-        default?: string | import("../runtime/types.js").SerializedSQL | undefined;
         multiline?: boolean | undefined;
     } & ({
         optional: boolean;