@astrojs/db 0.11.3 → 0.11.5

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

@@ -1,7 +1,5 @@
 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 ({

package/dist/core/cli/commands/link/index.d.ts

@@ -11,10 +11,20 @@ export declare function promptExistingProjectName({ workspaceId }: {
     workspaceId: string;
 }): Promise<{
     id: string;
+    name: string;
     idName: string;
 }>;
 export declare function promptBegin(): Promise<void>;
+/**
+ * Ask the user if they want to link to an existing Astro Studio project.
+ * @returns A `Promise` for the user’s answer: `true` if they answer yes, otherwise `false`.
+ */
 export declare function promptLinkExisting(): Promise<boolean>;
+/**
+ * Ask the user if they want to link to a new Astro Studio Project.
+ * **Exits the process if they answer no.**
+ * @returns A `Promise` for the user’s answer: `true` if they answer yes.
+ */
 export declare function promptLinkNew(): Promise<boolean>;
 export declare function promptNewProjectName(): Promise<string>;
 export declare function promptNewProjectRegion(): Promise<string>;

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

@@ -19,19 +19,16 @@ async function cmd() {
     console.error(MISSING_SESSION_ID_ERROR);
     process.exit(1);
   }
-  const getWorkspaceIdAsync = getWorkspaceId().catch((err) => {
-    return err;
-  });
   await promptBegin();
   const isLinkExisting = await promptLinkExisting();
   if (isLinkExisting) {
-    const workspaceId = unwrapWorkspaceId(await getWorkspaceIdAsync);
+    const workspaceId = await promptWorkspace(sessionToken);
     const existingProjectData = await promptExistingProjectName({ workspaceId });
     return await linkProject(existingProjectData.id);
   }
   const isLinkNew = await promptLinkNew();
   if (isLinkNew) {
-    const workspaceId = unwrapWorkspaceId(await getWorkspaceIdAsync);
+    const workspaceId = await promptWorkspace(sessionToken);
     const newProjectName = await promptNewProjectName();
     const newProjectRegion = await promptNewProjectRegion();
     const spinner = ora("Creating new project...").start();
@@ -50,14 +47,14 @@ async function linkProject(id) {
   await writeFile(PROJECT_ID_FILE, `${id}`);
   console.info("Project linked.");
 }
-async function getWorkspaceId() {
+async function getWorkspaces(sessionToken) {
   const linkUrl = new URL(getAstroStudioUrl() + "/api/cli/workspaces.list");
   const response = await safeFetch(
     linkUrl,
     {
       method: "POST",
       headers: {
-        Authorization: `Bearer ${await getSessionIdFromFile()}`,
+        Authorization: `Bearer ${sessionToken}`,
         "Content-Type": "application/json"
       }
     },
@@ -81,13 +78,28 @@ async function getWorkspaceId() {
   if (!success) {
     throw new Error(`Failed to fetch user's workspace.`);
   }
-  return data[0].id;
+  return data;
 }
-function unwrapWorkspaceId(workspaceId) {
-  if (typeof workspaceId !== "string") {
-    console.error(workspaceId.message);
+async function promptWorkspace(sessionToken) {
+  const workspaces = await getWorkspaces(sessionToken);
+  if (workspaces.length === 0) {
+    console.error("No workspaces found.");
     process.exit(1);
   }
+  if (workspaces.length === 1) {
+    return workspaces[0].id;
+  }
+  const { workspaceId } = await prompts({
+    type: "autocomplete",
+    name: "workspaceId",
+    message: "Select your workspace:",
+    limit: 5,
+    choices: workspaces.map((w) => ({ title: w.name, value: w.id }))
+  });
+  if (typeof workspaceId !== "string") {
+    console.log("Canceled.");
+    process.exit(0);
+  }
   return workspaceId;
 }
 async function createNewProject({

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

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

package/dist/runtime/db-client.js

@@ -59,7 +59,19 @@ function createRemoteDatabaseClient(appToken, remoteDbURL) {
           code: KNOWN_ERROR_CODES.SQL_QUERY_FAILED
         });
       }
-      if (method === "run") return remoteResult;
+      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") {

package/dist/runtime/index.d.ts

@@ -1,5 +1,7 @@
 import { type ColumnDataType } from 'drizzle-orm';
+import { type LibSQLDatabase } from 'drizzle-orm/libsql';
 import type { DBColumn, DBTable } from '../core/types.js';
+export type Database = Omit<LibSQLDatabase, 'transaction'>;
 export type { Table } from './types.js';
 export { createRemoteDatabaseClient, createLocalDatabaseClient } from './db-client.js';
 export declare function hasPrimaryKey(column: DBColumn): boolean;

package/dist/runtime/index.js

@@ -1,4 +1,5 @@
 import { sql } from "drizzle-orm";
+import {} from "drizzle-orm/libsql";
 import {
   customType,
   index,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.11.3",
+  "version": "0.11.5",
   "description": "Add libSQL and Astro Studio support to your Astro site",
   "license": "MIT",
   "repository": {
@@ -62,11 +62,11 @@
     "astro-integration"
   ],
   "dependencies": {
-    "@libsql/client": "^0.6.0",
+    "@libsql/client": "^0.6.2",
     "async-listen": "^3.0.1",
     "ci-info": "^4.0.0",
     "deep-diff": "^1.0.2",
-    "drizzle-orm": "^0.30.10",
+    "drizzle-orm": "^0.31.2",
     "github-slugger": "^2.0.0",
     "kleur": "^4.1.5",
     "nanoid": "^5.0.7",
@@ -82,15 +82,12 @@
     "@types/chai": "^4.3.16",
     "@types/deep-diff": "^1.0.5",
     "@types/diff": "^5.2.1",
-    "@types/mocha": "^10.0.6",
     "@types/prompts": "^2.4.9",
     "@types/yargs-parser": "^21.0.3",
-    "chai": "^5.1.1",
     "cheerio": "1.0.0-rc.12",
-    "mocha": "^10.4.0",
     "typescript": "^5.4.5",
-    "vite": "^5.2.11",
-    "astro": "4.8.5",
+    "vite": "^5.2.13",
+    "astro": "4.10.2",
     "astro-scripts": "0.0.14"
   },
   "scripts": {
@@ -98,7 +95,6 @@
     "build": "astro-scripts build \"src/**/*.ts\" && tsc && pnpm types:virtual",
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
-    "test": "mocha --exit --timeout 20000 \"test/*.js\" \"test/unit/**/*.js\"",
-    "test:match": "mocha --timeout 20000 \"test/*.js\" \"test/unit/*.js\" -g"
+    "test": "astro-scripts test \"test/**/*.test.js\""
   }
 }