finalize WIP API

.changeset/rich-turtles-live.md

@@ -0,0 +1,6 @@
+---
+"astro": patch
+"@astrojs/db": patch
+---
+
+Finalize db API to a shared db/ directory.

packages/astro/src/core/config/schema.ts

@@ -108,7 +108,6 @@ export const AstroConfigSchema = z.object({
 		.optional()
 		.default('attribute'),
 	adapter: z.object({ name: z.string(), hooks: z.object({}).passthrough().default({}) }).optional(),
-	db: z.object({}).passthrough().default({}).optional(),
 	integrations: z.preprocess(
 		// preprocess
 		(val) => (Array.isArray(val) ? val.flat(Infinity).filter(Boolean) : val),

packages/db/index.d.ts

@@ -1,3 +1,5 @@
-/// <reference types="./config-augment.d.ts" />
-export * from './dist/index.js';
-export { default } from './dist/index.js';
+export { default, cli } from './dist/index.js';
+
+declare module 'astro:db' {
+	export { defineTable, defineDB, column, sql, NOW, TRUE, FALSE } from './dist/index.js';
+}

packages/db/package.json

@@ -12,6 +12,10 @@
       "types": "./index.d.ts",
       "import": "./dist/index.js"
     },
+    "./utils": {
+      "types": "./dist/utils.d.ts",
+      "import": "./dist/utils.js"
+    },
     "./runtime": {
       "types": "./dist/runtime/index.d.ts",
       "import": "./dist/runtime/index.js"
@@ -20,18 +24,28 @@
       "types": "./dist/runtime/drizzle.d.ts",
       "import": "./dist/runtime/drizzle.js"
     },
+    "./runtime/config": {
+      "types": "./dist/runtime/config.d.ts",
+      "import": "./dist/runtime/config.js"
+    },
     "./package.json": "./package.json"
   },
   "typesVersions": {
     "*": {
       ".": [
         "./index.d.ts"
       ],
+      "utils": [
+        "./dist/utils.d.ts"
+      ],
       "runtime": [
         "./dist/runtime/index.d.ts"
       ],
       "runtime/drizzle": [
         "./dist/runtime/drizzle.d.ts"
+      ],
+      "runtime/config": [
+        "./dist/runtime/config.d.ts"
       ]
     }
   },

packages/db/src/core/cli/commands/execute/index.ts

@@ -0,0 +1,38 @@
+import type { AstroConfig } from 'astro';
+import type { Arguments } from 'yargs-parser';
+import { MISSING_EXECUTE_PATH_ERROR, FILE_NOT_FOUND_ERROR } from '../../../errors.js';
+import { existsSync } from 'node:fs';
+import { getManagedAppTokenOrExit } from '../../../tokens.js';
+import { type DBConfig } from '../../../types.js';
+import { executeFile } from '../../../load-file.js';
+
+export async function cmd({
+	astroConfig,
+	dbConfig,
+	flags,
+}: {
+	astroConfig: AstroConfig;
+	dbConfig: DBConfig;
+	flags: Arguments;
+}) {
+	const filePath = flags._[4];
+	if (typeof filePath !== 'string') {
+		console.error(MISSING_EXECUTE_PATH_ERROR);
+		process.exit(1);
+	}
+
+	const fileUrl = new URL(filePath, astroConfig.root);
+	if (!existsSync(fileUrl)) {
+		console.error(FILE_NOT_FOUND_ERROR(filePath));
+		process.exit(1);
+	}
+
+	const appToken = await getManagedAppTokenOrExit(flags.token);
+
+	await executeFile({
+		fileUrl,
+		tables: dbConfig.tables ?? {},
+		root: astroConfig.root,
+		appToken: appToken.token,
+	});
+}

packages/db/src/core/cli/commands/gen/index.ts

@@ -1,6 +1,7 @@
+import { fileURLToPath } from 'node:url';
 import { writeFile } from 'node:fs/promises';
 import type { AstroConfig } from 'astro';
-import { bgRed, red, reset } from 'kleur/colors';
+import { bold, bgRed, red, reset } from 'kleur/colors';
 import type { Arguments } from 'yargs-parser';
 import { getMigrationQueries } from '../../migration-queries.js';
 import {
@@ -9,12 +10,23 @@ import {
 	getMigrationStatus,
 	initializeMigrationsDirectory,
 } from '../../migrations.js';
+import { getMigrationsDirUrl } from '../../../utils.js';
+import type { DBConfig } from '../../../types.js';
+import { relative } from 'node:path';
 
-export async function cmd({ config }: { config: AstroConfig; flags: Arguments }) {
-	const migration = await getMigrationStatus(config);
+export async function cmd({
+	astroConfig,
+	dbConfig,
+}: {
+	astroConfig: AstroConfig;
+	dbConfig: DBConfig;
+	flags: Arguments;
+}) {
+	const migration = await getMigrationStatus({ dbConfig, root: astroConfig.root });
+	const migrationsDir = getMigrationsDirUrl(astroConfig.root);
 
 	if (migration.state === 'no-migrations-found') {
-		await initializeMigrationsDirectory(migration.currentSnapshot);
+		await initializeMigrationsDirectory(migration.currentSnapshot, migrationsDir);
 		console.log(MIGRATIONS_CREATED);
 		return;
 	} else if (migration.state === 'up-to-date') {
@@ -30,14 +42,15 @@ export async function cmd({ config }: { config: AstroConfig; flags: Arguments })
 	// Warn the user about any changes that lead to data-loss.
 	// When the user runs `db push`, they will be prompted to confirm these changes.
 	confirmations.map((message) => console.log(bgRed(' !!! ') + ' ' + red(message)));
-	const migrationFileContent = {
+	const content = {
 		diff,
 		db: migrationQueries,
 		// TODO(fks): Encode the relevant data, instead of the raw message.
 		// This will give `db push` more control over the formatting of the message.
 		confirm: confirmations.map((c) => reset(c)),
 	};
-	const migrationFileName = `./migrations/${newFilename}`;
-	await writeFile(migrationFileName, JSON.stringify(migrationFileContent, undefined, 2));
-	console.log(migrationFileName + ' created!');
+	const fileUrl = new URL(newFilename, migrationsDir);
+	const relativePath = relative(fileURLToPath(astroConfig.root), fileURLToPath(fileUrl));
+	await writeFile(fileUrl, JSON.stringify(content, undefined, 2));
+	console.log(bold(relativePath) + ' created!');
 }

packages/db/src/core/cli/commands/link/index.ts

@@ -1,17 +1,15 @@
 import { mkdir, writeFile } from 'node:fs/promises';
 import { homedir } from 'node:os';
 import { basename } from 'node:path';
-import type { AstroConfig } from 'astro';
 import { slug } from 'github-slugger';
 import { bgRed, cyan } from 'kleur/colors';
 import ora from 'ora';
 import prompts from 'prompts';
-import type { Arguments } from 'yargs-parser';
 import { MISSING_SESSION_ID_ERROR } from '../../../errors.js';
 import { PROJECT_ID_FILE, getSessionIdFromFile } from '../../../tokens.js';
 import { getAstroStudioUrl } from '../../../utils.js';
 
-export async function cmd({}: { config: AstroConfig; flags: Arguments }) {
+export async function cmd() {
 	const sessionToken = await getSessionIdFromFile();
 	if (!sessionToken) {
 		console.error(MISSING_SESSION_ID_ERROR);

packages/db/src/core/cli/commands/login/index.ts

@@ -7,6 +7,7 @@ import open from 'open';
 import ora from 'ora';
 import type { Arguments } from 'yargs-parser';
 import { SESSION_LOGIN_FILE } from '../../../tokens.js';
+import type { DBConfig } from '../../../types.js';
 import { getAstroStudioUrl } from '../../../utils.js';
 
 // NOTE(fks): How the Astro CLI login process works:
@@ -47,7 +48,13 @@ async function createServer(): Promise<{ url: string; promise: Promise<string> }
 	return { url: serverUrl, promise: sessionPromise };
 }
 
-export async function cmd({ flags }: { config: AstroConfig; flags: Arguments }) {
+export async function cmd({
+	flags,
+}: {
+	astroConfig: AstroConfig;
+	dbConfig: DBConfig;
+	flags: Arguments;
+}) {
 	let session = flags.session;
 
 	if (!session) {

packages/db/src/core/cli/commands/logout/index.ts

@@ -1,9 +1,7 @@
 import { unlink } from 'node:fs/promises';
-import type { AstroConfig } from 'astro';
-import type { Arguments } from 'yargs-parser';
 import { SESSION_LOGIN_FILE } from '../../../tokens.js';
 
-export async function cmd({}: { config: AstroConfig; flags: Arguments }) {
+export async function cmd() {
 	await unlink(SESSION_LOGIN_FILE);
 	console.log('Successfully logged out of Astro Studio.');
 }