@astrojs/db 0.9.0 → 0.9.2

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

@@ -1,6 +1,8 @@
+import { LibsqlError } from '@libsql/client';
 import type { ColumnsConfig, DBConfigInput, TableConfig } from '../core/types.js';
 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;

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

@@ -19,10 +19,11 @@ async function cmd({
   const appToken = await getManagedAppTokenOrExit(flags.token);
   const productionSnapshot = await getProductionCurrentSnapshot({ appToken: appToken.token });
   const currentSnapshot = createCurrentSnapshot(dbConfig);
-  const isFromScratch = isForceReset || !productionSnapshot;
+  const isFromScratch = !productionSnapshot;
   const { queries: migrationQueries, confirmations } = await getMigrationQueries({
     oldSnapshot: isFromScratch ? createEmptySnapshot() : productionSnapshot,
-    newSnapshot: currentSnapshot
+    newSnapshot: currentSnapshot,
+    reset: isForceReset
   });
   if (migrationQueries.length === 0) {
     console.log("Database schema is up to date.");

package/dist/core/cli/migration-queries.d.ts

@@ -1,7 +1,8 @@
 import { type DBConfig, type DBSnapshot, type DBTable } from '../types.js';
-export declare function getMigrationQueries({ oldSnapshot, newSnapshot, }: {
+export declare function getMigrationQueries({ oldSnapshot, newSnapshot, reset, }: {
     oldSnapshot: DBSnapshot;
     newSnapshot: DBSnapshot;
+    reset?: boolean;
 }): Promise<{
     queries: string[];
     confirmations: string[];

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

@@ -24,10 +24,16 @@ const sqlite = new SQLiteAsyncDialect();
 const genTempTableName = customAlphabet("abcdefghijklmnopqrstuvwxyz", 10);
 async function getMigrationQueries({
   oldSnapshot,
-  newSnapshot
+  newSnapshot,
+  reset = false
 }) {
   const queries = [];
   const confirmations = [];
+  if (reset) {
+    const currentSnapshot = oldSnapshot;
+    oldSnapshot = createEmptySnapshot();
+    queries.push(...getDropTableQueriesForSnapshot(currentSnapshot));
+  }
   const addedCollections = getAddedCollections(oldSnapshot, newSnapshot);
   const droppedTables = getDroppedCollections(oldSnapshot, newSnapshot);
   const notDeprecatedDroppedTables = Object.fromEntries(
@@ -346,6 +352,14 @@ async function getProductionCurrentSnapshot({
   }
   return result.data;
 }
+function getDropTableQueriesForSnapshot(snapshot) {
+  const queries = [];
+  for (const collectionName of Object.keys(snapshot.schema)) {
+    const dropQuery = `DROP TABLE ${sqlite.escapeName(collectionName)}`;
+    queries.unshift(dropQuery);
+  }
+  return queries;
+}
 function createCurrentSnapshot({ tables = {} }) {
   const schema = JSON.parse(JSON.stringify(tables));
   return { version: MIGRATION_VERSION, schema };

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

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

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);
@@ -86,6 +90,7 @@ export {
   gt,
   gte,
   inArray,
+  isDbError,
   isNotNull,
   isNull,
   like,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.9.0",
+  "version": "0.9.2",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -81,8 +81,8 @@
     "mocha": "^10.2.0",
     "typescript": "^5.2.2",
     "vite": "^5.1.4",
-    "astro": "4.5.7",
-    "astro-scripts": "0.0.14"
+    "astro-scripts": "0.0.14",
+    "astro": "4.5.8"
   },
   "scripts": {
     "types:config": "tsc -p ./tsconfig.config-types.json",

package/virtual.d.ts

@@ -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'];