@astrojs/db 0.10.1 → 0.10.3

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

@@ -15,17 +15,19 @@ async function cmd() {
     console.error(MISSING_SESSION_ID_ERROR);
     process.exit(1);
   }
-  const getWorkspaceIdAsync = getWorkspaceId();
+  const getWorkspaceIdAsync = getWorkspaceId().catch((err) => {
+    return err;
+  });
   await promptBegin();
   const isLinkExisting = await promptLinkExisting();
   if (isLinkExisting) {
-    const workspaceId = await getWorkspaceIdAsync;
+    const workspaceId = unwrapWorkspaceId(await getWorkspaceIdAsync);
     const existingProjectData = await promptExistingProjectName({ workspaceId });
     return await linkProject(existingProjectData.id);
   }
   const isLinkNew = await promptLinkNew();
   if (isLinkNew) {
-    const workspaceId = await getWorkspaceIdAsync;
+    const workspaceId = unwrapWorkspaceId(await getWorkspaceIdAsync);
     const newProjectName = await promptNewProjectName();
     const newProjectRegion = await promptNewProjectRegion();
     const spinner = ora("Creating new project...").start();
@@ -57,7 +59,7 @@ async function getWorkspaceId() {
     },
     (res) => {
       if (res.status === 401) {
-        console.error(
+        throw new Error(
           `${bgRed("Unauthorized")}
 
   Are you logged in?
@@ -67,19 +69,23 @@ async function getWorkspaceId() {
 
 `
         );
-        process.exit(1);
       }
-      console.error(`Failed to fetch user workspace: ${res.status} ${res.statusText}`);
-      process.exit(1);
+      throw new Error(`Failed to fetch user workspace: ${res.status} ${res.statusText}`);
     }
   );
   const { data, success } = await response.json();
   if (!success) {
-    console.error(`Failed to fetch user's workspace.`);
-    process.exit(1);
+    throw new Error(`Failed to fetch user's workspace.`);
   }
   return data[0].id;
 }
+function unwrapWorkspaceId(workspaceId) {
+  if (typeof workspaceId !== "string") {
+    console.error(workspaceId.message);
+    process.exit(1);
+  }
+  return workspaceId;
+}
 async function createNewProject({
   workspaceId,
   name,

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

@@ -1,3 +1,4 @@
+import prompts from "prompts";
 import { safeFetch } from "../../../../runtime/utils.js";
 import { MIGRATION_VERSION } from "../../../consts.js";
 import { getManagedAppTokenOrExit } from "../../../tokens.js";
@@ -31,6 +32,16 @@ async function cmd({
     console.log(`Database schema is out of date.`);
   }
   if (isForceReset) {
+    const { begin } = await prompts({
+      type: "confirm",
+      name: "begin",
+      message: `Reset your database? All of your data will be erased and your schema created from scratch.`,
+      initial: false
+    });
+    if (!begin) {
+      console.log("Canceled.");
+      process.exit(0);
+    }
     console.log(`Force-pushing to the database. All existing data will be erased.`);
   } else if (confirmations.length > 0) {
     console.log("\n" + formatDataLossMessage(confirmations) + "\n");

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

@@ -41,9 +41,9 @@ async function getMigrationQueries({
     Object.entries(droppedTables).filter(([, table]) => !table.deprecated)
   );
   if (!isEmpty(addedTables) && !isEmpty(notDeprecatedDroppedTables)) {
-    throw new Error(
-      RENAME_TABLE_ERROR(Object.keys(addedTables)[0], Object.keys(notDeprecatedDroppedTables)[0])
-    );
+    const oldTable = Object.keys(notDeprecatedDroppedTables)[0];
+    const newTable = Object.keys(addedTables)[0];
+    throw new Error(RENAME_TABLE_ERROR(oldTable, newTable));
   }
   for (const [tableName, table] of Object.entries(addedTables)) {
     queries.push(getCreateTableQuery(tableName, table));

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

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

package/dist/core/errors.js

@@ -14,9 +14,13 @@ const MISSING_EXECUTE_PATH_ERROR = `${red(
 )} Provide a path by running ${cyan("astro db execute <path>")}
 `;
 const RENAME_TABLE_ERROR = (oldTable, newTable) => {
-  return red("\u25B6 Potential table rename detected: " + oldTable + ", " + newTable) + `
+  return red("\u25B6 Potential table rename detected: " + oldTable + " -> " + newTable) + `
   You cannot add and remove tables in the same schema update batch.
-  To resolve, add a 'deprecated: true' flag to '${oldTable}' instead.`;
+
+  1. Use "deprecated: true" to deprecate a table before renaming.
+  2. Use "--force-reset" to ignore this warning and reset the database (deleting all of your data).
+	
+	Visit https://docs.astro.build/en/guides/astro-db/#renaming-tables to learn more.`;
 };
 const RENAME_COLUMN_ERROR = (oldSelector, newSelector) => {
   return red("\u25B6 Potential column rename detected: " + oldSelector + ", " + newSelector) + `

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

@@ -10,6 +10,7 @@ const resolved = {
 };
 function vitePluginDb(params) {
   const srcDirPath = normalizePath(fileURLToPath(params.srcDir));
+  const dbDirPath = normalizePath(fileURLToPath(getDbDirectoryUrl(params.root)));
   let command = "build";
   return {
     name: "astro:db",
@@ -25,7 +26,7 @@ function vitePluginDb(params) {
       const importer = rawImporter ? await this.resolve(rawImporter) : null;
       if (!importer)
         return resolved.virtual;
-      if (importer.id.startsWith(srcDirPath)) {
+      if (importer.id.startsWith(srcDirPath) && !importer.id.startsWith(dbDirPath)) {
         return resolved.seedVirtual;
       }
       return resolved.virtual;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.10.1",
+  "version": "0.10.3",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -81,7 +81,7 @@
     "mocha": "^10.2.0",
     "typescript": "^5.2.2",
     "vite": "^5.1.4",
-    "astro": "4.5.16",
+    "astro": "4.5.18",
     "astro-scripts": "0.0.14"
   },
   "scripts": {