@astrojs/db 0.1.14 → 0.1.16

package/dist/cli/commands/push/index.js

@@ -1,8 +1,9 @@
+import { createClient } from "@libsql/client";
 import deepDiff from "deep-diff";
 import { eq, sql } from "drizzle-orm";
 import { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core";
 import { appTokenError } from "../../../errors.js";
-import { collectionToTable, createLocalDatabaseClient } from "../../../internal.js";
+import { drizzle } from "drizzle-orm/sqlite-proxy";
 import {
   createCurrentSnapshot,
   createEmptySnapshot,
@@ -20,6 +21,7 @@ import {
   migrationsTable
 } from "../../../utils.js";
 import { getMigrationQueries } from "../../queries.js";
+import { setupDbTables } from "../../../internal.js";
 const { diff } = deepDiff;
 const sqliteDialect = new SQLiteAsyncDialect();
 async function cmd({ config, flags }) {
@@ -91,26 +93,34 @@ async function pushData({
   appToken,
   isDryRun
 }) {
-  const db = await createLocalDatabaseClient({
-    collections: config.db.collections,
-    dbUrl: ":memory:",
-    seeding: true
-  });
   const queries = [];
-  for (const [name, collection] of Object.entries(config.db.collections)) {
-    if (collection.writable || !collection.data)
-      continue;
-    const table = collectionToTable(name, collection);
-    const insert = db.insert(table).values(await collection.data());
-    queries.push(insert.toSQL());
+  if (config.db?.data) {
+    const libsqlClient = createClient({ url: ":memory:" });
+    const db = await drizzle(async (sqlQuery, params, method) => {
+      const stmt = { sql: sqlQuery, args: params };
+      queries.push(stmt);
+      const { rows } = await libsqlClient.execute(stmt);
+      const rowValues = [];
+      for (const row of rows) {
+        if (row != null && typeof row === "object") {
+          rowValues.push(Object.values(row));
+        }
+      }
+      if (method === "get") {
+        return { rows: rowValues[0] };
+      }
+      return { rows: rowValues };
+    });
+    await setupDbTables({
+      db,
+      mode: "build",
+      collections: config.db.collections ?? {},
+      data: config.db.data
+    });
   }
   const url = new URL("/db/query", getRemoteDatabaseUrl());
-  const requestBody = queries.map((q) => ({
-    sql: q.sql,
-    args: q.params
-  }));
   if (isDryRun) {
-    console.info("[DRY RUN] Batch data seed:", JSON.stringify(requestBody, null, 2));
+    console.info("[DRY RUN] Batch data seed:", JSON.stringify(queries, null, 2));
     return new Response(null, { status: 200 });
   }
   return await fetch(url, {
@@ -118,7 +128,7 @@ async function pushData({
     headers: new Headers({
       Authorization: `Bearer ${appToken}`
     }),
-    body: JSON.stringify(requestBody)
+    body: JSON.stringify(queries)
   });
 }
 async function runBatchQuery({

package/dist/cli/queries.js

@@ -2,7 +2,13 @@ import * as color from "kleur/colors";
 import { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core";
 import { customAlphabet } from "nanoid";
 import prompts from "prompts";
-import { getCreateTableQuery, getModifiers, hasDefault, hasPrimaryKey, schemaTypeToSqlType } from "../internal.js";
+import {
+  getCreateTableQuery,
+  getModifiers,
+  hasDefault,
+  hasPrimaryKey,
+  schemaTypeToSqlType
+} from "../internal.js";
 const sqlite = new SQLiteAsyncDialect();
 const genTempTableName = customAlphabet("abcdefghijklmnopqrstuvwxyz", 10);
 async function getMigrationQueries({
@@ -115,12 +121,8 @@ async function getCollectionChangeQueries({
       process.exit(0);
     }
   }
-  const addedPrimaryKey = Object.entries(added).find(
-    ([, field]) => hasPrimaryKey(field)
-  );
-  const droppedPrimaryKey = Object.entries(dropped).find(
-    ([, field]) => hasPrimaryKey(field)
-  );
+  const addedPrimaryKey = Object.entries(added).find(([, field]) => hasPrimaryKey(field));
+  const droppedPrimaryKey = Object.entries(dropped).find(([, field]) => hasPrimaryKey(field));
   const updatedPrimaryKey = Object.entries(updated).find(
     ([, field]) => hasPrimaryKey(field.old) || hasPrimaryKey(field.new)
   );

package/dist/config.d.ts

@@ -1,5 +1,15 @@
-import { type BooleanField, type DBFieldInput, type DateFieldInput, type JsonField, type NumberField, type TextField, type collectionSchema, type MaybePromise } from './types.js';
+import type { SQLiteInsertValue } from 'drizzle-orm/sqlite-core';
+import type { SqliteDB, Table } from './internal.js';
+import type { MaybeArray, collectionSchema } from './types.js';
+import { type BooleanField, type DBFieldInput, type DateFieldInput, type JsonField, type NumberField, type TextField, type MaybePromise } from './types.js';
 import { z } from 'zod';
+export type DBFieldsConfig = z.input<typeof collectionSchema>['fields'];
+export type DBDataContext = {
+    db: SqliteDB;
+    seed<TFields extends DBFieldsConfig>(collection: ResolvedCollectionConfig<TFields>, data: MaybeArray<SQLiteInsertValue<Table<string, 
+    /** TODO: true type inference */ Record<Extract<keyof TFields, string>, DBFieldsConfig[number]>>>>): Promise<any> /** TODO: type output */;
+    mode: 'dev' | 'build';
+};
 export declare const dbConfigSchema: z.ZodObject<{
     studio: z.ZodOptional<z.ZodBoolean>;
     collections: z.ZodOptional<z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
@@ -103,8 +113,9 @@ export declare const dbConfigSchema: z.ZodObject<{
             unique?: boolean | undefined;
             default?: unknown;
         }>]>>;
-        data: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">, z.ZodPromise<z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">>]>>>;
         writable: z.ZodLiteral<false>;
+        table: z.ZodAny;
+        _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
     }, "strip", z.ZodTypeAny, {
         fields: Record<string, {
             type: "boolean";
@@ -141,7 +152,8 @@ export declare const dbConfigSchema: z.ZodObject<{
             default?: unknown;
         }>;
         writable: false;
-        data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+        table?: any;
+        _setMeta?: ((...args: unknown[]) => unknown) | undefined;
     }, {
         fields: Record<string, {
             type: "boolean";
@@ -178,7 +190,8 @@ export declare const dbConfigSchema: z.ZodObject<{
             default?: unknown;
         }>;
         writable: false;
-        data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+        table?: any;
+        _setMeta?: ((...args: unknown[]) => unknown) | undefined;
     }>, z.ZodObject<{
         fields: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
             label: z.ZodOptional<z.ZodString>;
@@ -280,8 +293,9 @@ export declare const dbConfigSchema: z.ZodObject<{
             unique?: boolean | undefined;
             default?: unknown;
         }>]>>;
-        seed: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">, z.ZodPromise<z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">>]>>>;
         writable: z.ZodLiteral<true>;
+        table: z.ZodAny;
+        _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
     }, "strip", z.ZodTypeAny, {
         fields: Record<string, {
             type: "boolean";
@@ -318,7 +332,8 @@ export declare const dbConfigSchema: z.ZodObject<{
             default?: unknown;
         }>;
         writable: true;
-        seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+        table?: any;
+        _setMeta?: ((...args: unknown[]) => unknown) | undefined;
     }, {
         fields: Record<string, {
             type: "boolean";
@@ -355,9 +370,10 @@ export declare const dbConfigSchema: z.ZodObject<{
             default?: unknown;
         }>;
         writable: true;
-        seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+        table?: any;
+        _setMeta?: ((...args: unknown[]) => unknown) | undefined;
     }>]>>>;
-    data: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], z.ZodUnknown>, z.ZodUnknown>>;
+    data: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodVoid, z.ZodPromise<z.ZodVoid>]>>>;
 }, "strip", z.ZodTypeAny, {
     studio?: boolean | undefined;
     collections?: Record<string, {
@@ -396,7 +412,8 @@ export declare const dbConfigSchema: z.ZodObject<{
             default?: unknown;
         }>;
         writable: false;
-        data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+        table?: any;
+        _setMeta?: ((...args: unknown[]) => unknown) | undefined;
     } | {
         fields: Record<string, {
             type: "boolean";
@@ -433,9 +450,10 @@ export declare const dbConfigSchema: z.ZodObject<{
             default?: unknown;
         }>;
         writable: true;
-        seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+        table?: any;
+        _setMeta?: ((...args: unknown[]) => unknown) | undefined;
     }> | undefined;
-    data?: ((args_0: any, ...args_1: unknown[]) => unknown) | undefined;
+    data?: ((...args: unknown[]) => void | Promise<void>) | undefined;
 }, {
     studio?: boolean | undefined;
     collections?: Record<string, {
@@ -474,7 +492,8 @@ export declare const dbConfigSchema: z.ZodObject<{
             default?: unknown;
         }>;
         writable: false;
-        data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+        table?: any;
+        _setMeta?: ((...args: unknown[]) => unknown) | undefined;
     } | {
         fields: Record<string, {
             type: "boolean";
@@ -511,11 +530,14 @@ export declare const dbConfigSchema: z.ZodObject<{
             default?: unknown;
         }>;
         writable: true;
-        seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+        table?: any;
+        _setMeta?: ((...args: unknown[]) => unknown) | undefined;
     }> | undefined;
-    data?: ((args_0: any, ...args_1: unknown[]) => unknown) | undefined;
+    data?: ((...args: unknown[]) => void | Promise<void>) | undefined;
 }>;
-export type DBUserConfig = z.input<typeof dbConfigSchema>;
+export type DBUserConfig = Omit<z.input<typeof dbConfigSchema>, 'data'> & {
+    data(params: DBDataContext): MaybePromise<void>;
+};
 export declare const astroConfigWithDbSchema: z.ZodObject<{
     db: z.ZodOptional<z.ZodObject<{
         studio: z.ZodOptional<z.ZodBoolean>;
@@ -620,8 +642,9 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 unique?: boolean | undefined;
                 default?: unknown;
             }>]>>;
-            data: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">, z.ZodPromise<z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">>]>>>;
             writable: z.ZodLiteral<false>;
+            table: z.ZodAny;
+            _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
         }, "strip", z.ZodTypeAny, {
             fields: Record<string, {
                 type: "boolean";
@@ -658,7 +681,8 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 default?: unknown;
             }>;
             writable: false;
-            data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+            table?: any;
+            _setMeta?: ((...args: unknown[]) => unknown) | undefined;
         }, {
             fields: Record<string, {
                 type: "boolean";
@@ -695,7 +719,8 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 default?: unknown;
             }>;
             writable: false;
-            data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+            table?: any;
+            _setMeta?: ((...args: unknown[]) => unknown) | undefined;
         }>, z.ZodObject<{
             fields: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
                 label: z.ZodOptional<z.ZodString>;
@@ -797,8 +822,9 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 unique?: boolean | undefined;
                 default?: unknown;
             }>]>>;
-            seed: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">, z.ZodPromise<z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">>]>>>;
             writable: z.ZodLiteral<true>;
+            table: z.ZodAny;
+            _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
         }, "strip", z.ZodTypeAny, {
             fields: Record<string, {
                 type: "boolean";
@@ -835,7 +861,8 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 default?: unknown;
             }>;
             writable: true;
-            seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+            table?: any;
+            _setMeta?: ((...args: unknown[]) => unknown) | undefined;
         }, {
             fields: Record<string, {
                 type: "boolean";
@@ -872,9 +899,10 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 default?: unknown;
             }>;
             writable: true;
-            seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+            table?: any;
+            _setMeta?: ((...args: unknown[]) => unknown) | undefined;
         }>]>>>;
-        data: z.ZodOptional<z.ZodFunction<z.ZodTuple<[z.ZodAny], z.ZodUnknown>, z.ZodUnknown>>;
+        data: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodVoid, z.ZodPromise<z.ZodVoid>]>>>;
     }, "strip", z.ZodTypeAny, {
         studio?: boolean | undefined;
         collections?: Record<string, {
@@ -913,7 +941,8 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 default?: unknown;
             }>;
             writable: false;
-            data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+            table?: any;
+            _setMeta?: ((...args: unknown[]) => unknown) | undefined;
         } | {
             fields: Record<string, {
                 type: "boolean";
@@ -950,9 +979,10 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 default?: unknown;
             }>;
             writable: true;
-            seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+            table?: any;
+            _setMeta?: ((...args: unknown[]) => unknown) | undefined;
         }> | undefined;
-        data?: ((args_0: any, ...args_1: unknown[]) => unknown) | undefined;
+        data?: ((...args: unknown[]) => void | Promise<void>) | undefined;
     }, {
         studio?: boolean | undefined;
         collections?: Record<string, {
@@ -991,7 +1021,8 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 default?: unknown;
             }>;
             writable: false;
-            data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+            table?: any;
+            _setMeta?: ((...args: unknown[]) => unknown) | undefined;
         } | {
             fields: Record<string, {
                 type: "boolean";
@@ -1028,9 +1059,10 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 default?: unknown;
             }>;
             writable: true;
-            seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+            table?: any;
+            _setMeta?: ((...args: unknown[]) => unknown) | undefined;
         }> | undefined;
