@astrojs/db 0.15.1 → 0.16.1

package/dist/core/schemas.d.ts

@@ -321,7 +321,7 @@ export declare const dateColumnSchema: z.ZodObject<{
         label?: string | undefined;
         collection?: string | undefined;
     }, {
-        default?: SQL<any> | Date | undefined;
+        default?: Date | SQL<any> | undefined;
         name?: string | undefined;
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -343,7 +343,7 @@ export declare const dateColumnSchema: z.ZodObject<{
 }, {
     type: "date";
     schema: {
-        default?: SQL<any> | Date | undefined;
+        default?: Date | SQL<any> | undefined;
         name?: string | undefined;
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -619,7 +619,7 @@ export declare const columnSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<
         label?: string | undefined;
         collection?: string | undefined;
     }, {
-        default?: SQL<any> | Date | undefined;
+        default?: Date | SQL<any> | undefined;
         name?: string | undefined;
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -641,7 +641,7 @@ export declare const columnSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<
 }, {
     type: "date";
     schema: {
-        default?: SQL<any> | Date | undefined;
+        default?: Date | SQL<any> | undefined;
         name?: string | undefined;
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -1063,7 +1063,7 @@ export declare const columnsSchema: z.ZodRecord<z.ZodString, z.ZodDiscriminatedU
         label?: string | undefined;
         collection?: string | undefined;
     }, {
-        default?: SQL<any> | Date | undefined;
+        default?: Date | SQL<any> | undefined;
         name?: string | undefined;
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -1085,7 +1085,7 @@ export declare const columnsSchema: z.ZodRecord<z.ZodString, z.ZodDiscriminatedU
 }, {
     type: "date";
     schema: {
-        default?: SQL<any> | Date | undefined;
+        default?: Date | SQL<any> | undefined;
         name?: string | undefined;
         label?: string | undefined;
         optional?: boolean | undefined;
@@ -1391,7 +1391,7 @@ export declare const tableSchema: z.ZodObject<{
             label?: string | undefined;
             collection?: string | undefined;
         }, {
-            default?: SQL<any> | Date | undefined;
+            default?: Date | SQL<any> | undefined;
             name?: string | undefined;
             label?: string | undefined;
             optional?: boolean | undefined;
@@ -1413,7 +1413,7 @@ export declare const tableSchema: z.ZodObject<{
     }, {
         type: "date";
         schema: {
-            default?: SQL<any> | Date | undefined;
+            default?: Date | SQL<any> | undefined;
             name?: string | undefined;
             label?: string | undefined;
             optional?: boolean | undefined;
@@ -1497,6 +1497,7 @@ export declare const tableSchema: z.ZodObject<{
     foreignKeys: z.ZodOptional<z.ZodArray<z.ZodType<ForeignKeysOutput, ZodTypeDef, ForeignKeysInput>, "many">>;
     deprecated: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
 }, "strip", z.ZodTypeAny, {
+    deprecated: boolean;
     columns: Record<string, {
         type: "boolean";
         schema: {
@@ -1569,7 +1570,6 @@ export declare const tableSchema: z.ZodObject<{
             collection?: string | undefined;
         };
     }>;
-    deprecated: boolean;
     indexes?: {
         on: string | string[];
         name?: string | undefined;
@@ -1632,7 +1632,7 @@ export declare const tableSchema: z.ZodObject<{
     } | {
         type: "date";
         schema: {
-            default?: SQL<any> | Date | undefined;
+            default?: Date | SQL<any> | undefined;
             name?: string | undefined;
             label?: string | undefined;
             optional?: boolean | undefined;
@@ -1880,7 +1880,7 @@ export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOb
             label?: string | undefined;
             collection?: string | undefined;
         }, {
-            default?: SQL<any> | Date | undefined;
+            default?: Date | SQL<any> | undefined;
             name?: string | undefined;
             label?: string | undefined;
             optional?: boolean | undefined;
@@ -1902,7 +1902,7 @@ export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOb
     }, {
         type: "date";
         schema: {
-            default?: SQL<any> | Date | undefined;
+            default?: Date | SQL<any> | undefined;
             name?: string | undefined;
             label?: string | undefined;
             optional?: boolean | undefined;
@@ -1986,6 +1986,7 @@ export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOb
     foreignKeys: z.ZodOptional<z.ZodArray<z.ZodType<ForeignKeysOutput, ZodTypeDef, ForeignKeysInput>, "many">>;
     deprecated: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
 }, "strip", z.ZodTypeAny, {
+    deprecated: boolean;
     columns: Record<string, {
         type: "boolean";
         schema: {
@@ -2058,7 +2059,6 @@ export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOb
             collection?: string | undefined;
         };
     }>;
-    deprecated: boolean;
     indexes?: {
         on: string | string[];
         name?: string | undefined;
@@ -2121,7 +2121,7 @@ export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOb
     } | {
         type: "date";
         schema: {
-            default?: SQL<any> | Date | undefined;
+            default?: Date | SQL<any> | undefined;
             name?: string | undefined;
             label?: string | undefined;
             optional?: boolean | undefined;
@@ -2152,6 +2152,7 @@ export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOb
     }> | undefined;
     foreignKeys?: ForeignKeysInput[] | undefined;
 }>>, Record<string, {
+    deprecated: boolean;
     columns: Record<string, {
         type: "boolean";
         schema: {
@@ -2224,7 +2225,6 @@ export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOb
             collection?: string | undefined;
         };
     }>;
-    deprecated: boolean;
     indexes?: {
         on: string | string[];
         name?: string | undefined;
@@ -2453,7 +2453,7 @@ export declare const dbConfigSchema: z.ZodEffects<z.ZodObject<{
                 label?: string | undefined;
                 collection?: string | undefined;
             }, {
-                default?: SQL<any> | Date | undefined;
+                default?: Date | SQL<any> | undefined;
                 name?: string | undefined;
                 label?: string | undefined;
                 optional?: boolean | undefined;
@@ -2475,7 +2475,7 @@ export declare const dbConfigSchema: z.ZodEffects<z.ZodObject<{
         }, {
             type: "date";
             schema: {
-                default?: SQL<any> | Date | undefined;
+                default?: Date | SQL<any> | undefined;
                 name?: string | undefined;
                 label?: string | undefined;
                 optional?: boolean | undefined;
@@ -2559,6 +2559,7 @@ export declare const dbConfigSchema: z.ZodEffects<z.ZodObject<{
         foreignKeys: z.ZodOptional<z.ZodArray<z.ZodType<ForeignKeysOutput, ZodTypeDef, ForeignKeysInput>, "many">>;
         deprecated: z.ZodDefault<z.ZodOptional<z.ZodBoolean>>;
     }, "strip", z.ZodTypeAny, {
+        deprecated: boolean;
         columns: Record<string, {
             type: "boolean";
             schema: {
@@ -2631,7 +2632,6 @@ export declare const dbConfigSchema: z.ZodEffects<z.ZodObject<{
                 collection?: string | undefined;
             };
         }>;
-        deprecated: boolean;
         indexes?: {
             on: string | string[];
             name?: string | undefined;
@@ -2694,7 +2694,7 @@ export declare const dbConfigSchema: z.ZodEffects<z.ZodObject<{
         } | {
             type: "date";
             schema: {
-                default?: SQL<any> | Date | undefined;
+                default?: Date | SQL<any> | undefined;
                 name?: string | undefined;
                 label?: string | undefined;
                 optional?: boolean | undefined;
@@ -2725,6 +2725,7 @@ export declare const dbConfigSchema: z.ZodEffects<z.ZodObject<{
         }> | undefined;
         foreignKeys?: ForeignKeysInput[] | undefined;
     }>>, Record<string, {
+        deprecated: boolean;
         columns: Record<string, {
             type: "boolean";
             schema: {
@@ -2797,7 +2798,6 @@ export declare const dbConfigSchema: z.ZodEffects<z.ZodObject<{
                 collection?: string | undefined;
             };
         }>;
-        deprecated: boolean;
         indexes?: {
             on: string | string[];
             name?: string | undefined;
@@ -2810,6 +2810,7 @@ export declare const dbConfigSchema: z.ZodEffects<z.ZodObject<{
     }>, unknown>>;
 }, "strip", z.ZodTypeAny, {
     tables?: Record<string, {
+        deprecated: boolean;
         columns: Record<string, {
             type: "boolean";
             schema: {
@@ -2882,7 +2883,6 @@ export declare const dbConfigSchema: z.ZodEffects<z.ZodObject<{
                 collection?: string | undefined;
             };
         }>;
-        deprecated: boolean;
         indexes?: {
             on: string | string[];
             name?: string | undefined;
@@ -2901,6 +2901,7 @@ export declare const dbConfigSchema: z.ZodEffects<z.ZodObject<{
             on: string | string[];
             unique?: boolean | undefined;
         }>;
+        deprecated: boolean;
         columns: Record<string, {
             type: "boolean";
             schema: {
@@ -2973,7 +2974,6 @@ export declare const dbConfigSchema: z.ZodEffects<z.ZodObject<{
                 collection?: string | undefined;
             };
         }>;
-        deprecated: boolean;
         foreignKeys?: ForeignKeysOutput[] | undefined;
     }>;
 }, {

package/dist/core/schemas.js

@@ -65,7 +65,7 @@ const textColumnBaseSchema = baseColumnSchema.omit({ optional: true }).extend({
     z.object({
       // text primary key allows NULL values.
       // NULL values bypass unique checks, which could
-      // lead to duplicate URLs per record in Astro Studio.
+      // lead to duplicate URLs per record.
       // disable `optional` for primary keys.
       primaryKey: z.literal(true),
       optional: z.literal(false).optional()

package/dist/core/utils.d.ts

@@ -1,23 +1,14 @@
-import { type ManagedAppToken } from '@astrojs/studio';
 import type { AstroConfig, AstroIntegration } from 'astro';
 import './types.js';
 export type VitePlugin = Required<AstroConfig['vite']>['plugins'][number];
 export declare function getAstroEnv(envMode?: string): Record<`ASTRO_${string}`, string>;
 export type RemoteDatabaseInfo = {
-    type: 'libsql' | 'studio';
     url: string;
+    token: string;
 };
 export declare function getRemoteDatabaseInfo(): RemoteDatabaseInfo;
-export declare function getManagedRemoteToken(token?: string, dbInfo?: RemoteDatabaseInfo): Promise<ManagedAppToken>;
 export declare function getDbDirectoryUrl(root: URL | string): URL;
 export declare function defineDbIntegration(integration: AstroIntegration): AstroIntegration;
-export type Result<T> = {
-    success: true;
-    data: T;
-} | {
-    success: false;
-    data: unknown;
-};
 /**
  * Map an object's values to a new set of values
  * while preserving types.

package/dist/core/utils.js

@@ -1,4 +1,3 @@
-import { getAstroStudioEnv, getManagedAppTokenOrExit } from "@astrojs/studio";
 import { loadEnv } from "vite";
 import "./types.js";
 function getAstroEnv(envMode = "") {
@@ -7,34 +6,11 @@ function getAstroEnv(envMode = "") {
 }
 function getRemoteDatabaseInfo() {
   const astroEnv = getAstroEnv();
-  const studioEnv = getAstroStudioEnv();
-  if (studioEnv.ASTRO_STUDIO_REMOTE_DB_URL)
-    return {
-      type: "studio",
-      url: studioEnv.ASTRO_STUDIO_REMOTE_DB_URL
-    };
-  if (astroEnv.ASTRO_DB_REMOTE_URL)
-    return {
-      type: "libsql",
-      url: astroEnv.ASTRO_DB_REMOTE_URL
-    };
   return {
-    type: "studio",
-    url: "https://db.services.astro.build"
+    url: astroEnv.ASTRO_DB_REMOTE_URL,
+    token: astroEnv.ASTRO_DB_APP_TOKEN
   };
 }
-function getManagedRemoteToken(token, dbInfo) {
-  dbInfo ??= getRemoteDatabaseInfo();
-  if (dbInfo.type === "studio") {
-    return getManagedAppTokenOrExit(token);
-  }
-  const astroEnv = getAstroEnv();
-  return Promise.resolve({
-    token: token ?? astroEnv.ASTRO_DB_APP_TOKEN,
-    renew: () => Promise.resolve(),
-    destroy: () => Promise.resolve()
-  });
-}
 function getDbDirectoryUrl(root) {
   return new URL("db/", root);
 }
@@ -50,7 +26,6 @@ export {
   defineDbIntegration,
   getAstroEnv,
   getDbDirectoryUrl,
-  getManagedRemoteToken,
   getRemoteDatabaseInfo,
   mapObject
 };

package/dist/runtime/db-client.d.ts

@@ -1,16 +1,15 @@
 import { type Config as LibSQLConfig } from '@libsql/client';
 import type { LibSQLDatabase } from 'drizzle-orm/libsql';
-import { type SqliteRemoteDatabase } from 'drizzle-orm/sqlite-proxy';
 type LocalDbClientOptions = {
     dbUrl: string;
-    enableTransactions: boolean;
 };
 export declare function createLocalDatabaseClient(options: LocalDbClientOptions): LibSQLDatabase;
 type RemoteDbClientOptions = {
-    dbType: 'studio' | 'libsql';
-    appToken: string;
-    remoteUrl: string | URL;
+    token: string;
+    url: string | URL;
+};
+export declare function createRemoteDatabaseClient(options: RemoteDbClientOptions): LibSQLDatabase<Record<string, never>> & {
+    $client: import("@libsql/client").Client;
 };
-export declare function createRemoteDatabaseClient(options: RemoteDbClientOptions): SqliteRemoteDatabase<Record<string, never>>;
 export declare function parseOpts(config: Record<string, string>): Partial<LibSQLConfig>;
 export {};

package/dist/runtime/db-client.js

@@ -1,37 +1,15 @@
 import { createClient } from "@libsql/client";
 import { drizzle as drizzleLibsql } from "drizzle-orm/libsql";
-import { drizzle as drizzleProxy } from "drizzle-orm/sqlite-proxy";
-import { z } from "zod";
-import { DetailedLibsqlError, safeFetch } from "./utils.js";
 const isWebContainer = !!process.versions?.webcontainer;
-function applyTransactionNotSupported(db) {
-  Object.assign(db, {
-    transaction() {
-      throw new Error(
-        "`db.transaction()` is not currently supported. We recommend `db.batch()` for automatic error rollbacks across multiple queries."
-      );
-    }
-  });
-}
 function createLocalDatabaseClient(options) {
   const url = isWebContainer ? "file:content.db" : options.dbUrl;
   const client = createClient({ url });
   const db = drizzleLibsql(client);
-  if (!options.enableTransactions) {
-    applyTransactionNotSupported(db);
-  }
   return db;
 }
-const remoteResultSchema = z.object({
-  columns: z.array(z.string()),
-  columnTypes: z.array(z.string()),
-  rows: z.array(z.array(z.unknown())),
-  rowsAffected: z.number(),
-  lastInsertRowid: z.unknown().optional()
-});
 function createRemoteDatabaseClient(options) {
-  const remoteUrl = new URL(options.remoteUrl);
-  return options.dbType === "studio" ? createStudioDatabaseClient(options.appToken, remoteUrl) : createRemoteLibSQLClient(options.appToken, remoteUrl, options.remoteUrl.toString());
+  const url = new URL(options.url);
+  return createRemoteLibSQLClient(options.token, url, options.url.toString());
 }
 function parseOpts(config) {
   return {
@@ -43,153 +21,18 @@ function parseOpts(config) {
     ...config.concurrency ? { concurrency: parseInt(config.concurrency) } : {}
   };
 }
-function createRemoteLibSQLClient(appToken, remoteDbURL, rawUrl) {
-  const options = Object.fromEntries(remoteDbURL.searchParams.entries());
-  remoteDbURL.search = "";
-  let url = remoteDbURL.toString();
-  if (remoteDbURL.protocol === "memory:") {
+function createRemoteLibSQLClient(authToken, dbURL, rawUrl) {
+  const options = Object.fromEntries(dbURL.searchParams.entries());
+  dbURL.search = "";
+  let url = dbURL.toString();
+  if (dbURL.protocol === "memory:") {
     url = ":memory:";
-  } else if (remoteDbURL.protocol === "file:" && remoteDbURL.pathname.startsWith("/") && !rawUrl.startsWith("file:/")) {
-    url = "file:" + remoteDbURL.pathname.substring(1);
+  } else if (dbURL.protocol === "file:" && dbURL.pathname.startsWith("/") && !rawUrl.startsWith("file:/")) {
+    url = "file:" + dbURL.pathname.substring(1);
   }
-  const client = createClient({ ...parseOpts(options), url, authToken: appToken });
+  const client = createClient({ ...parseOpts(options), url, authToken });
   return drizzleLibsql(client);
 }
-function createStudioDatabaseClient(appToken, remoteDbURL) {
-  if (appToken == null) {
-    throw new Error(`Cannot create a remote client: missing app token.`);
-  }
-  const url = new URL("/db/query", remoteDbURL);
-  const db = drizzleProxy(
-    async (sql, parameters, method) => {
-      const requestBody = { sql, args: parameters };
-      const res = await safeFetch(
-        url,
-        {
-          method: "POST",
-          headers: {
-            Authorization: `Bearer ${appToken}`,
-            "Content-Type": "application/json"
-          },
-          body: JSON.stringify(requestBody)
-        },
-        async (response) => {
-          throw await parseRemoteError(response);
-        }
-      );
-      let remoteResult;
-      try {
-        const json = await res.json();
-        remoteResult = remoteResultSchema.parse(json);
-      } catch {
-        throw new DetailedLibsqlError({
-          message: await getUnexpectedResponseMessage(res),
-          code: KNOWN_ERROR_CODES.SQL_QUERY_FAILED
-        });
-      }
-      if (method === "run") {
-        const rawRows = Array.from(remoteResult.rows);
-        remoteResult.rows.toJSON = () => rawRows;
-        for (let i = 0; i < remoteResult.rows.length; i++) {
-          let row = remoteResult.rows[i];
-          let item = {};
-          remoteResult.columns.forEach((col, index) => {
-            item[col] = row[index];
-          });
-          remoteResult.rows[i] = item;
-        }
-        return remoteResult;
-      }
-      const rowValues = [];
-      for (const row of remoteResult.rows) {
-        if (row != null && typeof row === "object") {
-          rowValues.push(Object.values(row));
-        }
-      }
-      if (method === "get") {
-        return { rows: rowValues[0] };
-      }
-      return { rows: rowValues };
-    },
-    async (queries) => {
-      const stmts = queries.map(({ sql, params }) => ({ sql, args: params }));
-      const res = await safeFetch(
-        url,
-        {
-          method: "POST",
-          headers: {
-            Authorization: `Bearer ${appToken}`,
-            "Content-Type": "application/json"
-          },
-          body: JSON.stringify(stmts)
-        },
-        async (response) => {
-          throw await parseRemoteError(response);
-        }
-      );
-      let remoteResults;
-      try {
-        const json = await res.json();
-        remoteResults = z.array(remoteResultSchema).parse(json);
-      } catch {
-        throw new DetailedLibsqlError({
-          message: await getUnexpectedResponseMessage(res),
-          code: KNOWN_ERROR_CODES.SQL_QUERY_FAILED
-        });
-      }
-      let results = [];
-      for (const [idx, rawResult] of remoteResults.entries()) {
-        if (queries[idx]?.method === "run") {
-          results.push(rawResult);
-          continue;
-        }
-        const rowValues = [];
-        for (const row of rawResult.rows) {
-          if (row != null && typeof row === "object") {
-            rowValues.push(Object.values(row));
-          }
-        }
-        if (queries[idx]?.method === "get") {
-          results.push({ rows: rowValues[0] });
-        }
-        results.push({ rows: rowValues });
-      }
-      return results;
-    }
-  );
-  applyTransactionNotSupported(db);
-  return db;
-}
-const errorSchema = z.object({
-  success: z.boolean(),
-  error: z.object({
-    code: z.string(),
-    details: z.string().optional()
-  })
-});
-const KNOWN_ERROR_CODES = {
-  SQL_QUERY_FAILED: "SQL_QUERY_FAILED"
-};
-const getUnexpectedResponseMessage = async (response) => `Unexpected response from remote database:
-(Status ${response.status}) ${await response.clone().text()}`;
-async function parseRemoteError(response) {
-  let error;
-  try {
-    error = errorSchema.parse(await response.clone().json()).error;
-  } catch {
-    return new DetailedLibsqlError({
-      message: await getUnexpectedResponseMessage(response),
-      code: KNOWN_ERROR_CODES.SQL_QUERY_FAILED
-    });
-  }
-  let baseDetails = error.details?.replace(/.*SQLite error: /, "") ?? "Error querying remote database.";
-  const details = baseDetails.slice(baseDetails.indexOf(":") + 1).trim();
-  let hint = `See the Astro DB guide for query and push instructions: https://docs.astro.build/en/guides/astro-db/#query-your-database`;
-  if (error.code === KNOWN_ERROR_CODES.SQL_QUERY_FAILED && details.includes("no such table")) {
-    hint = `Did you run \`astro db push\` to push your latest table schemas?`;
-  }
-  return new DetailedLibsqlError({ message: details, code: error.code, hint });
-}
 export {
   createLocalDatabaseClient,
   createRemoteDatabaseClient,

package/dist/runtime/types.d.ts

@@ -1,7 +1,7 @@
 import type { ColumnBaseConfig, ColumnDataType } from 'drizzle-orm';
 import type { SQLiteColumn, SQLiteTableWithColumns } from 'drizzle-orm/sqlite-core';
 import type { ColumnsConfig, DBColumn, OutputColumnsConfig } from '../core/types.js';
-type GeneratedConfig<T extends ColumnDataType = ColumnDataType> = Pick<ColumnBaseConfig<T, string>, 'name' | 'tableName' | 'notNull' | 'hasDefault'>;
+type GeneratedConfig<T extends ColumnDataType = ColumnDataType> = Pick<ColumnBaseConfig<T, string>, 'name' | 'tableName' | 'notNull' | 'hasDefault' | 'hasRuntimeDefault' | 'isPrimaryKey'>;
 type AstroText<T extends GeneratedConfig<'string'>> = SQLiteColumn<T & {
     data: string;
     dataType: 'string';
@@ -9,9 +9,9 @@ type AstroText<T extends GeneratedConfig<'string'>> = SQLiteColumn<T & {
     driverParam: string;
     enumValues: never;
     baseColumn: never;
-    isPrimaryKey: boolean;
     isAutoincrement: boolean;
-    hasRuntimeDefault: boolean;
+    identity: undefined;
+    generated: undefined;
 }>;
 type AstroDate<T extends GeneratedConfig<'custom'>> = SQLiteColumn<T & {
     data: Date;
@@ -20,9 +20,9 @@ type AstroDate<T extends GeneratedConfig<'custom'>> = SQLiteColumn<T & {
     driverParam: string;
     enumValues: never;
     baseColumn: never;
-    isPrimaryKey: boolean;
     isAutoincrement: boolean;
-    hasRuntimeDefault: boolean;
+    identity: undefined;
+    generated: undefined;
 }>;
 type AstroBoolean<T extends GeneratedConfig<'boolean'>> = SQLiteColumn<T & {
     data: boolean;
@@ -31,9 +31,9 @@ type AstroBoolean<T extends GeneratedConfig<'boolean'>> = SQLiteColumn<T & {
     driverParam: number;
     enumValues: never;
     baseColumn: never;
-    isPrimaryKey: boolean;
     isAutoincrement: boolean;
-    hasRuntimeDefault: boolean;
+    identity: undefined;
+    generated: undefined;
 }>;
 type AstroNumber<T extends GeneratedConfig<'number'>> = SQLiteColumn<T & {
     data: number;
@@ -42,9 +42,9 @@ type AstroNumber<T extends GeneratedConfig<'number'>> = SQLiteColumn<T & {
     driverParam: number;
     enumValues: never;
     baseColumn: never;
-    isPrimaryKey: boolean;
     isAutoincrement: boolean;
-    hasRuntimeDefault: boolean;
+    identity: undefined;
+    generated: undefined;
 }>;
 type AstroJson<T extends GeneratedConfig<'custom'>> = SQLiteColumn<T & {
     data: unknown;
@@ -53,9 +53,9 @@ type AstroJson<T extends GeneratedConfig<'custom'>> = SQLiteColumn<T & {
     driverParam: string;
     enumValues: never;
     baseColumn: never;
-    isPrimaryKey: boolean;
     isAutoincrement: boolean;
-    hasRuntimeDefault: boolean;
+    identity: undefined;
+    generated: undefined;
 }>;
 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 OutputColumnsConfig | ColumnsConfig> = SQLiteTableWithColumns<{
@@ -66,11 +66,17 @@ export type Table<TTableName extends string, TColumns extends OutputColumnsConfi
         [K in Extract<keyof TColumns, string>]: Column<TColumns[K]['type'], {
             tableName: TTableName;
             name: K;
+            isPrimaryKey: TColumns[K]['schema'] extends {
+                primaryKey: true;
+            } ? true : false;
             hasDefault: TColumns[K]['schema'] extends {
                 default: NonNullable<unknown>;
             } ? true : TColumns[K]['schema'] extends {
                 primaryKey: true;
             } ? true : false;
+            hasRuntimeDefault: TColumns[K]['schema'] extends {
+                default: NonNullable<unknown>;
+            } ? true : false;
             notNull: TColumns[K]['schema']['optional'] extends true ? false : true;
         }>;
     };

package/dist/runtime/utils.d.ts

@@ -1,22 +1,7 @@
 import { LibsqlError } from '@libsql/client';
 import { AstroError } from 'astro/errors';
-/**
- * Small wrapper around fetch that throws an error if the response is not OK. Allows for custom error handling as well through the onNotOK callback.
- */
-export declare function safeFetch(url: Parameters<typeof fetch>[0], options?: Parameters<typeof fetch>[1], onNotOK?: (response: Response) => void | Promise<void>): Promise<Response>;
 export declare class AstroDbError extends AstroError {
     name: string;
 }
-export declare class DetailedLibsqlError extends LibsqlError {
-    name: string;
-    hint?: string;
-    constructor({ message, code, hint, rawCode, cause, }: {
-        message: string;
-        code: string;
-        hint?: string;
-        rawCode?: number;
-        cause?: Error;
-    });
-}
 export declare function isDbError(err: unknown): err is LibsqlError;
 export declare function pathToFileURL(path: string): URL;