@astrojs/db 0.9.4 → 0.9.6

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

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

package/dist/core/errors.d.ts

@@ -5,12 +5,6 @@ export declare const RENAME_TABLE_ERROR: (oldTable: string, newTable: string) =>
 export declare const RENAME_COLUMN_ERROR: (oldSelector: string, newSelector: string) => string;
 export declare const FILE_NOT_FOUND_ERROR: (path: string) => string;
 export declare const SHELL_QUERY_MISSING_ERROR: string;
-export declare const SEED_ERROR: (error: string) => string;
 export declare const EXEC_ERROR: (error: string) => string;
-export declare const SEED_DEFAULT_EXPORT_ERROR: (fileName: string) => string;
 export declare const EXEC_DEFAULT_EXPORT_ERROR: (fileName: string) => string;
-export declare const REFERENCE_DNE_ERROR: (columnName: string) => string;
-export declare const FOREIGN_KEY_DNE_ERROR: (tableName: string) => string;
-export declare const FOREIGN_KEY_REFERENCES_LENGTH_ERROR: (tableName: string) => string;
-export declare const FOREIGN_KEY_REFERENCES_EMPTY_ERROR: (tableName: string) => string;
 export declare const INTEGRATION_TABLE_CONFLICT_ERROR: (integrationName: string, tableName: string, isUserConflict: boolean) => string;

package/dist/core/errors.js

@@ -29,42 +29,14 @@ const SHELL_QUERY_MISSING_ERROR = `${red(
   "\u25B6 Please provide a query to execute using the --query flag."
 )}
 `;
-const SEED_ERROR = (error) => {
-  return `${red(`Error while seeding database:`)}
-
-${error}`;
-};
 const EXEC_ERROR = (error) => {
   return `${red(`Error while executing file:`)}
 
 ${error}`;
 };
-const SEED_DEFAULT_EXPORT_ERROR = (fileName) => {
-  return SEED_ERROR(`Missing default function export in ${bold(fileName)}`);
-};
 const EXEC_DEFAULT_EXPORT_ERROR = (fileName) => {
   return EXEC_ERROR(`Missing default function export in ${bold(fileName)}`);
 };
