@astrojs/db 0.3.3 → 0.3.5

package/dist/core/types.js

@@ -13,8 +13,8 @@ const sqlSchema = z.instanceof(SQL).transform(
 );
 const baseFieldSchema = z.object({
   label: z.string().optional(),
-  optional: z.boolean().optional(),
-  unique: z.boolean().optional(),
+  optional: z.boolean().optional().default(false),
+  unique: z.boolean().optional().default(false),
   // Defined when `defineCollection()` is called
   name: z.string().optional(),
   collection: z.string().optional()
@@ -28,8 +28,8 @@ const booleanFieldSchema = z.object({
 const numberFieldBaseSchema = baseFieldSchema.omit({ optional: true }).and(
   z.union([
     z.object({
-      primaryKey: z.literal(false).optional(),
-      optional: z.boolean().optional(),
+      primaryKey: z.literal(false).optional().default(false),
+      optional: baseFieldSchema.shape.optional,
       default: z.union([z.number(), sqlSchema]).optional()
     }),
     z.object({
@@ -57,8 +57,8 @@ const textFieldBaseSchema = baseFieldSchema.omit({ optional: true }).extend({
 }).and(
   z.union([
     z.object({
-      primaryKey: z.literal(false).optional(),
-      optional: z.boolean().optional()
+      primaryKey: z.literal(false).optional().default(false),
+      optional: baseFieldSchema.shape.optional
     }),
     z.object({
       // text primary key allows NULL values.
@@ -84,9 +84,8 @@ const dateFieldSchema = z.object({
   schema: baseFieldSchema.extend({
     default: z.union([
       sqlSchema,
-      // allow date-like defaults in user config,
-      // transform to ISO string for D1 storage
-      z.coerce.date().transform((d) => d.toISOString())
+      // transform to ISO string for serialization
+      z.date().transform((d) => d.toISOString())
     ]).optional()
   })
 });
@@ -146,7 +145,8 @@ function defineData(fn) {
 const dbConfigSchema = z.object({
   studio: z.boolean().optional(),
   collections: collectionsSchema.optional(),
-  data: z.function().returns(z.union([z.void(), z.promise(z.void())])).optional()
+  data: z.function().returns(z.union([z.void(), z.promise(z.void())])).optional(),
+  unsafeWritable: z.boolean().optional().default(false)
 });
 const astroConfigWithDbSchema = z.object({
   db: dbConfigSchema.optional()
@@ -200,6 +200,7 @@ export {
   defineData,
   defineWritableCollection,
   field,
+  fieldSchema,
   indexSchema,
   readableCollectionSchema,
   referenceableFieldSchema,

package/dist/internal.d.ts

@@ -1,12 +1,12 @@
 import type { SqliteRemoteDatabase } from 'drizzle-orm/sqlite-proxy';
-import { type BooleanField, type DBCollection, type DBCollections, type DBField, type DateField, type FieldType, type JsonField, type NumberField, type TextField } from './types.js';
+import { type BooleanColumn, type DBCollection, type DBCollections, type DBColumn, type DateColumn, type ColumnType, type JsonColumn, type NumberColumn, type TextColumn } from './types.js';
 import { type SQL, type ColumnDataType } from 'drizzle-orm';
 import type { AstroIntegrationLogger } from 'astro';
 import type { DBUserConfig } from './config.js';
 export type SqliteDB = SqliteRemoteDatabase;
 export type { Table } from './types.js';
 export { createRemoteDatabaseClient } from './utils-runtime.js';
-export declare function hasPrimaryKey(field: DBField): boolean;
+export declare function hasPrimaryKey(column: DBColumn): boolean;
 export declare function createLocalDatabaseClient({ collections, dbUrl, seeding, }: {
     dbUrl: string;
     collections: DBCollections;
@@ -21,11 +21,11 @@ export declare function setupDbTables({ db, data, collections, logger, mode, }:
 }): Promise<void>;
 export declare function getCreateTableQuery(collectionName: string, collection: DBCollection): string;
 export declare function getTableIndexQueries(collectionName: string, collection: DBCollection): SQL<unknown>[];
-export declare function schemaTypeToSqlType(type: FieldType): 'text' | 'integer';
-export declare function getModifiers(fieldName: string, field: DBField): string;
-type WithDefaultDefined<T extends DBField> = T & Required<Pick<T, 'default'>>;
-type DBFieldWithDefault = WithDefaultDefined<TextField> | WithDefaultDefined<DateField> | WithDefaultDefined<NumberField> | WithDefaultDefined<BooleanField> | WithDefaultDefined<JsonField>;
-export declare function hasDefault(field: DBField): field is DBFieldWithDefault;
+export declare function schemaTypeToSqlType(type: ColumnType): 'text' | 'integer';
+export declare function getModifiers(columnName: string, column: DBColumn): string;
+type WithDefaultDefined<T extends DBColumn> = T & Required<Pick<T, 'default'>>;
+type DBColumnWithDefault = WithDefaultDefined<TextColumn> | WithDefaultDefined<DateColumn> | WithDefaultDefined<NumberColumn> | WithDefaultDefined<BooleanColumn> | WithDefaultDefined<JsonColumn>;
+export declare function hasDefault(column: DBColumn): column is DBColumnWithDefault;
 export declare function collectionToTable(name: string, collection: DBCollection, isJsonSerializable?: boolean): import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
     name: string;
     schema: undefined;

package/dist/runtime/index.d.ts

@@ -9,7 +9,7 @@ export declare function hasPrimaryKey(field: DBField): boolean;
 export declare const NOW: SQL<unknown>;
 export declare const TRUE: SQL<unknown>;
 export declare const FALSE: SQL<unknown>;
-export declare function collectionToTable(name: string, collection: DBCollection, isJsonSerializable?: boolean): import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
+export declare function collectionToTable(name: string, collection: DBCollection): import("drizzle-orm/sqlite-core").SQLiteTableWithColumns<{
     name: string;
     schema: undefined;
     columns: {

package/dist/runtime/index.js

@@ -24,6 +24,7 @@ const dateType = customType({
     return value.toISOString();
   },
   fromDriver(value) {
+    console.log("driver", value);
     return new Date(value);
   }
 });
@@ -38,13 +39,13 @@ const jsonType = customType({
     return JSON.parse(value);
   }
 });
-function collectionToTable(name, collection, isJsonSerializable = true) {
+function collectionToTable(name, collection) {
   const columns = {};
   if (!Object.entries(collection.fields).some(([, field]) => hasPrimaryKey(field))) {
     columns["_id"] = integer("_id").primaryKey();
   }
   for (const [fieldName, field] of Object.entries(collection.fields)) {
-    columns[fieldName] = columnMapper(fieldName, field, isJsonSerializable);
+    columns[fieldName] = columnMapper(fieldName, field);
   }
   const table = sqliteTable(name, columns, (ormTable) => {
     const indexes = {};
@@ -62,7 +63,7 @@ function collectionToTable(name, collection, isJsonSerializable = true) {
 function atLeastOne(arr) {
   return arr.length > 0;
 }
-function columnMapper(fieldName, field, isJsonSerializable) {
+function columnMapper(fieldName, field) {
   let c;
   switch (field.type) {
     case "text": {
@@ -93,23 +94,10 @@ function columnMapper(fieldName, field, isJsonSerializable) {
         c = c.default(field.schema.default);
       break;
     case "date": {
-      if (isJsonSerializable) {
-        c = text(fieldName);
-        if (field.schema.default !== void 0) {
-          c = c.default(handleSerializedSQL(field.schema.default));
-        }
-      } else {
-        c = dateType(fieldName);
-        if (field.schema.default !== void 0) {
-          const def = handleSerializedSQL(field.schema.default);
-          c = c.default(
-            def instanceof SQL ? def : (
-              // default comes pre-transformed to an ISO string for D1 storage.
-              // parse back to a Date for Drizzle.
-              z.coerce.date().parse(field.schema.default)
-            )
-          );
-        }
+      c = dateType(fieldName);
+      if (field.schema.default !== void 0) {
+        const def = handleSerializedSQL(field.schema.default);
+        c = c.default(typeof def === "string" ? new Date(def) : def);
       }
       break;
     }

package/dist/runtime/types.d.ts

@@ -1,6 +1,6 @@
 import type { ColumnDataType, ColumnBaseConfig } from 'drizzle-orm';
 import type { SQLiteColumn, SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core';
-import type { DBField } from '../core/types.js';
+import type { DBField, FieldsConfig } from '../core/types.js';
 type GeneratedConfig<T extends ColumnDataType = ColumnDataType> = Pick<ColumnBaseConfig<T, string>, 'name' | 'tableName' | 'notNull' | 'hasDefault'>;
 export type AstroText<T extends GeneratedConfig<'string'>> = SQLiteColumn<T & {
     data: string;
@@ -43,7 +43,7 @@ export type AstroJson<T extends GeneratedConfig<'custom'>> = SQLiteColumn<T & {
     baseColumn: never;
 }>;
 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' | 'schema'>>> = SQLiteTableWithColumns<{
+export type Table<TTableName extends string, TFields extends FieldsConfig> = SQLiteTableWithColumns<{
     name: TTableName;
     schema: undefined;
     dialect: 'sqlite';

package/dist/types.d.ts

@@ -1,7 +1,7 @@
 import type { ColumnDataType, ColumnBaseConfig } from 'drizzle-orm';
 import type { SQLiteColumn, SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core';
 import { z } from 'zod';
-declare const booleanFieldSchema: z.ZodObject<{
+declare const booleanColumnSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodString>;
     optional: z.ZodOptional<z.ZodBoolean>;
     unique: z.ZodOptional<z.ZodBoolean>;
@@ -20,7 +20,7 @@ declare const booleanFieldSchema: z.ZodObject<{
     unique?: boolean | undefined;
     default?: boolean | undefined;
 }>;
-declare const numberFieldSchema: z.ZodObject<{
+declare const numberColumnSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodString>;
     optional: z.ZodOptional<z.ZodBoolean>;
     unique: z.ZodOptional<z.ZodBoolean>;
@@ -42,7 +42,7 @@ declare const numberFieldSchema: z.ZodObject<{
     default?: number | undefined;
     primaryKey?: boolean | undefined;
 }>;
-declare const textFieldSchema: z.ZodObject<{
+declare const textColumnSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodString>;
     optional: z.ZodOptional<z.ZodBoolean>;
     unique: z.ZodOptional<z.ZodBoolean>;
@@ -67,7 +67,7 @@ declare const textFieldSchema: z.ZodObject<{
     default?: string | undefined;
     primaryKey?: boolean | undefined;
 }>;
-declare const dateFieldSchema: z.ZodObject<{
+declare const dateColumnSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodString>;
     optional: z.ZodOptional<z.ZodBoolean>;
     unique: z.ZodOptional<z.ZodBoolean>;
@@ -86,7 +86,7 @@ declare const dateFieldSchema: z.ZodObject<{
     unique?: boolean | undefined;
     default?: Date | "now" | undefined;
 }>;
-declare const jsonFieldSchema: z.ZodObject<{
+declare const jsonColumnSchema: z.ZodObject<{
     label: z.ZodOptional<z.ZodString>;
     optional: z.ZodOptional<z.ZodBoolean>;
     unique: z.ZodOptional<z.ZodBoolean>;
@@ -105,7 +105,7 @@ declare const jsonFieldSchema: z.ZodObject<{
     unique?: boolean | undefined;
     default?: unknown;
 }>;
-declare const fieldSchema: z.ZodUnion<[z.ZodObject<{
+declare const columnSchema: z.ZodUnion<[z.ZodObject<{
     label: z.ZodOptional<z.ZodString>;
     optional: z.ZodOptional<z.ZodBoolean>;
     unique: z.ZodOptional<z.ZodBoolean>;
@@ -205,7 +205,7 @@ declare const fieldSchema: z.ZodUnion<[z.ZodObject<{
     unique?: boolean | undefined;
     default?: unknown;
 }>]>;
-declare const fieldsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+declare const columnsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
     label: z.ZodOptional<z.ZodString>;
     optional: z.ZodOptional<z.ZodBoolean>;
     unique: z.ZodOptional<z.ZodBoolean>;
@@ -316,7 +316,7 @@ export declare const indexSchema: z.ZodObject<{
     unique?: boolean | undefined;
 }>;
 export declare const readableCollectionSchema: z.ZodObject<{
-    fields: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+    columns: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
         label: z.ZodOptional<z.ZodString>;
         optional: z.ZodOptional<z.ZodBoolean>;
         unique: z.ZodOptional<z.ZodBoolean>;
@@ -430,7 +430,7 @@ export declare const readableCollectionSchema: z.ZodObject<{
     _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
     writable: z.ZodLiteral<false>;
 }, "strip", z.ZodTypeAny, {
-    fields: Record<string, {
+    columns: Record<string, {
         type: "boolean";
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -472,7 +472,7 @@ export declare const readableCollectionSchema: z.ZodObject<{
     table?: any;
     _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }, {
-    fields: Record<string, {
+    columns: Record<string, {
         type: "boolean";
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -515,7 +515,7 @@ export declare const readableCollectionSchema: z.ZodObject<{
     _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }>;
 export declare const writableCollectionSchema: z.ZodObject<{
-    fields: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+    columns: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
         label: z.ZodOptional<z.ZodString>;
         optional: z.ZodOptional<z.ZodBoolean>;
         unique: z.ZodOptional<z.ZodBoolean>;
@@ -629,7 +629,7 @@ export declare const writableCollectionSchema: z.ZodObject<{
     _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
     writable: z.ZodLiteral<true>;
 }, "strip", z.ZodTypeAny, {
-    fields: Record<string, {
+    columns: Record<string, {
         type: "boolean";
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -671,7 +671,7 @@ export declare const writableCollectionSchema: z.ZodObject<{
     table?: any;
     _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }, {
-    fields: Record<string, {
+    columns: Record<string, {
         type: "boolean";
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -714,7 +714,7 @@ export declare const writableCollectionSchema: z.ZodObject<{
     _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }>;
 export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
-    fields: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+    columns: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
         label: z.ZodOptional<z.ZodString>;
         optional: z.ZodOptional<z.ZodBoolean>;
         unique: z.ZodOptional<z.ZodBoolean>;
@@ -828,7 +828,7 @@ export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
     _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
     writable: z.ZodLiteral<false>;
 }, "strip", z.ZodTypeAny, {
-    fields: Record<string, {
+    columns: Record<string, {
         type: "boolean";
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -870,7 +870,7 @@ export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
     table?: any;
     _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }, {
-    fields: Record<string, {
+    columns: Record<string, {
         type: "boolean";
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -912,7 +912,7 @@ export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
     table?: any;
     _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }>, z.ZodObject<{
-    fields: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+    columns: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
         label: z.ZodOptional<z.ZodString>;
         optional: z.ZodOptional<z.ZodBoolean>;
         unique: z.ZodOptional<z.ZodBoolean>;
@@ -1026,7 +1026,7 @@ export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
     _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
     writable: z.ZodLiteral<true>;
 }, "strip", z.ZodTypeAny, {
-    fields: Record<string, {
+    columns: Record<string, {
         type: "boolean";
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -1068,7 +1068,7 @@ export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
     table?: any;
     _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }, {
-    fields: Record<string, {
+    columns: Record<string, {
         type: "boolean";
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -1111,7 +1111,7 @@ export declare const collectionSchema: z.ZodUnion<[z.ZodObject<{
     _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<{
+    columns: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
         label: z.ZodOptional<z.ZodString>;
         optional: z.ZodOptional<z.ZodBoolean>;
         unique: z.ZodOptional<z.ZodBoolean>;
@@ -1225,7 +1225,7 @@ export declare const collectionsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.Z
     _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
     writable: z.ZodLiteral<false>;
 }, "strip", z.ZodTypeAny, {
-    fields: Record<string, {
+    columns: Record<string, {
         type: "boolean";
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -1267,7 +1267,7 @@ export declare const collectionsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.Z
     table?: any;
     _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }, {
-    fields: Record<string, {
+    columns: Record<string, {
         type: "boolean";
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -1309,7 +1309,7 @@ export declare const collectionsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.Z
     table?: any;
     _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }>, z.ZodObject<{
-    fields: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+    columns: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
         label: z.ZodOptional<z.ZodString>;
         optional: z.ZodOptional<z.ZodBoolean>;
         unique: z.ZodOptional<z.ZodBoolean>;
@@ -1423,7 +1423,7 @@ export declare const collectionsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.Z
     _setMeta: z.ZodOptional<z.ZodFunction<z.ZodTuple<[], z.ZodUnknown>, z.ZodUnknown>>;
     writable: z.ZodLiteral<true>;
 }, "strip", z.ZodTypeAny, {
-    fields: Record<string, {
+    columns: Record<string, {
         type: "boolean";
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -1465,7 +1465,7 @@ export declare const collectionsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.Z
     table?: any;
     _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }, {
-    fields: Record<string, {
+    columns: Record<string, {
         type: "boolean";
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -1507,16 +1507,16 @@ export declare const collectionsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.Z
     table?: any;
     _setMeta?: ((...args: unknown[]) => unknown) | undefined;
 }>]>>;
-export type BooleanField = z.infer<typeof booleanFieldSchema>;
-export type NumberField = z.infer<typeof numberFieldSchema>;
-export type TextField = z.infer<typeof textFieldSchema>;
-export type DateField = z.infer<typeof dateFieldSchema>;
-export type DateFieldInput = z.input<typeof dateFieldSchema>;
-export type JsonField = z.infer<typeof jsonFieldSchema>;
-export type FieldType = BooleanField['type'] | NumberField['type'] | TextField['type'] | DateField['type'] | JsonField['type'];
-export type DBField = z.infer<typeof fieldSchema>;
-export type DBFieldInput = DateFieldInput | BooleanField | NumberField | TextField | JsonField;
-export type DBFields = z.infer<typeof fieldsSchema>;
+export type BooleanColumn = z.infer<typeof booleanColumnSchema>;
+export type NumberColumn = z.infer<typeof numberColumnSchema>;
+export type TextColumn = z.infer<typeof textColumnSchema>;
+export type DateColumn = z.infer<typeof dateColumnSchema>;
+export type DateColumnInput = z.input<typeof dateColumnSchema>;
+export type JsonColumn = z.infer<typeof jsonColumnSchema>;
+export type ColumnType = BooleanColumn['type'] | NumberColumn['type'] | TextColumn['type'] | DateColumn['type'] | JsonColumn['type'];
+export type DBColumn = z.infer<typeof columnSchema>;
+export type DBColumnInput = DateColumnInput | BooleanColumn | NumberColumn | TextColumn | JsonColumn;
+export type DBColumns = z.infer<typeof columnsSchema>;
 export type DBCollection = z.infer<typeof readableCollectionSchema | typeof writableCollectionSchema>;
 export type DBCollections = Record<string, DBCollection>;
 export type DBSnapshot = {
@@ -1583,8 +1583,8 @@ export type AstroId<T extends Pick<GeneratedConfig<'string'>, 'tableName'>> = SQ
 }>;
 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<{
+export type Column<T extends DBColumn['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, TColumns extends Record<string, Pick<DBColumn, 'type' | 'default' | 'optional'>>> = SQLiteTableWithColumns<{
     name: TTableName;
     schema: undefined;
     dialect: 'sqlite';
@@ -1593,11 +1593,11 @@ export type Table<TTableName extends string, TFields extends Record<string, Pick
             tableName: TTableName;
         }>;
     } & {
-        [K in Extract<keyof TFields, string>]: Column<TFields[K]['type'], {
+        [K in Extract<keyof TColumns, string>]: Column<TColumns[K]['type'], {
             tableName: TTableName;
             name: K;
-            hasDefault: TFields[K]['default'] extends undefined ? false : true;
-            notNull: TFields[K]['optional'] extends true ? false : true;
+            hasDefault: TColumns[K]['default'] extends undefined ? false : true;
+            notNull: TColumns[K]['optional'] extends true ? false : true;
         }>;
     };
 }>;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.3.3",
+  "version": "0.3.5",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -70,8 +70,8 @@
     "mocha": "^10.2.0",
     "typescript": "^5.2.2",
     "vite": "^4.4.11",
-    "astro-scripts": "0.0.14",
-    "astro": "4.2.4"
+    "astro": "4.4.0",
+    "astro-scripts": "0.0.14"
   },
   "scripts": {
     "build": "astro-scripts build \"src/**/*.ts\" && tsc",