@astrojs/db 0.3.2 → 0.3.4

package/dist/core/cli/commands/link/index.js

@@ -1,4 +1,5 @@
 import { mkdir, writeFile } from "node:fs/promises";
+import { bgRed, cyan } from "kleur/colors";
 import prompts from "prompts";
 import { PROJECT_ID_FILE, getSessionIdFromFile } from "../../../tokens.js";
 import { getAstroStudioUrl } from "../../../utils.js";
@@ -25,6 +26,15 @@ async function cmd({ flags }) {
     body: JSON.stringify(body)
   });
   if (!response.ok) {
+    if (response.status === 401) {
+      console.error(`${bgRed("Unauthorized")}
+
+  Are you logged in?
+  Run ${cyan("astro db login")} to authenticate and then try linking again.
+
+`);
+      process.exit(1);
+    }
     console.error(`Failed to link project: ${response.status} ${response.statusText}`);
     process.exit(1);
   }

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

@@ -1,8 +1,10 @@
 import { createClient } from "@libsql/client";
-import { drizzle } from "drizzle-orm/sqlite-proxy";
+import { drizzle as drizzleProxy } from "drizzle-orm/sqlite-proxy";
+import { drizzle as drizzleLibsql } from "drizzle-orm/libsql";
+import { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core";
 import { red } from "kleur/colors";
 import prompts from "prompts";
-import { setupDbTables } from "../../../queries.js";
+import { recreateTables, seedData } from "../../../queries.js";
 import { getManagedAppTokenOrExit } from "../../../tokens.js";
 import { collectionsSchema } from "../../../types.js";
 import { getRemoteDatabaseUrl } from "../../../utils.js";
@@ -99,6 +101,7 @@ async function pushSchema({
   }, initialMigrationBatch);
   await runMigrateQuery({ queries, migrations, snapshot: currentSnapshot, appToken, isDryRun });
 }
