@astrojs/db 0.4.0 → 0.4.1

package/dist/core/errors.d.ts

@@ -1,7 +1,9 @@
 export declare const MISSING_SESSION_ID_ERROR: string;
 export declare const MISSING_PROJECT_ID_ERROR: string;
-export declare const STUDIO_CONFIG_MISSING_WRITABLE_COLLECTIONS_ERROR: (collectionName: string) => string;
+export declare const STUDIO_CONFIG_MISSING_WRITABLE_TABLE_ERROR: (tableName: string) => string;
 export declare const UNSAFE_WRITABLE_WARNING: string;
 export declare const STUDIO_CONFIG_MISSING_CLI_ERROR: string;
 export declare const MIGRATIONS_NOT_INITIALIZED: string;
-export declare const SEED_WRITABLE_IN_PROD_ERROR: (collectionName: string) => string;
+export declare const SEED_WRITABLE_IN_PROD_ERROR: (tableName: string) => string;
+export declare const SEED_ERROR: (tableName: string, error: string) => string;
+export declare const SEED_EMPTY_ARRAY_ERROR: (tableName: string) => string;

package/dist/core/errors.js

@@ -9,8 +9,8 @@ const MISSING_PROJECT_ID_ERROR = `${red("\u25B6 Directory not linked.")}
   To link this directory to an Astro Studio project, run
   ${cyan("astro db link")}
 `;
