@astrojs/db 0.8.8 → 0.9.1

package/dist/_internal/runtime/config.d.ts

@@ -1,5 +1,8 @@
+import { LibsqlError } from '@libsql/client';
 import type { ColumnsConfig, DBConfigInput, TableConfig } from '../core/types.js';
-export type { LibSQLDatabase } from 'drizzle-orm/libsql';
+import type { LibSQLDatabase } from 'drizzle-orm/libsql';
+export type Database = Omit<LibSQLDatabase, 'transaction'>;
+export declare function isDbError(err: unknown): err is LibsqlError;
 export declare const column: {
     number: <T extends ({
         name?: string | undefined;
@@ -148,4 +151,4 @@ export declare function defineDb(userConfig: DBConfigInput): {
 export declare const NOW: import("drizzle-orm").SQL<unknown>;
 export declare const TRUE: import("drizzle-orm").SQL<unknown>;
 export declare const FALSE: import("drizzle-orm").SQL<unknown>;
-export { sql, eq, gt, gte, lt, lte, ne, isNull, isNotNull, inArray, notInArray, exists, notExists, between, notBetween, like, notIlike, not, asc, desc, and, or, } from 'drizzle-orm';
+export { sql, eq, gt, gte, lt, lte, ne, isNull, isNotNull, inArray, notInArray, exists, notExists, between, notBetween, like, notIlike, not, asc, desc, and, or, count, countDistinct, avg, avgDistinct, sum, sumDistinct, max, min, } from 'drizzle-orm';

package/dist/core/cli/migration-queries.js

@@ -7,7 +7,6 @@ import { hasPrimaryKey } from "../../runtime/index.js";
 import {
   getCreateIndexQueries,
   getCreateTableQuery,
-  getDropTableIfExistsQuery,
   getModifiers,
   getReferencesConfig,
   hasDefault,
@@ -57,7 +56,7 @@ async function getMigrationQueries({
     const addedColumns = getAdded(oldCollection.columns, newCollection.columns);
     const droppedColumns = getDropped(oldCollection.columns, newCollection.columns);
     const notDeprecatedDroppedColumns = Object.fromEntries(
-      Object.entries(droppedColumns).filter(([key, col]) => !col.schema.deprecated)
+      Object.entries(droppedColumns).filter(([, col]) => !col.schema.deprecated)
     );
     if (!isEmpty(addedColumns) && !isEmpty(notDeprecatedDroppedColumns)) {
       throw new Error(

package/dist/core/cli/print-help.js

@@ -27,7 +27,7 @@ function printHelp({
     message.push(
       linebreak(),
       `  ${bgGreen(black(` ${commandName} `))} ${green(
-        `v${"0.8.8"}`
+        `v${"0.9.1"}`
       )} ${headline}`
     );
   }

package/dist/core/integration/typegen.js

@@ -19,7 +19,7 @@ ${Object.entries(tables).map(([name, collection]) => generateTableType(name, col
   await writeFile(new URL(DB_TYPES_FILE, dotAstroDir), content);
 }
 function generateTableType(name, collection) {
-  const sanitizedColumnsList = Object.entries(collection.columns).filter(([key, val]) => !val.schema.deprecated);
+  const sanitizedColumnsList = Object.entries(collection.columns).filter(([, val]) => !val.schema.deprecated);
   const sanitizedColumns = Object.fromEntries(sanitizedColumnsList);
   let tableType = `	export const ${name}: import(${RUNTIME_IMPORT}).Table<
 		${JSON.stringify(name)},

package/dist/core/integration/vite-plugin-db.js

@@ -94,10 +94,7 @@ function getStudioVirtualModContents({
   return `
 import {asDrizzleTable, createRemoteDatabaseClient} from ${RUNTIME_IMPORT};
 
-export const db = await createRemoteDatabaseClient(process.env.ASTRO_STUDIO_APP_TOKEN ?? ${JSON.stringify(
-    appToken
-    // Respect runtime env for user overrides in SSR
-  )}, import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL ?? ${JSON.stringify(getRemoteDatabaseUrl())});
+export const db = await createRemoteDatabaseClient(process.env.ASTRO_STUDIO_APP_TOKEN);
 
 export * from ${RUNTIME_CONFIG_IMPORT};
 

package/dist/runtime/config.js

@@ -1,3 +1,4 @@
+import { LibsqlError } from "@libsql/client";
 import { sql as _sql } from "drizzle-orm";
 function createColumn(type, schema) {
   return {
@@ -8,6 +9,9 @@ function createColumn(type, schema) {
     schema
   };
 }
+function isDbError(err) {
+  return err instanceof LibsqlError;
+}
 const column = {
   number: (opts = {}) => {
     return createColumn("number", opts);
@@ -56,7 +60,15 @@ import {
   asc,
   desc,
   and,
-  or
+  or,
+  count,
+  countDistinct,
+  avg,
+  avgDistinct,
+  sum,
+  sumDistinct,
+  max,
+  min
 } from "drizzle-orm";
 export {
   FALSE,
@@ -64,8 +76,12 @@ export {
   TRUE,
   and,
   asc,
+  avg,
+  avgDistinct,
   between,
   column,
+  count,
+  countDistinct,
   defineDb,
   defineTable,
   desc,
@@ -74,11 +90,14 @@ export {
   gt,
   gte,
   inArray,
+  isDbError,
   isNotNull,
   isNull,
   like,
   lt,
   lte,
+  max,
+  min,
   ne,
   not,
   notBetween,
@@ -86,5 +105,7 @@ export {
   notIlike,
   notInArray,
   or,
-  sql
+  sql,
+  sum,
+  sumDistinct
 };

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

@@ -1,5 +1,6 @@
 import type { LibSQLDatabase } from 'drizzle-orm/libsql';
+import { type SqliteRemoteDatabase } from 'drizzle-orm/sqlite-proxy';
 export declare function createLocalDatabaseClient({ dbUrl }: {
     dbUrl: string;
 }): LibSQLDatabase;
-export declare function createRemoteDatabaseClient(appToken: string, remoteDbURL: string): import("drizzle-orm/sqlite-proxy").SqliteRemoteDatabase<Record<string, never>>;
+export declare function createRemoteDatabaseClient(appToken: string, remoteDbURL: string): SqliteRemoteDatabase<Record<string, never>>;

package/dist/runtime/db-client.js

@@ -4,10 +4,20 @@ import { drizzle as drizzleProxy } from "drizzle-orm/sqlite-proxy";
 import { z } from "zod";
 import { 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({ dbUrl }) {
   const url = isWebContainer ? "file:content.db" : dbUrl;
   const client = createClient({ url });
   const db = drizzleLibsql(client);
+  applyTransactionNotSupported(db);
   return db;
 }
 const remoteResultSchema = z.object({
@@ -113,6 +123,7 @@ Full error: Unexpected JSON response. ${e instanceof Error ? e.message : String(
       return results;
     }
   );
+  applyTransactionNotSupported(db);
   return db;
 }
 export {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.8.8",
+  "version": "0.9.1",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -58,7 +58,8 @@
     "@libsql/client": "^0.5.5",
     "async-listen": "^3.0.1",
     "deep-diff": "^1.0.2",
-    "drizzle-orm": "^0.29.5",
+    "drizzle-orm": "^0.30.2",
+    "github-slugger": "^2.0.0",
     "kleur": "^4.1.5",
     "nanoid": "^5.0.1",
     "open": "^10.0.3",
@@ -80,7 +81,7 @@
     "mocha": "^10.2.0",
     "typescript": "^5.2.2",
     "vite": "^5.1.4",
-    "astro": "4.5.6",
+    "astro": "4.5.8",
     "astro-scripts": "0.0.14"
   },
   "scripts": {

package/virtual.d.ts

@@ -1,7 +1,7 @@
 declare module 'astro:db' {
 	type RuntimeConfig = typeof import('./dist/_internal/runtime/config.js');
 
-	export const db: import('./dist/_internal/runtime/config.js').LibSQLDatabase;
+	export const db: import('./dist/_internal/runtime/config.js').Database;
 	export const dbUrl: string;
 
 	export const sql: RuntimeConfig['sql'];
@@ -11,6 +11,7 @@ declare module 'astro:db' {
 	export const column: RuntimeConfig['column'];
 	export const defineDb: RuntimeConfig['defineDb'];
 	export const defineTable: RuntimeConfig['defineTable'];
+	export const isDbError: RuntimeConfig['isDbError'];
 
 	export const eq: RuntimeConfig['eq'];
 	export const gt: RuntimeConfig['gt'];
@@ -33,4 +34,12 @@ declare module 'astro:db' {
 	export const desc: RuntimeConfig['desc'];
 	export const and: RuntimeConfig['and'];
 	export const or: RuntimeConfig['or'];
+	export const count: RuntimeConfig['count'];
+	export const countDistinct: RuntimeConfig['countDistinct'];
+	export const avg: RuntimeConfig['avg'];
+	export const avgDistinct: RuntimeConfig['avgDistinct'];
+	export const sum: RuntimeConfig['sum'];
+	export const sumDistinct: RuntimeConfig['sumDistinct'];
+	export const max: RuntimeConfig['max'];
+	export const min: RuntimeConfig['min'];
 }