@astrojs/db 0.9.3 → 0.9.4

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

@@ -34,7 +34,8 @@ async function cmd({
     const appToken = await getManagedAppTokenOrExit(flags.token);
     virtualModContents = getStudioVirtualModContents({
       tables: dbConfig.tables ?? {},
-      appToken: appToken.token
+      appToken: appToken.token,
+      isBuild: false
     });
   } else {
     virtualModContents = getLocalVirtualModContents({

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

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

package/dist/core/integration/index.js

@@ -38,7 +38,7 @@ function astroDBIntegration() {
           return;
         let dbPlugin = void 0;
         const args = parseArgs(process.argv.slice(3));
-        connectToStudio = args["remote"];
+        connectToStudio = process.env.ASTRO_INTERNAL_TEST_REMOTE || args["remote"];
         if (connectToStudio) {
           appToken = await getManagedAppTokenOrExit();
           dbPlugin = vitePluginDb({

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

@@ -27,8 +27,9 @@ export declare function getLocalVirtualModContents({ tables, root, seedFiles, sh
     root: URL;
     shouldSeed: boolean;
 }): string;
-export declare function getStudioVirtualModContents({ tables, appToken, }: {
+export declare function getStudioVirtualModContents({ tables, appToken, isBuild, }: {
     tables: DBTables;
     appToken: string;
+    isBuild: boolean;
 }): string;
 export {};

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

@@ -10,9 +10,13 @@ const resolved = {
 };
 function vitePluginDb(params) {
   const srcDirPath = normalizePath(fileURLToPath(params.srcDir));
+  let command = "build";
   return {
     name: "astro:db",
     enforce: "pre",
+    configResolved(resolvedConfig) {
+      command = resolvedConfig.command;
+    },
     async resolveId(id, rawImporter) {
       if (id !== VIRTUAL_MODULE_ID)
         return;
@@ -32,7 +36,8 @@ function vitePluginDb(params) {
       if (params.connectToStudio) {
         return getStudioVirtualModContents({
           appToken: params.appToken,
-          tables: params.tables.get()
+          tables: params.tables.get(),
+          isBuild: command === "build"
         });
       }
       return getLocalVirtualModContents({
@@ -89,15 +94,24 @@ ${getStringifiedCollectionExports(tables)}`;
 }
 function getStudioVirtualModContents({
   tables,
-  appToken
+  appToken,
+  isBuild
 }) {
+  function appTokenArg() {
+    if (isBuild) {
+      return "process.env.ASTRO_STUDIO_APP_TOKEN";
+    } else {
+      return JSON.stringify(appToken);
+    }
+  }
+  function dbUrlArg() {
+    const dbStr = JSON.stringify(getRemoteDatabaseUrl());
+    return `import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL ?? ${dbStr}`;
+  }
   return `
 import {asDrizzleTable, createRemoteDatabaseClient} from ${RUNTIME_IMPORT};
 
-export const db = await createRemoteDatabaseClient(process.env.ASTRO_STUDIO_APP_TOKEN ?? ${JSON.stringify(
-    appToken
-    // Respect runtime env for user overrides in SSR
-  )}, import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL ?? ${JSON.stringify(getRemoteDatabaseUrl())});
+export const db = await createRemoteDatabaseClient(${appTokenArg()}, ${dbUrlArg()});
 
 export * from ${RUNTIME_CONFIG_IMPORT};
 

package/dist/core/tokens.js

@@ -147,6 +147,12 @@ async function getManagedAppTokenOrExit(token) {
   if (token) {
     return new ManagedLocalAppToken(token);
   }
+  if (process.env.ASTRO_INTERNAL_TEST_REMOTE) {
+    return new ManagedLocalAppToken(
+      "fake"
+      /* token ignored in test */
+    );
+  }
   const { ASTRO_STUDIO_APP_TOKEN } = getAstroStudioEnv();
   if (ASTRO_STUDIO_APP_TOKEN) {
     return new ManagedLocalAppToken(ASTRO_STUDIO_APP_TOKEN);

package/dist/runtime/db-client.js

@@ -28,6 +28,9 @@ const remoteResultSchema = z.object({
   lastInsertRowid: z.unknown().optional()
 });
 function createRemoteDatabaseClient(appToken, remoteDbURL) {
+  if (appToken == null) {
+    throw new Error(`Cannot create a remote client: missing app token.`);
+  }
   const url = new URL("/db/query", remoteDbURL);
   const db = drizzleProxy(
     async (sql, parameters, method) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.9.3",
+  "version": "0.9.4",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -81,8 +81,8 @@
     "mocha": "^10.2.0",
     "typescript": "^5.2.2",
     "vite": "^5.1.4",
-    "astro-scripts": "0.0.14",
-    "astro": "4.5.8"
+    "astro": "4.5.9",
+    "astro-scripts": "0.0.14"
   },
   "scripts": {
     "types:config": "tsc -p ./tsconfig.config-types.json",