@astrojs/db 0.9.10 → 0.10.0

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

@@ -35,7 +35,8 @@ async function cmd({
     virtualModContents = getStudioVirtualModContents({
       tables: dbConfig.tables ?? {},
       appToken: appToken.token,
-      isBuild: false
+      isBuild: false,
+      output: "server"
     });
   } 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.10"}`
+        `v${"0.10.0"}`
       )} ${headline}`
     );
   }

package/dist/core/consts.d.ts

@@ -1,6 +1,6 @@
 export declare const PACKAGE_NAME: any;
 export declare const RUNTIME_IMPORT: string;
-export declare const RUNTIME_CONFIG_IMPORT: string;
+export declare const RUNTIME_VIRTUAL_IMPORT: string;
 export declare const DB_TYPES_FILE = "db-types.d.ts";
 export declare const VIRTUAL_MODULE_ID = "astro:db";
 export declare const DB_PATH = ".astro/content.db";

package/dist/core/consts.js

@@ -3,7 +3,7 @@ const PACKAGE_NAME = JSON.parse(
   readFileSync(new URL("../../package.json", import.meta.url), "utf8")
 ).name;
 const RUNTIME_IMPORT = JSON.stringify(`${PACKAGE_NAME}/runtime`);
-const RUNTIME_CONFIG_IMPORT = JSON.stringify(`${PACKAGE_NAME}/dist/runtime/config.js`);
+const RUNTIME_VIRTUAL_IMPORT = JSON.stringify(`${PACKAGE_NAME}/dist/runtime/virtual.js`);
 const DB_TYPES_FILE = "db-types.d.ts";
 const VIRTUAL_MODULE_ID = "astro:db";
 const DB_PATH = ".astro/content.db";
@@ -15,7 +15,7 @@ export {
   DB_TYPES_FILE,
   MIGRATION_VERSION,
   PACKAGE_NAME,
-  RUNTIME_CONFIG_IMPORT,
   RUNTIME_IMPORT,
+  RUNTIME_VIRTUAL_IMPORT,
   VIRTUAL_MODULE_ID
 };

package/dist/core/integration/index.js

@@ -51,7 +51,8 @@ function astroDBIntegration() {
             appToken: appToken.token,
             tables,
             root: config.root,
-            srcDir: config.srcDir
+            srcDir: config.srcDir,
+            output: config.output
           });
         } else {
           dbPlugin = vitePluginDb({
@@ -59,7 +60,8 @@ function astroDBIntegration() {
             tables,
             seedFiles,
             root: config.root,
-            srcDir: config.srcDir
+            srcDir: config.srcDir,
+            output: config.output
           });
         }
         updateConfig({

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

@@ -1,3 +1,4 @@
+import type { AstroConfig } from 'astro';
 import type { DBTables } from '../types.js';
 import { type VitePlugin } from '../utils.js';
 export declare const resolved: {
@@ -16,12 +17,14 @@ type VitePluginDBParams = {
     seedFiles: LateSeedFiles;
     srcDir: URL;
     root: URL;
+    output: AstroConfig['output'];
 } | {
     connectToStudio: true;
     tables: LateTables;
     appToken: string;
     srcDir: URL;
     root: URL;
+    output: AstroConfig['output'];
 };
 export declare function vitePluginDb(params: VitePluginDBParams): VitePlugin;
 export declare function getConfigVirtualModContents(): string;
@@ -31,9 +34,10 @@ export declare function getLocalVirtualModContents({ tables, root, seedFiles, sh
     root: URL;
     shouldSeed: boolean;
 }): string;
-export declare function getStudioVirtualModContents({ tables, appToken, isBuild, }: {
+export declare function getStudioVirtualModContents({ tables, appToken, isBuild, output, }: {
     tables: DBTables;
     appToken: string;
     isBuild: boolean;
+    output: AstroConfig['output'];
 }): string;
 export {};

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

@@ -1,7 +1,7 @@
 import { fileURLToPath } from "node:url";
 import { normalizePath } from "vite";
 import { SEED_DEV_FILE_NAME } from "../../runtime/queries.js";
-import { DB_PATH, RUNTIME_CONFIG_IMPORT, RUNTIME_IMPORT, VIRTUAL_MODULE_ID } from "../consts.js";
+import { DB_PATH, RUNTIME_IMPORT, RUNTIME_VIRTUAL_IMPORT, VIRTUAL_MODULE_ID } from "../consts.js";
 import { getDbDirectoryUrl, getRemoteDatabaseUrl } from "../utils.js";
 const WITH_SEED_VIRTUAL_MODULE_ID = "astro:db:seed";
 const resolved = {
@@ -37,7 +37,8 @@ function vitePluginDb(params) {
         return getStudioVirtualModContents({
           appToken: params.appToken,
           tables: params.tables.get(),
-          isBuild: command === "build"
+          isBuild: command === "build",
+          output: params.output
         });
       }
       return getLocalVirtualModContents({
@@ -50,7 +51,7 @@ function vitePluginDb(params) {
   };
 }
 function getConfigVirtualModContents() {
-  return `export * from ${RUNTIME_CONFIG_IMPORT}`;
+  return `export * from ${RUNTIME_VIRTUAL_IMPORT}`;
 }
 function getLocalVirtualModContents({
   tables,
@@ -88,18 +89,23 @@ ${shouldSeed ? `await seedLocal({
 	integrationSeedFunctions: [${integrationSeedImportNames.join(",")}],
 });` : ""}
 
-export * from ${RUNTIME_CONFIG_IMPORT};
+export * from ${RUNTIME_VIRTUAL_IMPORT};
 
 ${getStringifiedTableExports(tables)}`;
 }
 function getStudioVirtualModContents({
   tables,
   appToken,
-  isBuild
+  isBuild,
+  output
 }) {
   function appTokenArg() {
     if (isBuild) {
-      return "process.env.ASTRO_STUDIO_APP_TOKEN";
+      if (output === "server") {
+        return "process.env.ASTRO_STUDIO_APP_TOKEN";
+      } else {
+        return `process.env.ASTRO_STUDIO_APP_TOKEN ?? ${JSON.stringify(appToken)}`;
+      }
     } else {
       return JSON.stringify(appToken);
     }
@@ -113,7 +119,7 @@ import {asDrizzleTable, createRemoteDatabaseClient} from ${RUNTIME_IMPORT};
 
 export const db = await createRemoteDatabaseClient(${appTokenArg()}, ${dbUrlArg()});
 
-export * from ${RUNTIME_CONFIG_IMPORT};
+export * from ${RUNTIME_VIRTUAL_IMPORT};
 
 ${getStringifiedTableExports(tables)}
 	`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.9.10",
+  "version": "0.10.0",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -20,8 +20,8 @@
       "types": "./dist/runtime/index.d.ts",
       "import": "./dist/runtime/index.js"
     },
-    "./dist/runtime/config.js": {
-      "import": "./dist/runtime/config.js"
+    "./dist/runtime/virtual.js": {
+      "import": "./dist/runtime/virtual.js"
     },
     "./types": {
       "types": "./dist/core/types.d.ts",
@@ -81,12 +81,12 @@
     "mocha": "^10.2.0",
     "typescript": "^5.2.2",
     "vite": "^5.1.4",
-    "astro": "4.5.13",
+    "astro": "4.5.15",
     "astro-scripts": "0.0.14"
   },
   "scripts": {
-    "types:config": "tsc -p ./tsconfig.config-types.json",
-    "build": "astro-scripts build \"src/**/*.ts\" && tsc && pnpm types:config",
+    "types:virtual": "tsc -p ./tsconfig.virtual.json",
+    "build": "astro-scripts build \"src/**/*.ts\" && tsc && pnpm types:virtual",
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
     "test": "mocha --exit --timeout 20000 \"test/*.js\" \"test/unit/**/*.js\"",

package/virtual.d.ts

@@ -1,7 +1,7 @@
 declare module 'astro:db' {
-	type RuntimeConfig = typeof import('./dist/_internal/runtime/config.js');
+	type RuntimeConfig = typeof import('./dist/_internal/runtime/virtual.js');
 
-	export const db: import('./dist/_internal/runtime/config.js').Database;
+	export const db: import('./dist/_internal/runtime/virtual.js').Database;
 	export const dbUrl: string;
 
 	export const sql: RuntimeConfig['sql'];