-const STUDIO_CONFIG_MISSING_WRITABLE_COLLECTIONS_ERROR = (collectionName) => `${red(
-  `\u25B6 Writable collection ${bold(collectionName)} requires Astro Studio or the ${yellow(
+const STUDIO_CONFIG_MISSING_WRITABLE_TABLE_ERROR = (tableName) => `${red(
+  `\u25B6 Writable table ${bold(tableName)} requires Astro Studio or the ${yellow(
     "unsafeWritable"
   )} option.`
 )}
@@ -36,19 +36,29 @@ const MIGRATIONS_NOT_INITIALIZED = `${yellow(
   To scaffold your migrations folder, run
   ${cyan("astro db sync")}
 `;
-const SEED_WRITABLE_IN_PROD_ERROR = (collectionName) => {
+const SEED_WRITABLE_IN_PROD_ERROR = (tableName) => {
   return `${red(
     `Writable tables should not be seeded in production with data().`
   )} You can seed ${bold(
-    collectionName
+    tableName
   )} in development mode only using the "mode" flag. See the docs for more: https://www.notion.so/astroinc/astrojs-db-README-dcf6fa10de9a4f528be56cee96e8c054?pvs=4#278aed3fc37e4cec80240d1552ff6ac5`;
 };
+const SEED_ERROR = (tableName, error) => {
+  return `${red(`Error seeding table ${bold(tableName)}:`)}
+
+${error}`;
+};
+const SEED_EMPTY_ARRAY_ERROR = (tableName) => {
+  return SEED_ERROR(tableName, `Empty array was passed. seed() must receive at least one value.`);
+};
 export {
   MIGRATIONS_NOT_INITIALIZED,
   MISSING_PROJECT_ID_ERROR,
   MISSING_SESSION_ID_ERROR,
+  SEED_EMPTY_ARRAY_ERROR,
+  SEED_ERROR,
   SEED_WRITABLE_IN_PROD_ERROR,
   STUDIO_CONFIG_MISSING_CLI_ERROR,
-  STUDIO_CONFIG_MISSING_WRITABLE_COLLECTIONS_ERROR,
+  STUDIO_CONFIG_MISSING_WRITABLE_TABLE_ERROR,
   UNSAFE_WRITABLE_WARNING
 };

package/dist/core/integration/index.js

@@ -47,10 +47,7 @@ import { DB_PATH } from "../consts.js";
 import { createLocalDatabaseClient } from "../../runtime/db-client.js";
 import { astroConfigWithDbSchema } from "../types.js";
 import {} from "../utils.js";
-import {
-  STUDIO_CONFIG_MISSING_WRITABLE_COLLECTIONS_ERROR,
-  UNSAFE_WRITABLE_WARNING
-} from "../errors.js";
+import { STUDIO_CONFIG_MISSING_WRITABLE_TABLE_ERROR, UNSAFE_WRITABLE_WARNING } from "../errors.js";
 import { errorMap } from "./error-map.js";
 import { dirname } from "path";
 import { fileURLToPath } from "url";
@@ -108,9 +105,7 @@ function astroDBIntegration() {
         const foundWritableCollection = Object.entries(tables).find(([, c]) => c.writable);
         const writableAllowed = studio || unsafeWritable;
         if (!writableAllowed && foundWritableCollection) {
-          logger.error(
-            STUDIO_CONFIG_MISSING_WRITABLE_COLLECTIONS_ERROR(foundWritableCollection[0])
-          );
+          logger.error(STUDIO_CONFIG_MISSING_WRITABLE_TABLE_ERROR(foundWritableCollection[0]));
           process.exit(1);
         } else if (unsafeWritable && foundWritableCollection) {
           logger.warn(UNSAFE_WRITABLE_WARNING);

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

@@ -1,5 +1,5 @@
 import type { DBTables } from '../types.js';
-import type { VitePlugin } from '../utils.js';
+import { type VitePlugin } from '../utils.js';
 type LateSchema = {
     tables: () => DBTables;
 };

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

@@ -1,4 +1,5 @@
 import { DB_PATH, RUNTIME_DRIZZLE_IMPORT, RUNTIME_IMPORT, VIRTUAL_MODULE_ID } from "../consts.js";
+import { getRemoteDatabaseUrl } from "../utils.js";
 const resolvedVirtualModuleId = "\0" + VIRTUAL_MODULE_ID;
 function vitePluginDb(params) {
   return {
@@ -53,7 +54,8 @@ import {collectionToTable, createRemoteDatabaseClient} from ${RUNTIME_IMPORT};
 
 export const db = await createRemoteDatabaseClient(${JSON.stringify(
     appToken
-  )}, import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL);
+    // Respect runtime env for user overrides in SSR
+  )}, import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL ?? ${JSON.stringify(getRemoteDatabaseUrl())});
 export * from ${RUNTIME_DRIZZLE_IMPORT};
 
 ${getStringifiedCollectionExports(tables)}

package/dist/core/queries.js

@@ -5,7 +5,7 @@ import { sql, getTableName } from "drizzle-orm";
 import { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core";
 import { hasPrimaryKey } from "../runtime/index.js";
 import { isSerializedSQL } from "../runtime/types.js";
-import { SEED_WRITABLE_IN_PROD_ERROR } from "./errors.js";
+import { SEED_EMPTY_ARRAY_ERROR, SEED_ERROR, SEED_WRITABLE_IN_PROD_ERROR } from "./errors.js";
 const sqlite = new SQLiteAsyncDialect();
 async function recreateTables({
   db,
@@ -28,37 +28,49 @@ async function seedData({
   logger,
   mode
 }) {
+  const dataFns = Array.isArray(data) ? data : [data];
   try {
-    const dataFns = Array.isArray(data) ? data : [data];
     for (const dataFn of dataFns) {
       await dataFn({
-        seed: async ({ table, writable }, values) => {
-          if (writable && mode === "build" && process.env.ASTRO_DB_TEST_ENV !== "1") {
-            (logger ?? console).error(SEED_WRITABLE_IN_PROD_ERROR(getTableName(table)));
-            process.exit(1);
+        seed: async (config, values) => {
+          seedErrorChecks(mode, config, values);
+          try {
+            await db.insert(config.table).values(values);
+          } catch (e) {
+            const msg = e instanceof Error ? e.message : String(e);
+            throw new Error(SEED_ERROR(getTableName(config.table), msg));
           }
-          await db.insert(table).values(values);
         },
-        seedReturning: async ({ table, writable }, values) => {
-          if (writable && mode === "build" && process.env.ASTRO_DB_TEST_ENV !== "1") {
-            (logger ?? console).error(SEED_WRITABLE_IN_PROD_ERROR(getTableName(table)));
-            process.exit(1);
+        seedReturning: async (config, values) => {
+          seedErrorChecks(mode, config, values);
+          try {
+            let result = db.insert(config.table).values(values).returning();
+            if (!Array.isArray(values)) {
+              result = result.get();
+            }
+            return result;
+          } catch (e) {
+            const msg = e instanceof Error ? e.message : String(e);
+            throw new Error(SEED_ERROR(getTableName(config.table), msg));
           }
-          let result = db.insert(table).values(values).returning();
-          if (!Array.isArray(values)) {
-            result = result.get();
-          }
-          return result;
         },
         db,
         mode
       });
     }
-  } catch (error) {
-    (logger ?? console).error(
-      `Failed to seed data. Did you update to match recent schema changes?`
-    );
-    (logger ?? console).error(error);
+  } catch (e) {
+    if (!(e instanceof Error))
+      throw e;
+    (logger ?? console).error(e.message);
+  }
+}
+function seedErrorChecks(mode, { table, writable }, values) {
+  const tableName = getTableName(table);
+  if (writable && mode === "build" && process.env.ASTRO_DB_TEST_ENV !== "1") {
+    throw new Error(SEED_WRITABLE_IN_PROD_ERROR(tableName));
+  }
+  if (Array.isArray(values) && values.length === 0) {
+    throw new Error(SEED_EMPTY_ARRAY_ERROR(tableName));
   }
 }
 function getCreateTableQuery(collectionName, collection) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.4.0",
+  "version": "0.4.1",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -68,7 +68,7 @@
     "mocha": "^10.2.0",
     "typescript": "^5.2.2",
     "vite": "^4.4.11",
-    "astro": "4.4.4",
+    "astro": "4.4.5",
     "astro-scripts": "0.0.14"
   },
   "scripts": {