@astrojs/db 0.1.3 → 0.1.5

package/dist/consts.d.ts

@@ -3,4 +3,5 @@ export declare const INTERNAL_MOD_IMPORT: string;
 export declare const DRIZZLE_MOD_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";
 export declare function getLocalDbUrl(root: URL): URL;

package/dist/consts.js

@@ -6,10 +6,12 @@ const INTERNAL_MOD_IMPORT = JSON.stringify(`${PACKAGE_NAME}/internal`);
 const DRIZZLE_MOD_IMPORT = JSON.stringify(`${PACKAGE_NAME}/internal-drizzle`);
 const DB_TYPES_FILE = "db-types.d.ts";
 const VIRTUAL_MODULE_ID = "astro:db";
+const DB_PATH = ".astro/content.db";
 function getLocalDbUrl(root) {
-  return new URL(".astro/content.db", root);
+  return new URL(DB_PATH, root);
 }
 export {
+  DB_PATH,
   DB_TYPES_FILE,
   DRIZZLE_MOD_IMPORT,
   INTERNAL_MOD_IMPORT,

package/dist/integration.js

@@ -36,7 +36,11 @@ function integration() {
             logger.error(appTokenError);
             process.exit(0);
           }
-          dbPlugin = vitePluginDb({ connectToStudio: true, collections, appToken });
+          dbPlugin = vitePluginDb({
+            connectToStudio: true,
+            collections,
+            appToken
+          });
         } else {
           const dbUrl = getLocalDbUrl(config.root);
           if (existsSync(dbUrl)) {

package/dist/internal.d.ts

@@ -3,10 +3,10 @@ import { type BooleanField, type DBCollection, type DBCollections, type DBField,
 import { type LibSQLDatabase } from 'drizzle-orm/libsql';
 import { type ColumnDataType } from 'drizzle-orm';
 import type { AstroIntegrationLogger } from 'astro';
+export { createRemoteDatabaseClient } from './utils-runtime.js';
 export type SqliteDB = SqliteRemoteDatabase;
 export type { Table } from './types.js';
 export declare function hasPrimaryKey(field: DBField): boolean;
-export { createRemoteDatabaseClient } from './utils.js';
 export declare function createLocalDatabaseClient({ collections, dbUrl, seeding, }: {
     dbUrl: string;
     collections: DBCollections;

package/dist/internal.js

@@ -15,7 +15,7 @@ import {
   text
 } from "drizzle-orm/sqlite-core";
 import { z } from "zod";
-import { nanoid } from "nanoid";
+import { createRemoteDatabaseClient } from "./utils-runtime.js";
 const sqlite = new SQLiteAsyncDialect();
 function hasPrimaryKey(field) {
   return "primaryKey" in field && !!field.primaryKey;
@@ -30,7 +30,6 @@ function checkIfModificationIsAllowed(collections, Table) {
     throw new Error(`The [${tableName}] collection is read-only.`);
   }
 }
-import { createRemoteDatabaseClient } from "./utils.js";
 async function createLocalDatabaseClient({
   collections,
   dbUrl,

package/dist/utils-runtime.d.ts

@@ -0,0 +1 @@
+export declare function createRemoteDatabaseClient(appToken: string, remoteDbURL: string): import("drizzle-orm/sqlite-proxy").SqliteRemoteDatabase<Record<string, never>>;

package/dist/utils-runtime.js

@@ -0,0 +1,52 @@
+import { drizzle } from "drizzle-orm/sqlite-proxy";
+import { z } from "zod";
+function createRemoteDatabaseClient(appToken, remoteDbURL) {
+  const url = new URL("./db/query/", remoteDbURL);
+  const db = drizzle(async (sql, parameters, method) => {
+    const requestBody = { sql, args: parameters };
+    console.info(JSON.stringify(requestBody));
+    const res = await fetch(url, {
+      method: "POST",
+      headers: {
+        Authorization: `Bearer ${appToken}`,
+        "Content-Type": "application/json"
+      },
+      body: JSON.stringify(requestBody)
+    });
+    if (!res.ok) {
+      throw new Error(
+        `Failed to execute query.
+Query: ${sql}
+Full error: ${res.status} ${await res.text()}}`
+      );
+    }
+    const queryResultSchema = z.object({
+      rows: z.array(z.unknown())
+    });
+    let rows;
+    try {
+      const json = await res.json();
+      rows = queryResultSchema.parse(json).rows;
+    } catch (e) {
+      throw new Error(
+        `Failed to execute query.
+Query: ${sql}
+Full error: Unexpected JSON response. ${e instanceof Error ? e.message : String(e)}`
+      );
+    }
+    const rowValues = [];
+    for (const row of rows) {
+      if (row != null && typeof row === "object") {
+        rowValues.push(Object.values(row));
+      }
+    }
+    if (method === "get") {
+      return { rows: rowValues[0] };
+    }
+    return { rows: rowValues };
+  });
+  return db;
+}
+export {
+  createRemoteDatabaseClient
+};

package/dist/utils.js

@@ -1,7 +1,6 @@
-import { sqliteTable, text, integer } from "drizzle-orm/sqlite-core";
-import { drizzle } from "drizzle-orm/sqlite-proxy";
+import { sqliteTable, text } from "drizzle-orm/sqlite-core";
 import { loadEnv } from "vite";
-import { z } from "zod";
+import { createRemoteDatabaseClient as runtimeCreateRemoteDatabaseClient } from "./utils-runtime.js";
 const STUDIO_ADMIN_TABLE = "ReservedAstroStudioAdmin";
 const STUDIO_ADMIN_TABLE_ROW_ID = "admin";
 const adminTable = sqliteTable(STUDIO_ADMIN_TABLE, {
@@ -25,51 +24,7 @@ function getRemoteDatabaseUrl() {
   return env.ASTRO_STUDIO_REMOTE_DB_URL;
 }
 function createRemoteDatabaseClient(appToken) {
-  const url = new URL("./db/query/", getRemoteDatabaseUrl());
-  const db = drizzle(async (sql, parameters, method) => {
-    const requestBody = { sql, args: parameters };
-    console.info(JSON.stringify(requestBody));
-    const res = await fetch(url, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${appToken}`,
-        "Content-Type": "application/json"
-      },
-      body: JSON.stringify(requestBody)
-    });
-    if (!res.ok) {
-      throw new Error(
-        `Failed to execute query.
-Query: ${sql}
-Full error: ${res.status} ${await res.text()}}`
-      );
-    }
-    const queryResultSchema = z.object({
-      rows: z.array(z.unknown())
-    });
-    let rows;
-    try {
-      const json = await res.json();
-      rows = queryResultSchema.parse(json).rows;
-    } catch (e) {
-      throw new Error(
-        `Failed to execute query.
-Query: ${sql}
-Full error: Unexpected JSON response. ${e instanceof Error ? e.message : String(e)}`
-      );
-    }
-    const rowValues = [];
-    for (const row of rows) {
-      if (row != null && typeof row === "object") {
-        rowValues.push(Object.values(row));
-      }
-    }
-    if (method === "get") {
-      return { rows: rowValues[0] };
-    }
-    return { rows: rowValues };
-  });
-  return db;
+  return runtimeCreateRemoteDatabaseClient(appToken, getRemoteDatabaseUrl());
 }
 export {
   STUDIO_ADMIN_TABLE,

package/dist/vite-plugin-db.js

@@ -1,4 +1,4 @@
-import { DRIZZLE_MOD_IMPORT, INTERNAL_MOD_IMPORT, VIRTUAL_MODULE_ID } from "./consts.js";
+import { DRIZZLE_MOD_IMPORT, INTERNAL_MOD_IMPORT, VIRTUAL_MODULE_ID, DB_PATH } from "./consts.js";
 const resolvedVirtualModuleId = "\0" + VIRTUAL_MODULE_ID;
 function vitePluginDb(params) {
   return {
@@ -26,11 +26,13 @@ function getVirtualModContents({
   return `
 import { collectionToTable, createLocalDatabaseClient } from ${INTERNAL_MOD_IMPORT};
 
-export const db = await createLocalDatabaseClient(${JSON.stringify({
+const params = ${JSON.stringify({
     collections,
-    dbUrl,
     seeding: false
-  })});
+  })};
+
+params.dbUrl = new URL(${JSON.stringify(DB_PATH)}, 'file://' + process.cwd() + '/');
+export const db = await createLocalDatabaseClient(params);
 
 export * from ${DRIZZLE_MOD_IMPORT};
 
@@ -44,9 +46,7 @@ function getStudioVirtualModContents({
   return `
 import {collectionToTable, createRemoteDatabaseClient} from ${INTERNAL_MOD_IMPORT};
 
-export const db = await createRemoteDatabaseClient(${JSON.stringify({
-    appToken
-  })});
+export const db = await createRemoteDatabaseClient(${JSON.stringify(appToken)}, import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL);
 export * from ${DRIZZLE_MOD_IMPORT};
 
 ${getStringifiedCollectionExports(collections)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.1.3",
+  "version": "0.1.5",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -61,8 +61,8 @@
     "mocha": "^10.2.0",
     "typescript": "^5.2.2",
     "vite": "^4.4.11",
-    "astro": "4.2.4",
-    "astro-scripts": "0.0.14"
+    "astro-scripts": "0.0.14",
+    "astro": "4.2.4"
   },
   "scripts": {
     "build": "astro-scripts build \"src/**/*.ts\" && tsc",