refactor: _setMeta -> preprocess for table

packages/db/src/core/integration/index.ts

@@ -15,7 +15,6 @@ import { fileURLToPath } from 'url';
 import { blue, yellow } from 'kleur/colors';
 import { fileURLIntegration } from './file-url.js';
 import { setupDbTables } from '../queries.js';
-import { collectionToTable } from '../../runtime/index.js';
 import { getManagedAppTokenOrExit, type ManagedAppToken } from '../tokens.js';
 
 function astroDBIntegration(): AstroIntegration {
@@ -31,7 +30,6 @@ function astroDBIntegration(): AstroIntegration {
 				// @matthewp: may want to load collections by path at runtime
 				const configWithDb = astroConfigWithDbSchema.parse(config, { errorMap });
 				const collections = configWithDb.db?.collections ?? {};
-				setCollectionsMeta(collections);
 
 				const studio = configWithDb.db?.studio ?? false;
 				const foundWritableCollection = Object.entries(collections).find(([, c]) => c.writable);
@@ -117,27 +115,13 @@ function astroDBIntegration(): AstroIntegration {
 					'database: ' + (connectedToRemote ? yellow('remote') : blue('local database.'))
 				);
 			},
-			'astro:build:done': async ({ }) => {
+			'astro:build:done': async ({}) => {
 				await appToken?.destroy();
 			},
 		},
 	};
 }
 
-/**
- * We need to attach the Drizzle `table` and collection name at runtime.
- * These cannot be determined from `defineCollection()`,
- * since we don't know the collection name until the `db` config is resolved.
- *
- * exported for unit testing.
- */
-export function setCollectionsMeta(collections: Record<string, any>) {
-	for (const [name, collection] of Object.entries(collections)) {
-		const table = collectionToTable(name, collection);
-		collection._setMeta?.({ table });
-	}
-}
-
 export function integration(): AstroIntegration[] {
 	return [astroDBIntegration(), fileURLIntegration()];
 }

packages/db/src/core/types.ts

@@ -1,6 +1,6 @@
 import type { SQLiteInsertValue } from 'drizzle-orm/sqlite-core';
 import type { InferSelectModel } from 'drizzle-orm';
-import type { SqliteDB, Table } from '../runtime/index.js';
+import { collectionToTable, type SqliteDB, type Table } from '../runtime/index.js';
 import { z, type ZodTypeDef } from 'zod';
 import { SQL } from 'drizzle-orm';
 import { errorMap } from './integration/error-map.js';
@@ -171,8 +171,6 @@ const baseCollectionSchema = z.object({
 	fields: fieldsSchema,
 	indexes: z.record(indexSchema).optional(),
 	foreignKeys: z.array(foreignKeysSchema).optional(),
-	table: z.any(),
-	_setMeta: z.function().optional(),
 });
 
 export const readableCollectionSchema = baseCollectionSchema.extend({
@@ -185,19 +183,19 @@ export const writableCollectionSchema = baseCollectionSchema.extend({
 
 export const collectionSchema = z.union([readableCollectionSchema, writableCollectionSchema]);
 export const collectionsSchema = z.preprocess((rawCollections) => {
-	// Preprocess collections to append collection and field names to fields.
+	// Use `z.any()` to avoid breaking object references
-	// Used to track collection info for references.
+	const collections = z.record(z.any()).parse(rawCollections, { errorMap });
-
-	// Use minimum parsing to ensure collection has a `fields` record.
-	const collections = z
-		.record(
-			z.object({
-				fields: z.record(z.any()),
-			})
-		)
-		.parse(rawCollections, { errorMap });
 	for (const [collectionName, collection] of Object.entries(collections)) {
-		for (const [fieldName, field] of Object.entries(collection.fields)) {
+		// Append `table` object for data seeding.
+		// Must append at runtime so table name exists.
+		collection.table = collectionToTable(
+			collectionName,
+			collectionSchema.parse(collection, { errorMap })
+		);
+		// Append collection and field names to fields.
+		// Used to track collection info for references.
+		const { fields } = z.object({ fields: z.record(z.any()) }).parse(collection, { errorMap });
+		for (const [fieldName, field] of Object.entries(fields)) {
 			field.name = fieldName;
 			field.collection = collectionName;
 		}
@@ -313,24 +311,11 @@ function baseDefineCollection<TFields extends FieldsConfig, TWritable extends bo
 	userConfig: CollectionConfig<TFields>,
 	writable: TWritable
 ): ResolvedCollectionConfig<TFields, TWritable> {
-	const meta: { table: Table<string, TFields> } = { table: null! };
-	/**
-	 * We need to attach the Drizzle `table` at runtime using `_setMeta`.
-	 * These cannot be determined from `defineCollection()`,
-	 * since we don't know the collection name until the `db` config is resolved.
-	 */
-	const _setMeta = (values: { table: Table<string, TFields> }) => {
-		Object.assign(meta, values);
-	};
-
 	return {
 		...userConfig,
-		get table() {
-			return meta.table;
-		},
 		writable,
-		// @ts-expect-error private setter
+		// set at runtime to get the table name
-		_setMeta,
+		table: null!,
 	};
 }