-        data?: ((args_0: any, ...args_1: unknown[]) => unknown) | undefined;
+        data?: ((...args: unknown[]) => void | Promise<void>) | undefined;
     }>>;
 }, "strip", z.ZodTypeAny, {
     db?: {
@@ -1071,7 +1103,8 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 default?: unknown;
             }>;
             writable: false;
-            data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+            table?: any;
+            _setMeta?: ((...args: unknown[]) => unknown) | undefined;
         } | {
             fields: Record<string, {
                 type: "boolean";
@@ -1108,9 +1141,10 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 default?: unknown;
             }>;
             writable: true;
-            seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+            table?: any;
+            _setMeta?: ((...args: unknown[]) => unknown) | undefined;
         }> | undefined;
-        data?: ((args_0: any, ...args_1: unknown[]) => unknown) | undefined;
+        data?: ((...args: unknown[]) => void | Promise<void>) | undefined;
     } | undefined;
 }, {
     db?: {
@@ -1151,7 +1185,8 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 default?: unknown;
             }>;
             writable: false;
-            data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+            table?: any;
+            _setMeta?: ((...args: unknown[]) => unknown) | undefined;
         } | {
             fields: Record<string, {
                 type: "boolean";
@@ -1188,27 +1223,21 @@ export declare const astroConfigWithDbSchema: z.ZodObject<{
                 default?: unknown;
             }>;
             writable: true;
-            seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+            table?: any;
+            _setMeta?: ((...args: unknown[]) => unknown) | undefined;
         }> | undefined;
-        data?: ((args_0: any, ...args_1: unknown[]) => unknown) | undefined;
+        data?: ((...args: unknown[]) => void | Promise<void>) | undefined;
     } | undefined;
 }>;