+const sqlite = new SQLiteAsyncDialect();
 async function pushData({
   config,
   appToken,
@@ -107,7 +110,19 @@ async function pushData({
   const queries = [];
   if (config.db?.data) {
     const libsqlClient = createClient({ url: ":memory:" });
-    const db = await drizzle(async (sqlQuery, params, method) => {
+    await recreateTables({
+      db: drizzleLibsql(libsqlClient),
+      collections: collectionsSchema.parse(config.db.collections ?? {})
+    });
+    for (const [collectionName, { writable }] of Object.entries(config.db.collections ?? {})) {
+      if (!writable) {
+        queries.push({
+          sql: `DELETE FROM ${sqlite.escapeName(collectionName)}`,
+          args: []
+        });
+      }
+    }
+    const db = await drizzleProxy(async (sqlQuery, params, method) => {
       const stmt = { sql: sqlQuery, args: params };
       queries.push(stmt);
       const { rows } = await libsqlClient.execute(stmt);
@@ -122,10 +137,9 @@ async function pushData({
       }
       return { rows: rowValues };
     });
-    await setupDbTables({
+    await seedData({
       db,
       mode: "build",
-      collections: collectionsSchema.parse(config.db.collections ?? {}),
       data: config.db.data
     });
   }

package/dist/core/cli/commands/verify/index.js

@@ -1,8 +1,20 @@
 import { getMigrationStatus, MIGRATION_NEEDED, MIGRATIONS_NOT_INITIALIZED, MIGRATIONS_UP_TO_DATE } from "../../migrations.js";
+import { getMigrationQueries } from "../../migration-queries.js";
 async function cmd({ config, flags }) {
   const status = await getMigrationStatus(config);
   const { state } = status;
   if (flags.json) {
+    if (state === "ahead") {
+      const { queries: migrationQueries } = await getMigrationQueries({
+        oldSnapshot: status.oldSnapshot,
+        newSnapshot: status.newSnapshot
+      });
+      const newFileContent = {
+        diff: status.diff,
+        db: migrationQueries
+      };
+      status.newFileContent = JSON.stringify(newFileContent, null, 2);
+    }
     console.log(JSON.stringify(status));
     process.exit(state === "up-to-date" ? 0 : 1);
   }

package/dist/core/cli/migrations.d.ts

@@ -11,6 +11,7 @@ export type MigrationStatus = {
     diff: deepDiff.Diff<DBSnapshot, DBSnapshot>[];
     newFilename: string;
     summary: string;
+    newFileContent?: string;
 } | {
     state: 'up-to-date';
     currentSnapshot: DBSnapshot;

package/dist/core/integration/index.js

@@ -13,7 +13,7 @@ import { dirname } from "path";
 import { fileURLToPath } from "url";
 import { blue, yellow } from "kleur/colors";
 import { fileURLIntegration } from "./file-url.js";
-import { setupDbTables } from "../queries.js";
+import { recreateTables, seedData } from "../queries.js";
 import { getManagedAppTokenOrExit } from "../tokens.js";
 function astroDBIntegration() {
   let connectedToRemote = false;
@@ -56,13 +56,15 @@ function astroDBIntegration() {
             dbUrl: dbUrl.toString(),
             seeding: true
           });
-          await setupDbTables({
-            db,
-            collections,
-            data: configWithDb.db?.data,
-            logger,
-            mode: command === "dev" ? "dev" : "build"
-          });
+          await recreateTables({ db, collections });
+          if (configWithDb.db?.data) {
+            await seedData({
+              db,
+              data: configWithDb.db.data,
+              logger,
+              mode: command === "dev" ? "dev" : "build"
+            });
+          }
           logger.debug("Database setup complete.");
           dbPlugin = vitePluginDb({
             connectToStudio: false,

package/dist/core/queries.d.ts

@@ -2,10 +2,13 @@ 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 '../core/types.js';
 import type { AstroIntegrationLogger } from 'astro';
 import type { DBUserConfig } from '../core/types.js';
-export declare function setupDbTables({ db, data, collections, logger, mode, }: {
+export declare function recreateTables({ db, collections, }: {
     db: SqliteRemoteDatabase;
-    data?: DBUserConfig['data'];
     collections: DBCollections;
+}): Promise<void>;
+export declare function seedData({ db, data, logger, mode, }: {
+    db: SqliteRemoteDatabase;
+    data: DBUserConfig['data'];
     logger?: AstroIntegrationLogger;
     mode: 'dev' | 'build';
 }): Promise<void>;

package/dist/core/queries.js

@@ -6,17 +6,13 @@ import { SQLiteAsyncDialect } from "drizzle-orm/sqlite-core";
 import { hasPrimaryKey } from "../runtime/index.js";
 import { isSerializedSQL } from "../runtime/types.js";
 const sqlite = new SQLiteAsyncDialect();
-async function setupDbTables({
+async function recreateTables({
   db,
-  data,
-  collections,
-  logger,
-  mode
-  // TODO: Remove once Turso has foreign key PRAGMA support
+  collections
 }) {
   const setupQueries = [];
   for (const [name, collection] of Object.entries(collections)) {
-    const dropQuery = sql.raw(`DROP TABLE IF EXISTS ${name}`);
+    const dropQuery = sql.raw(`DROP TABLE IF EXISTS ${sqlite.escapeName(name)}`);
     const createQuery = sql.raw(getCreateTableQuery(name, collection));
     const indexQueries = getCreateIndexQueries(name, collection);
     setupQueries.push(dropQuery, createQuery, ...indexQueries.map((s) => sql.raw(s)));
@@ -24,22 +20,27 @@ async function setupDbTables({
   for (const q of setupQueries) {
     await db.run(q);
   }
-  if (data) {
-    try {
-      await data({
-        seed: async ({ table }, values) => {
-          const result = Array.isArray(values) ? db.insert(table).values(values).returning() : db.insert(table).values(values).returning().get();
-          return result;
-        },
-        db,
-        mode
-      });
-    } catch (error) {
-      (logger ?? console).error(
-        `Failed to seed data. Did you update to match recent schema changes?`
-      );
-      (logger ?? console).error(error);
-    }
+}
+async function seedData({
+  db,
+  data,
+  logger,
+  mode
+}) {
+  try {
+    await data({
+      seed: async ({ table }, values) => {
+        const result = Array.isArray(values) ? db.insert(table).values(values).returning() : db.insert(table).values(values).returning().get();
+        return result;
+      },
+      db,
+      mode
+    });
+  } catch (error) {
+    (logger ?? console).error(
+      `Failed to seed data. Did you update to match recent schema changes?`
+    );
+    (logger ?? console).error(error);
   }
 }
 function getCreateTableQuery(collectionName, collection) {
@@ -193,6 +194,7 @@ export {
   getModifiers,
   getReferencesConfig,
   hasDefault,
+  recreateTables,
   schemaTypeToSqlType,
-  setupDbTables
+  seedData
 };

package/dist/runtime/types.d.ts

@@ -51,7 +51,7 @@ export type Table<TTableName extends string, TFields extends Record<string, Pick
         [K in Extract<keyof TFields, string>]: Column<TFields[K]['type'], {
             tableName: TTableName;
             name: K;
-            hasDefault: TFields[K] extends {
+            hasDefault: TFields[K]['schema'] extends {
                 default: NonNullable<unknown>;
             } ? true : TFields[K]['schema'] extends {
                 primaryKey: true;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.3.2",
+  "version": "0.3.4",
   "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.2.4",
+    "astro-scripts": "0.0.14"
   },
   "scripts": {
     "build": "astro-scripts build \"src/**/*.ts\" && tsc",