@astrojs/db 0.11.2 → 0.11.4

package/dist/_internal/core/utils.d.ts

@@ -1,10 +1,8 @@
 import type { AstroConfig, AstroIntegration } from 'astro';
 import type { AstroDbIntegration } from './types.js';
 export type VitePlugin = Required<AstroConfig['vite']>['plugins'][number];
-export declare function getAstroStudioEnv(envMode?: string): Record<`ASTRO_STUDIO_${string}`, string>;
 export declare function getAstroEnv(envMode?: string): Record<`ASTRO_${string}`, string>;
 export declare function getRemoteDatabaseUrl(): string;
-export declare function getAstroStudioUrl(): string;
 export declare function getDbDirectoryUrl(root: URL | string): URL;
 export declare function defineDbIntegration(integration: AstroDbIntegration): AstroIntegration;
 export type Result<T> = {

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

@@ -1,4 +1,5 @@
 import { existsSync } from "node:fs";
+import { getManagedAppTokenOrExit } from "@astrojs/studio";
 import { LibsqlError } from "@libsql/client";
 import { green } from "kleur/colors";
 import {
@@ -12,7 +13,6 @@ import {
   getStudioVirtualModContents
 } from "../../../integration/vite-plugin-db.js";
 import { bundleFile, importBundledFile } from "../../../load-file.js";
-import { getManagedAppTokenOrExit } from "../../../tokens.js";
 async function cmd({
   astroConfig,
   dbConfig,

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

@@ -1,33 +1,34 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { basename } from "node:path";
+import {
+  MISSING_SESSION_ID_ERROR,
+  PROJECT_ID_FILE,
+  getAstroStudioUrl,
+  getSessionIdFromFile
+} from "@astrojs/studio";
 import { slug } from "github-slugger";
 import { bgRed, cyan } from "kleur/colors";
 import ora from "ora";
 import prompts from "prompts";
 import { safeFetch } from "../../../../runtime/utils.js";
-import { MISSING_SESSION_ID_ERROR } from "../../../errors.js";
-import { PROJECT_ID_FILE, getSessionIdFromFile } from "../../../tokens.js";
-import { getAstroStudioUrl } from "../../../utils.js";
+import {} from "../../../utils.js";
 async function cmd() {
   const sessionToken = await getSessionIdFromFile();
   if (!sessionToken) {
     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();
@@ -46,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"
       }
     },
@@ -64,7 +65,7 @@ async function getWorkspaceId() {
 
   Are you logged in?
   Run ${cyan(
-            "astro db login"
+            "astro login"
           )} to authenticate and then try linking again.
 
 `
@@ -77,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({
@@ -109,7 +125,7 @@ async function createNewProject({
 
   Are you logged in?
   Run ${cyan(
-            "astro db login"
+            "astro login"
           )} to authenticate and then try linking again.
 
 `
@@ -146,7 +162,7 @@ async function promptExistingProjectName({ workspaceId }) {
 
   Are you logged in?
   Run ${cyan(
-            "astro db login"
+            "astro login"
           )} to authenticate and then try linking again.
 
 `

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

@@ -1,12 +1,11 @@
 import { mkdir, writeFile } from "node:fs/promises";
 import { createServer as _createServer } from "node:http";
+import { SESSION_LOGIN_FILE, getAstroStudioUrl } from "@astrojs/studio";
 import { listen } from "async-listen";
 import { cyan } from "kleur/colors";
 import open from "open";
 import ora from "ora";
 import prompt from "prompts";
-import { SESSION_LOGIN_FILE } from "../../../tokens.js";
-import { getAstroStudioUrl } from "../../../utils.js";
 const isWebContainer = (
   // Stackblitz heuristic
   process.versions?.webcontainer ?? // GitHub Codespaces heuristic

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

@@ -1,5 +1,5 @@
 import { unlink } from "node:fs/promises";
-import { SESSION_LOGIN_FILE } from "../../../tokens.js";
+import { SESSION_LOGIN_FILE } from "@astrojs/studio";
 async function cmd() {
   await unlink(SESSION_LOGIN_FILE);
   console.log("Successfully logged out of Astro Studio.");

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

@@ -1,7 +1,7 @@
+import { getManagedAppTokenOrExit } from "@astrojs/studio";
 import prompts from "prompts";
 import { safeFetch } from "../../../../runtime/utils.js";
 import { MIGRATION_VERSION } from "../../../consts.js";
-import { getManagedAppTokenOrExit } from "../../../tokens.js";
 import {} from "../../../types.js";
 import { getRemoteDatabaseUrl } from "../../../utils.js";
 import {

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

@@ -1,3 +1,4 @@
+import { getManagedAppTokenOrExit } from "@astrojs/studio";
 import { sql } from "drizzle-orm";
 import {
   createLocalDatabaseClient,
@@ -6,7 +7,6 @@ import {
 import { normalizeDatabaseUrl } from "../../../../runtime/index.js";
 import { DB_PATH } from "../../../consts.js";
 import { SHELL_QUERY_MISSING_ERROR } from "../../../errors.js";
-import { getManagedAppTokenOrExit } from "../../../tokens.js";
 import { getAstroEnv, getRemoteDatabaseUrl } from "../../../utils.js";
 async function cmd({
   flags,

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

@@ -1,4 +1,4 @@
-import { getManagedAppTokenOrExit } from "../../../tokens.js";
+import { getManagedAppTokenOrExit } from "@astrojs/studio";
 import {
   createCurrentSnapshot,
   createEmptySnapshot,

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

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

package/dist/core/errors.d.ts

@@ -1,6 +1,3 @@
-export declare const MISSING_SESSION_ID_CI_ERROR: string;
-export declare const MISSING_SESSION_ID_ERROR: string;
-export declare const MISSING_PROJECT_ID_ERROR: string;
 export declare const MISSING_EXECUTE_PATH_ERROR: string;
 export declare const RENAME_TABLE_ERROR: (oldTable: string, newTable: string) => string;
 export declare const RENAME_COLUMN_ERROR: (oldSelector: string, newSelector: string) => string;

package/dist/core/errors.js

@@ -1,18 +1,4 @@
 import { bold, cyan, red } from "kleur/colors";
-const MISSING_SESSION_ID_CI_ERROR = `${red("\u25B6 ASTRO_STUDIO_APP_TOKEN required")}
-
-	To authenticate with Astro Studio add the token to your CI's environment variables.
-`;
-const MISSING_SESSION_ID_ERROR = `${red("\u25B6 Login required!")}
-
-  To authenticate with Astro Studio, run
-  ${cyan("astro db login")}
-`;
-const MISSING_PROJECT_ID_ERROR = `${red("\u25B6 Directory not linked.")}
-
-  To link this directory to an Astro Studio project, run
-  ${cyan("astro db link")}
-`;
 const MISSING_EXECUTE_PATH_ERROR = `${red(
   "\u25B6 No file path provided."
 )} Provide a path by running ${cyan("astro db execute <path>")}
@@ -23,7 +9,7 @@ const RENAME_TABLE_ERROR = (oldTable, newTable) => {
 
   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) => {
@@ -56,9 +42,6 @@ export {
   FILE_NOT_FOUND_ERROR,
   INTEGRATION_TABLE_CONFLICT_ERROR,
   MISSING_EXECUTE_PATH_ERROR,
-  MISSING_PROJECT_ID_ERROR,
-  MISSING_SESSION_ID_CI_ERROR,
-  MISSING_SESSION_ID_ERROR,
   RENAME_COLUMN_ERROR,
   RENAME_TABLE_ERROR,
   SHELL_QUERY_MISSING_ERROR

package/dist/core/integration/index.js

@@ -1,6 +1,7 @@
 import { existsSync } from "fs";
 import { dirname } from "path";
 import { fileURLToPath } from "url";
+import { getManagedAppTokenOrExit } from "@astrojs/studio";
 import { LibsqlError } from "@libsql/client";
 import { mkdir, writeFile } from "fs/promises";
 import { blue, yellow } from "kleur/colors";
@@ -15,7 +16,6 @@ import { CONFIG_FILE_NAMES, DB_PATH } from "../consts.js";
 import { EXEC_DEFAULT_EXPORT_ERROR, EXEC_ERROR } from "../errors.js";
 import { resolveDbConfig } from "../load-file.js";
 import { SEED_DEV_FILE_NAME } from "../queries.js";
-import { getManagedAppTokenOrExit } from "../tokens.js";
 import { getDbDirectoryUrl } from "../utils.js";
 import { fileURLIntegration } from "./file-url.js";
 import { typegenInternal } from "./typegen.js";

package/dist/core/utils.d.ts

@@ -1,10 +1,8 @@
 import type { AstroConfig, AstroIntegration } from 'astro';
 import type { AstroDbIntegration } from './types.js';
 export type VitePlugin = Required<AstroConfig['vite']>['plugins'][number];
-export declare function getAstroStudioEnv(envMode?: string): Record<`ASTRO_STUDIO_${string}`, string>;
 export declare function getAstroEnv(envMode?: string): Record<`ASTRO_${string}`, string>;
 export declare function getRemoteDatabaseUrl(): string;
-export declare function getAstroStudioUrl(): string;
 export declare function getDbDirectoryUrl(root: URL | string): URL;
 export declare function defineDbIntegration(integration: AstroDbIntegration): AstroIntegration;
 export type Result<T> = {

package/dist/core/utils.js

@@ -1,8 +1,5 @@
+import { getAstroStudioEnv } from "@astrojs/studio";
 import { loadEnv } from "vite";
-function getAstroStudioEnv(envMode = "") {
-  const env = loadEnv(envMode, process.cwd(), "ASTRO_STUDIO_");
-  return env;
-}
 function getAstroEnv(envMode = "") {
   const env = loadEnv(envMode, process.cwd(), "ASTRO_");
   return env;
@@ -11,10 +8,6 @@ function getRemoteDatabaseUrl() {
   const env = getAstroStudioEnv();
   return env.ASTRO_STUDIO_REMOTE_DB_URL || "https://db.services.astro.build";
 }
-function getAstroStudioUrl() {
-  const env = getAstroStudioEnv();
-  return env.ASTRO_STUDIO_URL || "https://studio.astro.build";
-}
 function getDbDirectoryUrl(root) {
   return new URL("db/", root);
 }
@@ -29,8 +22,6 @@ function mapObject(item, callback) {
 export {
   defineDbIntegration,
   getAstroEnv,
-  getAstroStudioEnv,
-  getAstroStudioUrl,
   getDbDirectoryUrl,
   getRemoteDatabaseUrl,
   mapObject

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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.11.2",
+  "version": "0.11.4",
   "description": "Add libSQL and Astro Studio support to your Astro site",
   "license": "MIT",
   "repository": {
@@ -75,7 +75,8 @@
     "prompts": "^2.4.2",
     "strip-ansi": "^7.1.0",
     "yargs-parser": "^21.1.1",
-    "zod": "^3.23.8"
+    "zod": "^3.23.8",
+    "@astrojs/studio": "0.1.0"
   },
   "devDependencies": {
     "@types/chai": "^4.3.16",
@@ -89,7 +90,7 @@
     "mocha": "^10.4.0",
     "typescript": "^5.4.5",
     "vite": "^5.2.11",
-    "astro": "4.8.4",
+    "astro": "4.8.7",
     "astro-scripts": "0.0.14"
   },
   "scripts": {

package/dist/core/tokens.d.ts

@@ -1,11 +0,0 @@
-/// <reference types="node" resolution-mode="require"/>
-export declare const SESSION_LOGIN_FILE: import("url").URL;
-export declare const PROJECT_ID_FILE: import("url").URL;
-export interface ManagedAppToken {
-    token: string;
-    renew(): Promise<void>;
-    destroy(): Promise<void>;
-}
-export declare function getProjectIdFromFile(): Promise<string | undefined>;
-export declare function getSessionIdFromFile(): Promise<string | undefined>;
-export declare function getManagedAppTokenOrExit(token?: string): Promise<ManagedAppToken>;

package/dist/core/tokens.js

@@ -1,190 +0,0 @@
-import { readFile } from "node:fs/promises";
-import { homedir } from "node:os";
-import { join } from "node:path";
-import { pathToFileURL } from "node:url";
-import ci from "ci-info";
-import { green } from "kleur/colors";
-import ora from "ora";
-import { safeFetch } from "../runtime/utils.js";
-import {
-  MISSING_PROJECT_ID_ERROR,
-  MISSING_SESSION_ID_CI_ERROR,
-  MISSING_SESSION_ID_ERROR
-} from "./errors.js";
-import { getAstroStudioEnv, getAstroStudioUrl } from "./utils.js";
-const SESSION_LOGIN_FILE = pathToFileURL(join(homedir(), ".astro", "session-token"));
-const PROJECT_ID_FILE = pathToFileURL(join(process.cwd(), ".astro", "link"));
-class ManagedLocalAppToken {
-  token;
-  constructor(token) {
-    this.token = token;
-  }
-  async renew() {
-  }
-  async destroy() {
-  }
-}
-class ManagedRemoteAppToken {
-  token;
-  session;
-  projectId;
-  ttl;
-  expires;
-  renewTimer;
-  static async create(sessionToken, projectId) {
-    const { token: shortLivedAppToken, ttl } = await this.createToken(sessionToken, projectId);
-    return new ManagedRemoteAppToken({
-      token: shortLivedAppToken,
-      session: sessionToken,
-      projectId,
-      ttl
-    });
-  }
-  static async createToken(sessionToken, projectId) {
-    const spinner = ora("Connecting to remote database...").start();
-    const response = await safeFetch(
-      new URL(`${getAstroStudioUrl()}/auth/cli/token-create`),
-      {
-        method: "POST",
-        headers: new Headers({
-          Authorization: `Bearer ${sessionToken}`
-        }),
-        body: JSON.stringify({ projectId })
-      },
-      (res) => {
-        throw new Error(`Failed to create token: ${res.status} ${res.statusText}`);
-      }
-    );
-    spinner.succeed(green("Connected to remote database."));
-    const { token, ttl } = await response.json();
-    return { token, ttl };
-  }
-  constructor(options) {
-    this.token = options.token;
-    this.session = options.session;
-    this.projectId = options.projectId;
-    this.ttl = options.ttl;
-    this.renewTimer = setTimeout(() => this.renew(), 1e3 * 60 * 5 / 2);
-    this.expires = getExpiresFromTtl(this.ttl);
-  }
-  async fetch(url, body) {
-    return safeFetch(
-      `${getAstroStudioUrl()}${url}`,
-      {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${this.session}`,
-          "Content-Type": "application/json"
-        },
-        body: JSON.stringify(body)
-      },
-      () => {
-        throw new Error(`Failed to fetch ${url}.`);
-      }
-    );
-  }
-  tokenIsValid() {
-    return /* @__PURE__ */ new Date() > this.expires;
-  }
-  createRenewTimer() {
-    return setTimeout(() => this.renew(), 1e3 * 60 * this.ttl / 2);
-  }
-  async renew() {
-    clearTimeout(this.renewTimer);
-    delete this.renewTimer;
-    if (this.tokenIsValid()) {
-      const response = await this.fetch("/auth/cli/token-renew", {
-        token: this.token,
-        projectId: this.projectId
-      });
-      if (response.status === 200) {
-        this.expires = getExpiresFromTtl(this.ttl);
-        this.renewTimer = this.createRenewTimer();
-      } else {
-        throw new Error(`Unexpected response: ${response.status} ${response.statusText}`);
-      }
-    } else {
-      try {
-        const { token, ttl } = await ManagedRemoteAppToken.createToken(
-          this.session,
-          this.projectId
-        );
-        this.token = token;
-        this.ttl = ttl;
-        this.expires = getExpiresFromTtl(ttl);
-        this.renewTimer = this.createRenewTimer();
-      } catch {
-        throw new Error(
-          `Token has expired and attempts to renew it have failed, please try again.`
-        );
-      }
-    }
-  }
-  async destroy() {
-    try {
-      const response = await this.fetch("/auth/cli/token-delete", {
-        token: this.token,
-        projectId: this.projectId
-      });
-      if (response.status !== 200) {
-        throw new Error(`Unexpected response: ${response.status} ${response.statusText}`);
-      }
-    } catch (error) {
-      console.error("Failed to delete token.", error?.message);
-    }
-  }
-}
-async function getProjectIdFromFile() {
-  try {
-    return await readFile(PROJECT_ID_FILE, "utf-8");
-  } catch (error) {
-    return void 0;
-  }
-}
-async function getSessionIdFromFile() {
-  try {
-    return await readFile(SESSION_LOGIN_FILE, "utf-8");
-  } catch (error) {
-    return void 0;
-  }
-}
-async function getManagedAppTokenOrExit(token) {
-  if (token) {
-    return new ManagedLocalAppToken(token);
-  }
-  if (process.env.ASTRO_INTERNAL_TEST_REMOTE) {
-    return new ManagedLocalAppToken(
-      "fake"
-      /* token ignored in test */
-    );
-  }
-  const { ASTRO_STUDIO_APP_TOKEN } = getAstroStudioEnv();
-  if (ASTRO_STUDIO_APP_TOKEN) {
-    return new ManagedLocalAppToken(ASTRO_STUDIO_APP_TOKEN);
-  }
-  const sessionToken = await getSessionIdFromFile();
-  if (!sessionToken) {
-    if (ci.isCI) {
-      console.error(MISSING_SESSION_ID_CI_ERROR);
-    } else {
-      console.error(MISSING_SESSION_ID_ERROR);
-    }
-    process.exit(1);
-  }
-  const projectId = await getProjectIdFromFile();
-  if (!projectId) {
-    console.error(MISSING_PROJECT_ID_ERROR);
-    process.exit(1);
-  }
-  return ManagedRemoteAppToken.create(sessionToken, projectId);
-}
-function getExpiresFromTtl(ttl) {
-  return new Date(Date.now() + ttl * 60 * 1e3);
-}
-export {
-  PROJECT_ID_FILE,
-  SESSION_LOGIN_FILE,
-  getManagedAppTokenOrExit,
-  getProjectIdFromFile,
-  getSessionIdFromFile
-};