-type CollectionConfig<TFields extends z.input<typeof collectionSchema>['fields'], Writable extends boolean> = Writable extends true ? {
+type CollectionConfig<TFields extends DBFieldsConfig> = {
     fields: TFields;
-    seed?: Writable extends false ? never : () => MaybePromise<Array<Record<keyof TFields, any> & {
-        id?: string;
-    }>>;
-} : {
-    fields: TFields;
-    data?: Writable extends true ? never : () => MaybePromise<Array<Record<keyof TFields, any> & {
-        id?: string;
-    }>>;
 };
-type ResolvedCollectionConfig<TFields extends z.input<typeof collectionSchema>['fields'], Writable extends boolean> = CollectionConfig<TFields, Writable> & {
+export type ResolvedCollectionConfig<TFields extends DBFieldsConfig = DBFieldsConfig, Writable extends boolean = boolean> = CollectionConfig<TFields> & {
     writable: Writable;
+    table: Table<string, TFields>;
 };
-export declare function defineCollection<TFields extends z.input<typeof collectionSchema>['fields']>(userConfig: CollectionConfig<TFields, false>): ResolvedCollectionConfig<TFields, false>;
-export declare function defineWritableCollection<TFields extends z.input<typeof collectionSchema>['fields']>(userConfig: CollectionConfig<TFields, true>): ResolvedCollectionConfig<TFields, true>;
+export declare function defineCollection<TFields extends DBFieldsConfig>(userConfig: CollectionConfig<TFields>): ResolvedCollectionConfig<TFields, false>;
+export declare function defineWritableCollection<TFields extends DBFieldsConfig>(userConfig: CollectionConfig<TFields>): ResolvedCollectionConfig<TFields, true>;
 export type AstroConfigWithDB = z.infer<typeof astroConfigWithDbSchema>;
 type FieldOpts<T extends DBFieldInput> = Omit<T, 'type'>;
 export declare const field: {

package/dist/config.js

@@ -5,22 +5,39 @@ import { z } from "zod";
 const dbConfigSchema = z.object({
   studio: z.boolean().optional(),
   collections: collectionsSchema.optional(),
-  // TODO: strict types
-  data: z.function().args(z.any()).optional()
+  data: z.function().returns(z.union([z.void(), z.promise(z.void())])).optional()
 });
 const astroConfigWithDbSchema = z.object({
   db: dbConfigSchema.optional()
 });
 function defineCollection(userConfig) {
+  const meta = { table: null };
+  function _setMeta(values) {
+    Object.assign(meta, values);
+  }
   return {
     ...userConfig,
-    writable: false
+    writable: false,
+    get table() {
+      return meta.table;
+    },
+    // @ts-expect-error private field
+    _setMeta
   };
 }
 function defineWritableCollection(userConfig) {
+  const meta = { table: null };
+  function _setMeta(values) {
+    Object.assign(meta, values);
+  }
   return {
     ...userConfig,
-    writable: true
+    writable: true,
+    get table() {
+      return meta.table;
+    },
+    // @ts-expect-error private field
+    _setMeta
   };
 }
 const baseDefaults = {

package/dist/index.d.ts

@@ -1,3 +1,5 @@
 export { defineCollection, defineWritableCollection, field } from './config.js';
+export type { ResolvedCollectionConfig, DBDataContext } from './config.js';
+export type { DBCollection, DBCollections, DBSnapshot, DBField, BooleanField, NumberField, TextField, DateField, DateFieldInput, JsonField, FieldType, } from './types.js';
 export { cli } from './cli/index.js';
 export { integration as default } from './integration.js';

package/dist/internal.d.ts

@@ -3,9 +3,10 @@ import { type BooleanField, type DBCollection, type DBCollections, type DBField,
 import { type LibSQLDatabase } from 'drizzle-orm/libsql';
 import { type ColumnDataType } from 'drizzle-orm';
 import type { AstroIntegrationLogger } from 'astro';
-export { createRemoteDatabaseClient, findLocalDatabase } from './utils-runtime.js';
+import type { DBUserConfig } from './config.js';
 export type SqliteDB = SqliteRemoteDatabase;
 export type { Table } from './types.js';
+export { createRemoteDatabaseClient, findLocalDatabase } from './utils-runtime.js';
 export declare function hasPrimaryKey(field: DBField): boolean;
 export declare function createLocalDatabaseClient({ collections, dbUrl, seeding, }: {
     dbUrl: string;
@@ -13,10 +14,10 @@ export declare function createLocalDatabaseClient({ collections, dbUrl, seeding,
     seeding: boolean;
 }): Promise<LibSQLDatabase<Record<string, never>>>;
 export declare function setupDbTables({ db, data, collections, logger, mode, }: {
-    db: LibSQLDatabase;
-    data?: (...params: any) => any;
+    db: SqliteRemoteDatabase;
+    data?: DBUserConfig['data'];
     collections: DBCollections;
-    logger: AstroIntegrationLogger;
+    logger?: AstroIntegrationLogger;
     mode: 'dev' | 'build';
 }): Promise<void>;
 export declare function getCreateTableQuery(collectionName: string, collection: DBCollection): string;

package/dist/internal.js

@@ -20,9 +20,6 @@ const sqlite = new SQLiteAsyncDialect();
 function hasPrimaryKey(field) {
   return "primaryKey" in field && !!field.primaryKey;
 }
-function isReadableCollection(collection) {
-  return !collection.writable;
-}
 function checkIfModificationIsAllowed(collections, Table) {
   const tableName = getTableName(Table);
   const collection = collections[tableName];
@@ -72,25 +69,25 @@ async function setupDbTables({
     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 });
-  }
-  for (const [name, collection] of Object.entries(collections)) {
-    if (!isReadableCollection(collection) || !collection.data)
-      continue;
-    const table = collectionToTable(name, collection);
+    for (const [name, collection] of Object.entries(collections)) {
+      const table = collectionToTable(name, collection);
+      collection._setMeta?.({ table });
+    }
     try {
-      await db.insert(table).values(await collection.data());
+      await data({
+        async seed({ table }, values) {
+          const result = Array.isArray(values) ? (
+            // TODO: fix values typing once we can infer fields type correctly
+            await db.insert(table).values(values).returning()
+          ) : await db.insert(table).values(values).returning().get();
+          return result;
+        },
+        db,
+        mode
+      });
     } catch (e) {
-      logger.error(
-        `Failed to seed ${bold(
-          name
-        )} data. Did you update to match recent schema changes? Full error:
+      (logger ?? console).error(
+        `Failed to seed data. Did you update to match recent schema changes? Full error:
 
 ${e}`
       );

package/dist/types.d.ts

@@ -406,8 +406,9 @@ export declare const readableCollectionSchema: z.ZodObject<{
         unique?: boolean | undefined;
         default?: unknown;
     }>]>>;
-    data: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">, z.ZodPromise<z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">>]>>>;
     writable: z.ZodLiteral<false>;
+    table: z.ZodAny;
+    _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
 }, "strip", z.ZodTypeAny, {
     fields: Record<string, {
         type: "boolean";
@@ -444,7 +445,8 @@ export declare const readableCollectionSchema: z.ZodObject<{
         default?: unknown;
     }>;
     writable: false;
-    data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+    table?: any;
+    _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }, {
     fields: Record<string, {
         type: "boolean";
@@ -481,7 +483,8 @@ export declare const readableCollectionSchema: z.ZodObject<{
         default?: unknown;
     }>;
     writable: false;
-    data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+    table?: any;
+    _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }>;
 export declare const writableCollectionSchema: z.ZodObject<{
     fields: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
@@ -584,8 +587,9 @@ export declare const writableCollectionSchema: z.ZodObject<{
         unique?: boolean | undefined;
         default?: unknown;
     }>]>>;
-    seed: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">, z.ZodPromise<z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">>]>>>;
     writable: z.ZodLiteral<true>;
+    table: z.ZodAny;
+    _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
 }, "strip", z.ZodTypeAny, {
     fields: Record<string, {
         type: "boolean";
@@ -622,7 +626,8 @@ export declare const writableCollectionSchema: z.ZodObject<{
         default?: unknown;
     }>;
     writable: true;
-    seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+    table?: any;
+    _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }, {
     fields: Record<string, {
         type: "boolean";
@@ -659,7 +664,8 @@ export declare const writableCollectionSchema: z.ZodObject<{
         default?: unknown;
     }>;
     writable: true;
-    seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+    table?: any;
+    _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }>;
 export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
     fields: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
@@ -762,8 +768,9 @@ export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
         unique?: boolean | undefined;
         default?: unknown;
     }>]>>;
-    data: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">, z.ZodPromise<z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">>]>>>;
     writable: z.ZodLiteral<false>;
+    table: z.ZodAny;
+    _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
 }, "strip", z.ZodTypeAny, {
     fields: Record<string, {
         type: "boolean";
@@ -800,7 +807,8 @@ export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
         default?: unknown;
     }>;
     writable: false;
-    data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+    table?: any;
+    _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }, {
     fields: Record<string, {
         type: "boolean";
@@ -837,7 +845,8 @@ export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
         default?: unknown;
     }>;
     writable: false;
-    data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+    table?: any;
+    _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }>, z.ZodObject<{
     fields: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
         label: z.ZodOptional<z.ZodString>;
@@ -939,8 +948,9 @@ export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
         unique?: boolean | undefined;
         default?: unknown;
     }>]>>;
-    seed: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">, z.ZodPromise<z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">>]>>>;
     writable: z.ZodLiteral<true>;
+    table: z.ZodAny;
+    _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
 }, "strip", z.ZodTypeAny, {
     fields: Record<string, {
         type: "boolean";
@@ -977,7 +987,8 @@ export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
         default?: unknown;
     }>;
     writable: true;
-    seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+    table?: any;
+    _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }, {
     fields: Record<string, {
         type: "boolean";
@@ -1014,7 +1025,8 @@ export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
         default?: unknown;
     }>;
     writable: true;
-    seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+    table?: any;
+    _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }>]>;
 export declare const collectionsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
     fields: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
@@ -1117,8 +1129,9 @@ export declare const collectionsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.Z
         unique?: boolean | undefined;
         default?: unknown;
     }>]>>;
-    data: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">, z.ZodPromise<z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">>]>>>;
     writable: z.ZodLiteral<false>;
+    table: z.ZodAny;
+    _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
 }, "strip", z.ZodTypeAny, {
     fields: Record<string, {
         type: "boolean";
@@ -1155,7 +1168,8 @@ export declare const collectionsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.Z
         default?: unknown;
     }>;
     writable: false;
-    data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+    table?: any;
+    _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }, {
     fields: Record<string, {
         type: "boolean";
@@ -1192,7 +1206,8 @@ export declare const collectionsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.Z
         default?: unknown;
     }>;
     writable: false;
-    data?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+    table?: any;
+    _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }>, z.ZodObject<{
     fields: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
         label: z.ZodOptional<z.ZodString>;
@@ -1294,8 +1309,9 @@ export declare const collectionsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.Z
         unique?: boolean | undefined;
         default?: unknown;
     }>]>>;
-    seed: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnion<[z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">, z.ZodPromise<z.ZodArray<z.ZodRecord<z.ZodString, z.ZodUnknown>, "many">>]>>>;
     writable: z.ZodLiteral<true>;
+    table: z.ZodAny;
+    _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
 }, "strip", z.ZodTypeAny, {
     fields: Record<string, {
         type: "boolean";
@@ -1332,7 +1348,8 @@ export declare const collectionsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.Z
         default?: unknown;
     }>;
     writable: true;
-    seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+    table?: any;
+    _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }, {
     fields: Record<string, {
         type: "boolean";
@@ -1369,7 +1386,8 @@ export declare const collectionsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.Z
         default?: unknown;
     }>;
     writable: true;
-    seed?: ((...args: unknown[]) => Record<string, unknown>[] | Promise<Record<string, unknown>[]>) | undefined;
+    table?: any;
+    _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }>]>>;
 export type BooleanField = z.infer<typeof booleanFieldSchema>;
 export type NumberField = z.infer<typeof numberFieldSchema>;
@@ -1446,6 +1464,7 @@ export type AstroId<T extends Pick<GeneratedConfig<'string'>, 'tableName'>> = SQ
     baseColumn: never;
 }>;
 export type MaybePromise<T> = T | Promise<T>;
+export type MaybeArray<T> = T | T[];
 export type Column<T extends DBField['type'], S extends GeneratedConfig> = T extends 'boolean' ? AstroBoolean<S> : T extends 'number' ? AstroNumber<S> : T extends 'text' ? AstroText<S> : T extends 'date' ? AstroDate<S> : T extends 'json' ? AstroJson<S> : never;
 export type Table<TTableName extends string, TFields extends Record<string, Pick<DBField, 'type' | 'default' | 'optional'>>> = SQLiteTableWithColumns<{
     name: TTableName;

package/dist/types.js

@@ -40,16 +40,17 @@ const fieldSchema = z.union([
   jsonFieldSchema
 ]);
 const fieldsSchema = z.record(fieldSchema);
-const dataResponse = z.array(z.record(z.unknown()));
 const readableCollectionSchema = z.object({
   fields: fieldsSchema,
-  data: z.function().returns(z.union([dataResponse, z.promise(dataResponse)])).optional(),
-  writable: z.literal(false)
+  writable: z.literal(false),
+  table: z.any(),
+  _setMeta: z.function().optional()
 });
 const writableCollectionSchema = z.object({
   fields: fieldsSchema,
-  seed: z.function().returns(z.union([dataResponse, z.promise(dataResponse)])).optional(),
-  writable: z.literal(true)
+  writable: z.literal(true),
+  table: z.any(),
+  _setMeta: z.function().optional()
 });
 const collectionSchema = z.union([readableCollectionSchema, writableCollectionSchema]);
 const collectionsSchema = z.record(collectionSchema);

package/dist/utils-runtime.js

@@ -3,7 +3,7 @@ import { z } from "zod";
 import { DB_PATH } from "./consts.js";
 function findLocalDatabase(localDbURL) {
   let dbURL = void 0;
-  if (import.meta.env.VERCEL) {
+  if (process.env.VERCEL) {
     dbURL = new URL(DB_PATH, "file://" + process.cwd() + "/vercel/path0/");
   } else {
     dbURL = new URL(localDbURL);

package/dist/vite-plugin-db.js

@@ -59,7 +59,9 @@ function getStudioVirtualModContents({
   return `
 import {collectionToTable, createRemoteDatabaseClient} from ${INTERNAL_MOD_IMPORT};
 
-export const db = await createRemoteDatabaseClient(${JSON.stringify(appToken)}, import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL);
+export const db = await createRemoteDatabaseClient(${JSON.stringify(
+    appToken
+  )}, import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL);
 export * from ${DRIZZLE_MOD_IMPORT};
 
 ${getStringifiedCollectionExports(collections)}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.1.14",
+  "version": "0.1.16",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -40,7 +40,7 @@
     "components"
   ],
   "dependencies": {
-    "@libsql/client": "0.4.0-pre.5",
+    "@libsql/client": "0.4.0-pre.10",
     "deep-diff": "^1.0.2",
     "drizzle-orm": "^0.28.6",
     "kleur": "^4.1.5",