Infrastructure/astro
0
Fork 0
mirror of https://github.com/withastro/astro.git synced 2025-01-06 22:10:10 -05:00
Code Issues Activity

feat: scrappy global data() prototype

Browse source
This commit is contained in:
bholmesdev 2024-01-25 11:49:36 -05:00
parent ebda4e913c
commit 4864057f39
3 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
packages/db/src/config.ts
View file

@ -14,6 +14,8 @@ import { z } from 'zod';
export const dbConfigSchema = z.object({
studio: z.boolean().optional(),
collections: collectionsSchema.optional(),
// TODO: strict types
data: z.function().args(z.any()).optional(),
});
export type DBUserConfig = z.input<typeof dbConfigSchema>;

8
packages/db/src/integration.ts
View file

@ -55,7 +55,13 @@ export function integration(): AstroIntegration {
dbUrl: dbUrl.href,
seeding: true,
});
await setupDbTables({ db, collections, logger });
await setupDbTables({
db,
collections,
data: configWithDb.db?.data,
logger,
mode: command === 'dev' ? 'dev' : 'build',
});
logger.info('Collections set up 🚀');
dbPlugin = vitePluginDb({ connectToStudio: false, collections, dbUrl: dbUrl.href });

21
packages/db/src/internal.ts
View file

@ -91,12 +91,16 @@ export async function createLocalDatabaseClient({
export async function setupDbTables({
db,
data,
collections,
logger,
mode,
}: {
db: LibSQLDatabase;
data?: (...params: any) => any;
collections: DBCollections;
logger: AstroIntegrationLogger;
mode: 'dev' | 'build';
}) {
const setupQueries: SQL[] = [];
for (const [name, collection] of Object.entries(collections)) {
@ -107,6 +111,16 @@ export async function setupDbTables({
for (const q of setupQueries) {
await db.run(q);
}
if (data) {
const ormObjects = Object.fromEntries(
Object.entries(collections).map(([name, collection]) => {
const table = collectionToTable(name, collection, false);
return [name, table];
})
);
await data({ db, ...ormObjects, mode });
}
// TODO: decide on removing collection-level data
for (const [name, collection] of Object.entries(collections)) {
if (!isReadableCollection(collection) || !collection.data) continue;
@ -127,8 +141,8 @@ export function getCreateTableQuery(collectionName: string, collection: DBCollec
let query = `CREATE TABLE ${sqlite.escapeName(collectionName)} (`;
const colQueries = [];
const colHasPrimaryKey = Object.entries(collection.fields).find(
([, field]) => hasPrimaryKey(field)
const colHasPrimaryKey = Object.entries(collection.fields).find(([, field]) =>
hasPrimaryKey(field)
);
if (!colHasPrimaryKey) {
colQueries.push('_id INTEGER PRIMARY KEY');
@ -173,7 +187,6 @@ export function getModifiers(fieldName: string, field: DBField) {
return modifiers;
}
// Using `DBField` will not narrow `default` based on the column `type`
// Handle each field separately
type WithDefaultDefined<T extends DBField> = T & Required<Pick<T, 'default'>>;
@ -289,7 +302,7 @@ function columnMapper(fieldName: string, field: DBField, isJsonSerializable: boo
case 'number': {
c = integer(fieldName);
if (field.default !== undefined) c = c.default(field.default);
if (field.primaryKey === true) c = c.primaryKey({autoIncrement: true});
if (field.primaryKey === true) c = c.primaryKey({ autoIncrement: true });
break;
}
case 'boolean': {