@astrojs/db 0.8.3 → 0.8.5

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

@@ -0,0 +1,4 @@
+/**
+ * Small wrapper around fetch that throws an error if the response is not OK. Allows for custom error handling as well through the onNotOK callback.
+ */
+export declare function safeFetch(url: Parameters<typeof fetch>[0], options?: Parameters<typeof fetch>[1], onNotOK?: (response: Response) => void | Promise<void>): Promise<Response>;

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

@@ -5,9 +5,10 @@ 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, safeFetch } from "../../../utils.js";
+import { getAstroStudioUrl } from "../../../utils.js";
 async function cmd() {
   const sessionToken = await getSessionIdFromFile();
   if (!sessionToken) {

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

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

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

@@ -14,12 +14,13 @@ import {
   schemaTypeToSqlType
 } from "../../runtime/queries.js";
 import { isSerializedSQL } from "../../runtime/types.js";
+import { safeFetch } from "../../runtime/utils.js";
 import { MIGRATION_VERSION } from "../consts.js";
 import { RENAME_COLUMN_ERROR, RENAME_TABLE_ERROR } from "../errors.js";
 import { columnSchema } from "../schemas.js";
 import {
 } from "../types.js";
-import { getRemoteDatabaseUrl, safeFetch } from "../utils.js";
+import { getRemoteDatabaseUrl } from "../utils.js";
 const sqlite = new SQLiteAsyncDialect();
 const genTempTableName = customAlphabet("abcdefghijklmnopqrstuvwxyz", 10);
 async function getMigrationQueries({

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

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

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

@@ -94,7 +94,7 @@ function getStudioVirtualModContents({
   return `
 import {asDrizzleTable, createRemoteDatabaseClient} from ${RUNTIME_IMPORT};
 
-export const db = await createRemoteDatabaseClient(${JSON.stringify(
+export const db = await createRemoteDatabaseClient(process.env.ASTRO_STUDIO_APP_TOKEN ?? ${JSON.stringify(
     appToken
     // Respect runtime env for user overrides in SSR
   )}, import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL ?? ${JSON.stringify(getRemoteDatabaseUrl())});

package/dist/core/integration/vite-plugin-inject-env-ts.js

@@ -33,7 +33,7 @@ async function setUpEnvTs({
       typesEnvContents = `${dbTypeReference}
 ${typesEnvContents}`;
       await writeFile(envTsPath, typesEnvContents, "utf-8");
-      logger.info(`${cyan(bold("[astro:db]"))} Added ${bold(envTsPathRelativetoRoot)} types`);
+      logger.info(`Added ${bold(envTsPathRelativetoRoot)} types`);
     }
   }
 }

package/dist/core/tokens.js

@@ -4,8 +4,9 @@ import { join } from "node:path";
 import { pathToFileURL } from "node:url";
 import { green } from "kleur/colors";
 import ora from "ora";
+import { safeFetch } from "../runtime/utils.js";
 import { MISSING_PROJECT_ID_ERROR, MISSING_SESSION_ID_ERROR } from "./errors.js";
-import { getAstroStudioEnv, getAstroStudioUrl, safeFetch } from "./utils.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 {

package/dist/core/utils.d.ts

@@ -6,10 +6,6 @@ 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;
-/**
- * Small wrapper around fetch that throws an error if the response is not OK. Allows for custom error handling as well through the onNotOK callback.
- */
-export declare function safeFetch(url: Parameters<typeof fetch>[0], options?: Parameters<typeof fetch>[1], onNotOK?: (response: Response) => void | Promise<void>): Promise<Response>;
 export type Result<T> = {
     success: true;
     data: T;

package/dist/core/utils.js

@@ -17,20 +17,10 @@ function getDbDirectoryUrl(root) {
 function defineDbIntegration(integration) {
   return integration;
 }
-async function safeFetch(url, options = {}, onNotOK = () => {
-  throw new Error(`Request to ${url} returned a non-OK status code.`);
-}) {
-  const response = await fetch(url, options);
-  if (!response.ok) {
-    await onNotOK(response);
-  }
-  return response;
-}
 export {
   defineDbIntegration,
   getAstroStudioEnv,
   getAstroStudioUrl,
   getDbDirectoryUrl,
-  getRemoteDatabaseUrl,
-  safeFetch
+  getRemoteDatabaseUrl
 };

package/dist/runtime/db-client.js

@@ -2,7 +2,7 @@ import { createClient } from "@libsql/client";
 import { drizzle as drizzleLibsql } from "drizzle-orm/libsql";
 import { drizzle as drizzleProxy } from "drizzle-orm/sqlite-proxy";
 import { z } from "zod";
-import { safeFetch } from "../core/utils.js";
+import { safeFetch } from "./utils.js";
 const isWebContainer = !!process.versions?.webcontainer;
 function createLocalDatabaseClient({ dbUrl }) {
   const url = isWebContainer ? "file:content.db" : dbUrl;

package/dist/runtime/utils.d.ts

@@ -0,0 +1,4 @@
+/**
+ * Small wrapper around fetch that throws an error if the response is not OK. Allows for custom error handling as well through the onNotOK callback.
+ */
+export declare function safeFetch(url: Parameters<typeof fetch>[0], options?: Parameters<typeof fetch>[1], onNotOK?: (response: Response) => void | Promise<void>): Promise<Response>;

package/dist/runtime/utils.js

@@ -0,0 +1,12 @@
+async function safeFetch(url, options = {}, onNotOK = () => {
+  throw new Error(`Request to ${url} returned a non-OK status code.`);
+}) {
+  const response = await fetch(url, options);
+  if (!response.ok) {
+    await onNotOK(response);
+  }
+  return response;
+}
+export {
+  safeFetch
+};

package/package.json

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

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

@@ -1,19 +0,0 @@
-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 getRemoteDatabaseUrl(): string;
-export declare function getAstroStudioUrl(): string;
-export declare function getDbDirectoryUrl(root: URL | string): URL;
-export declare function defineDbIntegration(integration: AstroDbIntegration): AstroIntegration;
-/**
- * Small wrapper around fetch that throws an error if the response is not OK. Allows for custom error handling as well through the onNotOK callback.
- */
-export declare function safeFetch(url: Parameters<typeof fetch>[0], options?: Parameters<typeof fetch>[1], onNotOK?: (response: Response) => void | Promise<void>): Promise<Response>;
-export type Result<T> = {
-    success: true;
-    data: T;
-} | {
-    success: false;
-    data: unknown;
-};