@astrojs/db 0.8.0 → 0.8.2

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

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

package/dist/core/integration/typegen.js

@@ -1,12 +1,11 @@
 import { existsSync } from "node:fs";
 import { mkdir, writeFile } from "node:fs/promises";
-import { DB_TYPES_FILE, RUNTIME_CONFIG_IMPORT, RUNTIME_IMPORT } from "../consts.js";
+import { DB_TYPES_FILE, RUNTIME_IMPORT } from "../consts.js";
 async function typegen({ tables, root }) {
   const content = `// This file is generated by \`studio sync\`
 declare module 'astro:db' {
 	export const db: import(${RUNTIME_IMPORT}).SqliteDB;
 	export const dbUrl: string;
-	export * from ${RUNTIME_CONFIG_IMPORT};
 
 ${Object.entries(tables).map(([name, collection]) => generateTableType(name, collection)).join("\n")}
 }

package/dist/core/schemas.d.ts

@@ -578,7 +578,7 @@ export declare const jsonColumnSchema: z.ZodObject<{
         default?: unknown;
     };
 }>;
-export declare const columnSchema: z.ZodUnion<[z.ZodObject<{
+export declare const columnSchema: z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<"boolean">;
     schema: z.ZodObject<{
         name: z.ZodOptional<z.ZodString>;
@@ -1379,7 +1379,7 @@ export declare const referenceableColumnSchema: z.ZodUnion<[z.ZodObject<{
         references?: (() => z.input<typeof numberColumnSchema>) | undefined;
     });
 }>]>;
-export declare const columnsSchema: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+export declare const columnsSchema: z.ZodRecord<z.ZodString, z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
     type: z.ZodLiteral<"boolean">;
     schema: z.ZodObject<{
         name: z.ZodOptional<z.ZodString>;
@@ -1871,7 +1871,7 @@ type ForeignKeysOutput = Omit<ForeignKeysInput, 'references'> & {
     references: MaybeArray<Omit<z.output<typeof referenceableColumnSchema>, 'references'>>;
 };
 export declare const tableSchema: z.ZodObject<{
-    columns: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+    columns: z.ZodRecord<z.ZodString, z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
         type: z.ZodLiteral<"boolean">;
         schema: z.ZodObject<{
             name: z.ZodOptional<z.ZodString>;
@@ -2441,7 +2441,7 @@ export declare const tableSchema: z.ZodObject<{
     deprecated?: boolean | undefined;
 }>;
 export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodObject<{
-    columns: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+    columns: z.ZodRecord<z.ZodString, z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
         type: z.ZodLiteral<"boolean">;
         schema: z.ZodObject<{
             name: z.ZodOptional<z.ZodString>;
@@ -3101,7 +3101,7 @@ export declare const tablesSchema: z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodOb
 }>, unknown>;
 export declare const dbConfigSchema: z.ZodObject<{
     tables: z.ZodOptional<z.ZodEffects<z.ZodRecord<z.ZodString, z.ZodObject<{
-        columns: z.ZodRecord<z.ZodString, z.ZodUnion<[z.ZodObject<{
+        columns: z.ZodRecord<z.ZodString, z.ZodDiscriminatedUnion<"type", [z.ZodObject<{
             type: z.ZodLiteral<"boolean">;
             schema: z.ZodObject<{
                 name: z.ZodOptional<z.ZodString>;

package/dist/core/schemas.js

@@ -96,7 +96,7 @@ const jsonColumnSchema = z.object({
     default: z.unknown().optional()
   })
 });
-const columnSchema = z.union([
+const columnSchema = z.discriminatedUnion("type", [
   booleanColumnSchema,
   numberColumnSchema,
   textColumnSchema,

package/dist/core/tokens.js

@@ -3,7 +3,7 @@ import { homedir } from "node:os";
 import { join } from "node:path";
 import { pathToFileURL } from "node:url";
 import { MISSING_PROJECT_ID_ERROR, MISSING_SESSION_ID_ERROR } from "./errors.js";
-import { getAstroStudioEnv, getAstroStudioUrl } from "./utils.js";
+import { getAstroStudioEnv, getAstroStudioUrl, getRemoteDatabaseUrl, safeFetch } 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 {
@@ -19,21 +19,35 @@ class ManagedLocalAppToken {
 class ManagedRemoteAppToken {
   token;
   session;
+  region;
   projectId;
   ttl;
   renewTimer;
+  static async getRegionCode() {
+    const pingResponse = await safeFetch(new URL(`${getRemoteDatabaseUrl()}/ping`));
+    const pingResult = await pingResponse.json();
+    return pingResult.data.region;
+  }
   static async create(sessionToken, projectId) {
-    const response = await fetch(new URL(`${getAstroStudioUrl()}/auth/cli/token-create`), {
-      method: "POST",
-      headers: new Headers({
-        Authorization: `Bearer ${sessionToken}`
-      }),
-      body: JSON.stringify({ projectId })
-    });
+    const region = await ManagedRemoteAppToken.getRegionCode();
+    const response = await safeFetch(
+      new URL(`${getAstroStudioUrl()}/auth/cli/token-create`),
+      {
+        method: "POST",
+        headers: new Headers({
+          Authorization: `Bearer ${sessionToken}`
+        }),
+        body: JSON.stringify({ projectId, region })
+      },
+      (res) => {
+        throw new Error(`Failed to create token: ${res.status} ${res.statusText}`);
+      }
+    );
     const { token: shortLivedAppToken, ttl } = await response.json();
     return new ManagedRemoteAppToken({
       token: shortLivedAppToken,
       session: sessionToken,
+      region,
       projectId,
       ttl
     });
@@ -41,19 +55,26 @@ class ManagedRemoteAppToken {
   constructor(options) {
     this.token = options.token;
     this.session = options.session;
+    this.region = options.region;
     this.projectId = options.projectId;
     this.ttl = options.ttl;
     this.renewTimer = setTimeout(() => this.renew(), 1e3 * 60 * 5 / 2);
   }
   async fetch(url, body) {
-    return fetch(`${getAstroStudioUrl()}${url}`, {
-      method: "POST",
-      headers: {
-        Authorization: `Bearer ${this.session}`,
-        "Content-Type": "application/json"
+    return safeFetch(
+      `${getAstroStudioUrl()}${url}`,
+      {
+        method: "POST",
+        headers: {
+          Authorization: `Bearer ${this.session}`,
+          "Content-Type": "application/json"
+        },
+        body: JSON.stringify({ ...body, region: this.region })
       },
-      body: JSON.stringify(body)
-    });
+      () => {
+        throw new Error(`Failed to fetch ${url}.`);
+      }
+    );
   }
   async renew() {
     clearTimeout(this.renewTimer);

package/dist/core/utils.d.ts

@@ -6,3 +6,14 @@ 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;
+};

package/dist/core/utils.js

@@ -17,10 +17,20 @@ 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
+  getRemoteDatabaseUrl,
+  safeFetch
 };

package/dist/runtime/db-client.js

@@ -2,6 +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";
 const isWebContainer = !!process.versions?.webcontainer;
 function createLocalDatabaseClient({ dbUrl }) {
   const url = isWebContainer ? "file:content.db" : dbUrl;
@@ -21,21 +22,24 @@ function createRemoteDatabaseClient(appToken, remoteDbURL) {
   const db = drizzleProxy(
     async (sql, parameters, method) => {
       const requestBody = { sql, args: parameters };
-      const res = await fetch(url, {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${appToken}`,
-          "Content-Type": "application/json"
+      const res = await safeFetch(
+        url,
+        {
+          method: "POST",
+          headers: {
+            Authorization: `Bearer ${appToken}`,
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify(requestBody)
         },
-        body: JSON.stringify(requestBody)
-      });
-      if (!res.ok) {
-        throw new Error(
-          `Failed to execute query.
+        (response) => {
+          throw new Error(
+            `Failed to execute query.
 Query: ${sql}
-Full error: ${res.status} ${await res.text()}}`
-        );
-      }
+Full error: ${response.status} ${response.statusText}`
+          );
+        }
+      );
       let remoteResult;
       try {
         const json = await res.json();
@@ -62,20 +66,23 @@ Full error: Unexpected JSON response. ${e instanceof Error ? e.message : String(
     },
     async (queries) => {
       const stmts = queries.map(({ sql, params }) => ({ sql, args: params }));
-      const res = await fetch(url, {
-        method: "POST",
-        headers: {
-          Authorization: `Bearer ${appToken}`,
-          "Content-Type": "application/json"
+      const res = await safeFetch(
+        url,
+        {
+          method: "POST",
+          headers: {
+            Authorization: `Bearer ${appToken}`,
+            "Content-Type": "application/json"
+          },
+          body: JSON.stringify(stmts)
         },
-        body: JSON.stringify(stmts)
-      });
-      if (!res.ok) {
-        throw new Error(
-          `Failed to execute batch queries.
-Full error: ${res.status} ${await res.text()}}`
-        );
-      }
+        (response) => {
+          throw new Error(
+            `Failed to execute batch queries.
+Full error: ${response.status} ${response.statusText}}`
+          );
+        }
+      );
       let remoteResults;
       try {
         const json = await res.json();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@astrojs/db",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "",
   "license": "MIT",
   "type": "module",
@@ -80,11 +80,12 @@
     "mocha": "^10.2.0",
     "typescript": "^5.2.2",
     "vite": "^5.1.4",
-    "astro-scripts": "0.0.14",
-    "astro": "4.5.2"
+    "astro": "4.5.3",
+    "astro-scripts": "0.0.14"
   },
   "scripts": {
-    "build": "astro-scripts build \"src/**/*.ts\" && tsc",
+    "types:config": "tsc -p ./tsconfig.config-types.json",
+    "build": "astro-scripts build \"src/**/*.ts\" && tsc && pnpm types:config",
     "build:ci": "astro-scripts build \"src/**/*.ts\"",
     "dev": "astro-scripts dev \"src/**/*.ts\"",
     "test": "mocha --exit --timeout 20000 \"test/*.js\" \"test/unit/**/*.js\"",

package/virtual.d.ts

@@ -1,9 +1,33 @@
 declare module 'astro:db' {
-	export const sql: typeof import('./dist/runtime/config.js').sql;
-	export const NOW: typeof import('./dist/runtime/config.js').NOW;
-	export const TRUE: typeof import('./dist/runtime/config.js').TRUE;
-	export const FALSE: typeof import('./dist/runtime/config.js').FALSE;
-	export const column: typeof import('./dist/runtime/config.js').column;
-	export const defineDb: typeof import('./dist/runtime/config.js').defineDb;
-	export const defineTable: typeof import('./dist/runtime/config.js').defineTable;
+	type RuntimeConfig = typeof import('./dist/_internal/runtime/config.js');
+
+	export const sql: RuntimeConfig['sql'];
+	export const NOW: RuntimeConfig['NOW'];
+	export const TRUE: RuntimeConfig['TRUE'];
+	export const FALSE: RuntimeConfig['FALSE'];
+	export const column: RuntimeConfig['column'];
+	export const defineDb: RuntimeConfig['defineDb'];
+	export const defineTable: RuntimeConfig['defineTable'];
+
+	export const eq: RuntimeConfig['eq'];
+	export const gt: RuntimeConfig['gt'];
+	export const gte: RuntimeConfig['gte'];
+	export const lt: RuntimeConfig['lt'];
+	export const lte: RuntimeConfig['lte'];
+	export const ne: RuntimeConfig['ne'];
+	export const isNull: RuntimeConfig['isNull'];
+	export const isNotNull: RuntimeConfig['isNotNull'];
+	export const inArray: RuntimeConfig['inArray'];
+	export const notInArray: RuntimeConfig['notInArray'];
+	export const exists: RuntimeConfig['exists'];
+	export const notExists: RuntimeConfig['notExists'];
+	export const between: RuntimeConfig['between'];
+	export const notBetween: RuntimeConfig['notBetween'];
+	export const like: RuntimeConfig['like'];
+	export const notIlike: RuntimeConfig['notIlike'];
+	export const not: RuntimeConfig['not'];
+	export const asc: RuntimeConfig['asc'];
+	export const desc: RuntimeConfig['desc'];
+	export const and: RuntimeConfig['and'];
+	export const or: RuntimeConfig['or'];
 }