-const REFERENCE_DNE_ERROR = (columnName) => {
-  return `Column ${bold(
-    columnName
-  )} references a table that does not exist. Did you apply the referenced table to the \`tables\` object in your db config?`;
-};
-const FOREIGN_KEY_DNE_ERROR = (tableName) => {
-  return `Table ${bold(
-    tableName
-  )} references a table that does not exist. Did you apply the referenced table to the \`tables\` object in your db config?`;
-};
-const FOREIGN_KEY_REFERENCES_LENGTH_ERROR = (tableName) => {
-  return `Foreign key on ${bold(
-    tableName
-  )} is misconfigured. \`columns\` and \`references\` must be the same length.`;
-};
-const FOREIGN_KEY_REFERENCES_EMPTY_ERROR = (tableName) => {
-  return `Foreign key on ${bold(
-    tableName
-  )} is misconfigured. \`references\` array cannot be empty.`;
-};
 const INTEGRATION_TABLE_CONFLICT_ERROR = (integrationName, tableName, isUserConflict) => {
   return red("\u25B6 Conflicting table name in integration " + bold(integrationName)) + isUserConflict ? `
   A user-defined table named ${bold(tableName)} already exists` : `
@@ -74,17 +46,11 @@ export {
   EXEC_DEFAULT_EXPORT_ERROR,
   EXEC_ERROR,
   FILE_NOT_FOUND_ERROR,
-  FOREIGN_KEY_DNE_ERROR,
-  FOREIGN_KEY_REFERENCES_EMPTY_ERROR,
-  FOREIGN_KEY_REFERENCES_LENGTH_ERROR,
   INTEGRATION_TABLE_CONFLICT_ERROR,
   MISSING_EXECUTE_PATH_ERROR,
   MISSING_PROJECT_ID_ERROR,
   MISSING_SESSION_ID_ERROR,
-  REFERENCE_DNE_ERROR,
   RENAME_COLUMN_ERROR,
   RENAME_TABLE_ERROR,
-  SEED_DEFAULT_EXPORT_ERROR,
-  SEED_ERROR,
   SHELL_QUERY_MISSING_ERROR
 };

package/dist/core/integration/index.js

@@ -1,8 +1,10 @@
 import { existsSync } from "fs";
 import { dirname } from "path";
 import { fileURLToPath } from "url";
+import { AstroError } from "astro/errors";
 import { mkdir, writeFile } from "fs/promises";
 import { blue, yellow } from "kleur/colors";
+import { loadEnv } from "vite";
 import parseArgs from "yargs-parser";
 import { CONFIG_FILE_NAMES, DB_PATH } from "../consts.js";
 import { resolveDbConfig } from "../load-file.js";
@@ -28,12 +30,14 @@ function astroDBIntegration() {
     }
   };
   let command;
+  let output = "server";
   return {
     name: "astro:db",
     hooks: {
       "astro:config:setup": async ({ updateConfig, config, command: _command, logger }) => {
         command = _command;
         root = config.root;
+        output = config.output;
         if (command === "preview")
           return;
         let dbPlugin = void 0;
@@ -98,6 +102,11 @@ function astroDBIntegration() {
         });
       },
       "astro:build:start": async ({ logger }) => {
+        if (!connectToStudio && !databaseFileEnvDefined() && (output === "server" || output === "hybrid")) {
+          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";
+          throw new AstroError(message, hint);
+        }
         logger.info("database: " + (connectToStudio ? yellow("remote") : blue("local database.")));
       },
       "astro:build:done": async ({}) => {
@@ -106,6 +115,10 @@ function astroDBIntegration() {
     }
   };
 }
+function databaseFileEnvDefined() {
+  const env = loadEnv("", process.cwd());
+  return env.ASTRO_DATABASE_FILE != null || process.env.ASTRO_DATABASE_FILE != null;
+}
 function integration() {
   return [astroDBIntegration(), fileURLIntegration()];
 }

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

@@ -78,7 +78,8 @@ import { asDrizzleTable, createLocalDatabaseClient } from ${RUNTIME_IMPORT};
 ${shouldSeed ? `import { seedLocal } from ${RUNTIME_IMPORT};` : ""}
 ${shouldSeed ? integrationSeedImportStatements.join("\n") : ""}
 
-const dbUrl = ${JSON.stringify(dbUrl)};
+const dbUrl = import.meta.env.ASTRO_DATABASE_FILE ?? ${JSON.stringify(dbUrl)};
+
 export const db = createLocalDatabaseClient({ dbUrl });
 
 ${shouldSeed ? `await seedLocal({

package/dist/runtime/errors.d.ts

@@ -0,0 +1,6 @@
+export declare const FOREIGN_KEY_DNE_ERROR: (tableName: string) => string;
+export declare const FOREIGN_KEY_REFERENCES_LENGTH_ERROR: (tableName: string) => string;
+export declare const FOREIGN_KEY_REFERENCES_EMPTY_ERROR: (tableName: string) => string;
+export declare const REFERENCE_DNE_ERROR: (columnName: string) => string;
+export declare const SEED_ERROR: (error: string) => string;
+export declare const SEED_DEFAULT_EXPORT_ERROR: (fileName: string) => string;

package/dist/runtime/errors.js

@@ -0,0 +1,37 @@
+import { bold, red } from "kleur/colors";
+const FOREIGN_KEY_DNE_ERROR = (tableName) => {
+  return `Table ${bold(
+    tableName
+  )} references a table that does not exist. Did you apply the referenced table to the \`tables\` object in your db config?`;
+};
+const FOREIGN_KEY_REFERENCES_LENGTH_ERROR = (tableName) => {
+  return `Foreign key on ${bold(
+    tableName
+  )} is misconfigured. \`columns\` and \`references\` must be the same length.`;
+};
+const FOREIGN_KEY_REFERENCES_EMPTY_ERROR = (tableName) => {
+  return `Foreign key on ${bold(
+    tableName
+  )} is misconfigured. \`references\` array cannot be empty.`;
+};
+const REFERENCE_DNE_ERROR = (columnName) => {
+  return `Column ${bold(
+    columnName
+  )} references a table that does not exist. Did you apply the referenced table to the \`tables\` object in your db config?`;
+};
+const SEED_ERROR = (error) => {
+  return `${red(`Error while seeding database:`)}
+
+${error}`;
+};
+const SEED_DEFAULT_EXPORT_ERROR = (fileName) => {
+  return SEED_ERROR(`Missing default function export in ${bold(fileName)}`);
+};
+export {
+  FOREIGN_KEY_DNE_ERROR,
+  FOREIGN_KEY_REFERENCES_EMPTY_ERROR,
+  FOREIGN_KEY_REFERENCES_LENGTH_ERROR,
+  REFERENCE_DNE_ERROR,
+  SEED_DEFAULT_EXPORT_ERROR,
+  SEED_ERROR
+};

package/dist/runtime/queries.js

@@ -6,7 +6,7 @@ import {
   FOREIGN_KEY_REFERENCES_EMPTY_ERROR,
   FOREIGN_KEY_REFERENCES_LENGTH_ERROR,
   REFERENCE_DNE_ERROR
-} from "../core/errors.js";
+} from "./errors.js";
 import { hasPrimaryKey } from "./index.js";
 import { isSerializedSQL } from "./types.js";
 const sqlite = new SQLiteAsyncDialect();

package/dist/runtime/seed-local.js

@@ -1,8 +1,8 @@
 import { LibsqlError } from "@libsql/client";
 import { sql } from "drizzle-orm";
 import { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core";
-import { SEED_DEFAULT_EXPORT_ERROR, SEED_ERROR } from "../core/errors.js";
 import {} from "../core/types.js";
+import { SEED_DEFAULT_EXPORT_ERROR, SEED_ERROR } from "./errors.js";
 import { getCreateIndexQueries, getCreateTableQuery } from "./queries.js";
 const sqlite = new SQLiteAsyncDialect();
 async function seedLocal({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.9.4",
+  "version": "0.9.6",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -58,7 +58,7 @@
     "@libsql/client": "^0.5.5",
     "async-listen": "^3.0.1",
     "deep-diff": "^1.0.2",
-    "drizzle-orm": "^0.30.2",
+    "drizzle-orm": "^0.30.4",
     "github-slugger": "^2.0.0",
     "kleur": "^4.1.5",
     "nanoid": "^5.0.1",
@@ -81,7 +81,7 @@
     "mocha": "^10.2.0",
     "typescript": "^5.2.2",
     "vite": "^5.1.4",
-    "astro": "4.5.9",
+    "astro": "4.5.10",
     "astro-scripts": "0.0.14"
   },
   "scripts": {