@astrojs/db 0.19.0-beta.2 → 0.19.0

package/dist/_internal/core/integration/error-map.d.ts

@@ -2,5 +2,5 @@
  * This is a modified version of Astro's error map. source:
  * https://github.com/withastro/astro/blob/main/packages/astro/src/content/error-map.ts
  */
-import type { z } from 'zod/v3';
+import type { z } from 'astro/zod';
 export declare const errorMap: z.ZodErrorMap;

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

@@ -1,5 +1,5 @@
 import { SQL } from 'drizzle-orm';
-import { type ZodTypeDef, z } from 'zod/v3';
+import { type ZodTypeDef, z } from 'zod';
 import { type SerializedSQL } from '../runtime/types.js';
 import type { NumberColumn, TextColumn } from './types.js';
 export type MaybeArray<T> = T | T[];

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

@@ -1,4 +1,4 @@
-import type { z } from 'zod/v3';
+import type { z } from 'zod';
 import type { booleanColumnSchema, columnSchema, columnsSchema, dateColumnSchema, dbConfigSchema, indexSchema, jsonColumnSchema, MaybeArray, numberColumnOptsSchema, numberColumnSchema, referenceableColumnSchema, resolvedIndexSchema, tableSchema, textColumnOptsSchema, textColumnSchema } from './schemas.js';
 export type ResolvedIndexes = z.output<typeof dbConfigSchema>['tables'][string]['indexes'];
 export type BooleanColumn = z.infer<typeof booleanColumnSchema>;

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

@@ -1,4 +1,5 @@
 import type { AstroConfig, AstroIntegration } from 'astro';
+import type { Arguments } from 'yargs-parser';
 import './types.js';
 export type VitePlugin = Required<AstroConfig['vite']>['plugins'][number];
 export declare function getAstroEnv(envMode?: string): Record<`ASTRO_${string}`, string>;
@@ -7,6 +8,8 @@ export type RemoteDatabaseInfo = {
     token: string;
 };
 export declare function getRemoteDatabaseInfo(): RemoteDatabaseInfo;
+export declare function resolveDbAppToken(flags: Arguments, envToken: string): string;
+export declare function resolveDbAppToken(flags: Arguments, envToken: string | undefined): string | undefined;
 export declare function getDbDirectoryUrl(root: URL | string): URL;
 export declare function defineDbIntegration(integration: AstroIntegration): AstroIntegration;
 /**

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

@@ -12,7 +12,7 @@ import {
   getRemoteVirtualModContents
 } from "../../../integration/vite-plugin-db.js";
 import { bundleFile, importBundledFile } from "../../../load-file.js";
-import { getRemoteDatabaseInfo } from "../../../utils.js";
+import { getRemoteDatabaseInfo, resolveDbAppToken } from "../../../utils.js";
 async function cmd({
   astroConfig,
   dbConfig,
@@ -31,9 +31,10 @@ async function cmd({
   let virtualModContents;
   if (flags.remote) {
     const dbInfo = getRemoteDatabaseInfo();
+    const appToken = resolveDbAppToken(flags, dbInfo.token);
     virtualModContents = getRemoteVirtualModContents({
       tables: dbConfig.tables ?? {},
-      appToken: flags.token ?? dbInfo.token,
+      appToken,
       isBuild: false,
       output: "server",
       localExecution: true

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

@@ -2,7 +2,10 @@ import { sql } from "drizzle-orm";
 import prompts from "prompts";
 import { MIGRATION_VERSION } from "../../../consts.js";
 import { createClient } from "../../../db-client/libsql-node.js";
-import { getRemoteDatabaseInfo } from "../../../utils.js";
+import {
+  getRemoteDatabaseInfo,
+  resolveDbAppToken
+} from "../../../utils.js";
 import {
   createCurrentSnapshot,
   createEmptySnapshot,
@@ -17,7 +20,8 @@ async function cmd({
   const isDryRun = flags.dryRun;
   const isForceReset = flags.forceReset;
   const dbInfo = getRemoteDatabaseInfo();
-  const productionSnapshot = await getProductionCurrentSnapshot(dbInfo);
+  const appToken = resolveDbAppToken(flags, dbInfo.token);
+  const productionSnapshot = await getProductionCurrentSnapshot({ ...dbInfo, token: appToken });
   const currentSnapshot = createCurrentSnapshot(dbConfig);
   const isFromScratch = !productionSnapshot;
   const { queries: migrationQueries, confirmations } = await getMigrationQueries({
@@ -53,7 +57,7 @@ async function cmd({
     await pushSchema({
       statements: migrationQueries,
       dbInfo,
-      appToken: flags.token ?? dbInfo.token,
+      appToken,
       isDryRun,
       currentSnapshot
     });

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

@@ -4,7 +4,7 @@ import { DB_PATH } from "../../../consts.js";
 import { createClient as createLocalDatabaseClient } from "../../../db-client/libsql-local.js";
 import { createClient as createRemoteDatabaseClient } from "../../../db-client/libsql-node.js";
 import { SHELL_QUERY_MISSING_ERROR } from "../../../errors.js";
-import { getAstroEnv, getRemoteDatabaseInfo } from "../../../utils.js";
+import { getAstroEnv, getRemoteDatabaseInfo, resolveDbAppToken } from "../../../utils.js";
 async function cmd({
   flags,
   astroConfig
@@ -16,7 +16,8 @@ async function cmd({
   }
   const dbInfo = getRemoteDatabaseInfo();
   if (flags.remote) {
-    const db = createRemoteDatabaseClient(dbInfo);
+    const appToken = resolveDbAppToken(flags, dbInfo.token);
+    const db = createRemoteDatabaseClient({ ...dbInfo, token: appToken });
     const result = await db.run(sql.raw(query));
     console.log(result);
   } else {

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

@@ -1,4 +1,4 @@
-import { getRemoteDatabaseInfo } from "../../../utils.js";
+import { getRemoteDatabaseInfo, resolveDbAppToken } from "../../../utils.js";
 import {
   createCurrentSnapshot,
   createEmptySnapshot,
@@ -12,7 +12,8 @@ async function cmd({
 }) {
   const isJson = flags.json;
   const dbInfo = getRemoteDatabaseInfo();
-  const productionSnapshot = await getProductionCurrentSnapshot(dbInfo);
+  const appToken = resolveDbAppToken(flags, dbInfo.token);
+  const productionSnapshot = await getProductionCurrentSnapshot({ ...dbInfo, token: appToken });
   const currentSnapshot = createCurrentSnapshot(dbConfig);
   const { queries: migrationQueries, confirmations } = await getMigrationQueries({
     oldSnapshot: productionSnapshot || createEmptySnapshot(),

package/dist/core/cli/index.js

@@ -6,6 +6,7 @@ async function cli({
 }) {
   const args = flags._;
   const command = args[2] === "db" ? args[3] : args[2];
+  validateDbAppTokenFlag(command, flags);
   const { dbConfig } = await resolveDbConfig(astroConfig);
   switch (command) {
     case "shell": {
@@ -59,6 +60,16 @@ async function cli({
     }
   }
 }
+function validateDbAppTokenFlag(command, flags) {
+  if (command !== "execute" && command !== "push" && command !== "verify" && command !== "shell")
+    return;
+  const dbAppToken = flags.dbAppToken;
+  if (dbAppToken == null) return;
+  if (typeof dbAppToken !== "string") {
+    console.error(`Invalid value for --db-app-token; expected a string.`);
+    process.exit(1);
+  }
+}
 export {
   cli
 };

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

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

package/dist/core/db-client/utils.js

@@ -1,4 +1,4 @@
-import z from "zod/v3";
+import z from "zod";
 const rawLibSQLOptions = z.record(z.string());
 const parseNumber = (value) => z.coerce.number().parse(value);
 const parseBoolean = (value) => z.coerce.boolean().parse(value);

package/dist/core/integration/error-map.d.ts

@@ -2,5 +2,5 @@
  * This is a modified version of Astro's error map. source:
  * https://github.com/withastro/astro/blob/main/packages/astro/src/content/error-map.ts
  */
-import type { z } from 'zod/v3';
+import type { z } from 'astro/zod';
 export declare const errorMap: z.ZodErrorMap;

package/dist/core/integration/file-url.js

@@ -12,11 +12,8 @@ function fileURLIntegration() {
     return {
       name: "@astrojs/db/file-url",
       enforce: "pre",
-      load: {
-        filter: {
-          id: /\?fileurl$/
-        },
-        async handler(id) {
+      async load(id) {
+        if (id.endsWith("?fileurl")) {
           const filePath = id.slice(0, id.indexOf("?"));
           if (command === "build") {
             const data = await fs.promises.readFile(filePath);

package/dist/core/integration/index.d.ts

@@ -1,5 +1,5 @@
 import type { AstroIntegration } from 'astro';
-import { z } from 'zod/v3';
+import { z } from 'zod';
 declare const astroDBConfigSchema: z.ZodDefault<z.ZodOptional<z.ZodObject<{
     /**
      * Sets the mode of the underlying `@libsql/client` connection.

package/dist/core/integration/index.js

@@ -9,7 +9,7 @@ import {
   mergeConfig
 } from "vite";
 import parseArgs from "yargs-parser";
-import { z } from "zod/v3";
+import { z } from "zod";
 import { AstroDbError, isDbError } from "../../runtime/utils.js";
 import { CONFIG_FILE_NAMES, DB_PATH, VIRTUAL_MODULE_ID } from "../consts.js";
 import { EXEC_DEFAULT_EXPORT_ERROR, EXEC_ERROR } from "../errors.js";
@@ -117,9 +117,8 @@ function astroDBIntegration(options) {
         });
       },
       "astro:server:setup": async ({ server, logger }) => {
-        const environment = server.environments.ssr;
         seedHandler.execute = async (fileUrl) => {
-          await executeSeedFile({ fileUrl, environment });
+          await executeSeedFile({ fileUrl, viteServer: server });
         };
         const filesToWatch = [
           ...CONFIG_FILE_NAMES.map((c) => new URL(c, getDbDirectoryUrl(root))),
@@ -131,18 +130,20 @@ function astroDBIntegration(options) {
             server.restart();
           }
         });
-        logger.info(
-          connectToRemote ? "Connected to remote database." : "New local database created."
-        );
-        if (connectToRemote) return;
-        const localSeedPaths = SEED_DEV_FILE_NAME.map(
-          (name) => new URL(name, getDbDirectoryUrl(root))
-        );
-        if (seedFiles.get().length || localSeedPaths.find((path) => existsSync(path))) {
-          await environment.runner.import(VIRTUAL_MODULE_ID).catch((e) => {
-            logger.error(e instanceof Error ? e.message : String(e));
-          });
-        }
+        setTimeout(() => {
+          logger.info(
+            connectToRemote ? "Connected to remote database." : "New local database created."
+          );
+          if (connectToRemote) return;
+          const localSeedPaths = SEED_DEV_FILE_NAME.map(
+            (name) => new URL(name, getDbDirectoryUrl(root))
+          );
+          if (seedFiles.get().length || localSeedPaths.find((path) => existsSync(path))) {
+            server.ssrLoadModule(VIRTUAL_MODULE_ID).catch((e) => {
+              logger.error(e instanceof Error ? e.message : String(e));
+            });
+          }
+        }, 100);
       },
       "astro:build:start": async ({ logger }) => {
         if (!connectToRemote && !databaseFileEnvDefined() && finalBuildOutput === "server") {
@@ -156,9 +157,8 @@ function astroDBIntegration(options) {
       },
       "astro:build:setup": async ({ vite }) => {
         tempViteServer = await getTempViteServer({ viteConfig: vite });
-        const environment = tempViteServer.environments.ssr;
         seedHandler.execute = async (fileUrl) => {
-          await executeSeedFile({ fileUrl, environment });
+          await executeSeedFile({ fileUrl, viteServer: tempViteServer });
         };
       },
       "astro:build:done": async ({}) => {
@@ -176,10 +176,10 @@ function integration(options) {
 }
 async function executeSeedFile({
   fileUrl,
-  environment
+  viteServer
 }) {
   const pathname = decodeURIComponent(fileUrl.pathname);
-  const mod = await environment.runner.import(pathname);
+  const mod = await viteServer.ssrLoadModule(pathname);
   if (typeof mod.default !== "function") {
     throw new AstroDbError(EXEC_DEFAULT_EXPORT_ERROR(fileURLToPath(fileUrl)));
   }
@@ -201,8 +201,8 @@ async function getTempViteServer({ viteConfig }) {
       logLevel: "silent"
     })
   );
-  const hotSend = tempViteServer.environments.client.hot.send;
-  tempViteServer.environments.client.hot.send = (payload) => {
+  const hotSend = tempViteServer.hot.send;
+  tempViteServer.hot.send = (payload) => {
     if (payload.type === "error") {
       throw payload.err;
     }

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

@@ -21,26 +21,18 @@ function vitePluginDbClient(params) {
   return {
     name: "virtual:astro:db-client",
     enforce: "pre",
-    resolveId: {
-      filter: {
-        id: new RegExp(`^${VIRTUAL_CLIENT_MODULE_ID}$`)
-      },
-      handler() {
-        return resolved;
-      }
+    async resolveId(id) {
+      if (id !== VIRTUAL_CLIENT_MODULE_ID) return;
+      return resolved;
     },
-    load: {
-      filter: {
-        id: new RegExp(`^${resolved}$`)
-      },
-      handler() {
-        switch (params.connectToRemote) {
-          case true:
-            return getRemoteClientModule(params.mode);
-          case false:
-          default:
-            return getLocalClientModule(params.mode);
-        }
+    async load(id) {
+      if (id !== resolved) return;
+      switch (params.connectToRemote) {
+        case true:
+          return getRemoteClientModule(params.mode);
+        case false:
+        default:
+          return getLocalClientModule(params.mode);
       }
     }
   };

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

@@ -31,57 +31,49 @@ function vitePluginDb(params) {
     configResolved(resolvedConfig) {
       command = resolvedConfig.command;
     },
-    resolveId: {
-      filter: {
-        id: new RegExp(`^${VIRTUAL_MODULE_ID}$`)
-      },
-      handler() {
-        if (params.seedHandler.inProgress) {
-          return resolved.importedFromSeedFile;
-        }
-        return resolved.module;
+    async resolveId(id) {
+      if (id !== VIRTUAL_MODULE_ID) return;
+      if (params.seedHandler.inProgress) {
+        return resolved.importedFromSeedFile;
       }
+      return resolved.module;
     },
-    load: {
-      filter: {
-        id: new RegExp(`^(${resolved.module}|${resolved.importedFromSeedFile})$`)
-      },
-      async handler(id) {
-        if (params.connectToRemote) {
-          return getRemoteVirtualModContents({
-            appToken: params.appToken,
-            tables: params.tables.get(),
-            isBuild: command === "build",
-            output: params.output,
-            localExecution: false
-          });
-        }
-        if (id === resolved.importedFromSeedFile) {
-          return getLocalVirtualModContents({
-            root: params.root,
-            tables: params.tables.get(),
-            localExecution: false
-          });
-        }
-        await recreateTables(params);
-        const seedFiles = getResolvedSeedFiles(params);
-        for await (const seedFile of seedFiles) {
-          this.addWatchFile(fileURLToPath(seedFile));
-          if (existsSync(seedFile)) {
-            params.seedHandler.inProgress = true;
-            await params.seedHandler.execute(seedFile);
-          }
-        }
-        if (params.seedHandler.inProgress) {
-          (params.logger ?? console).info("Seeded database.");
-          params.seedHandler.inProgress = false;
-        }
+    async load(id) {
+      if (id !== resolved.module && id !== resolved.importedFromSeedFile) return;
+      if (params.connectToRemote) {
+        return getRemoteVirtualModContents({
+          appToken: params.appToken,
+          tables: params.tables.get(),
+          isBuild: command === "build",
+          output: params.output,
+          localExecution: false
+        });
+      }
+      if (id === resolved.importedFromSeedFile) {
         return getLocalVirtualModContents({
           root: params.root,
           tables: params.tables.get(),
           localExecution: false
         });
       }
+      await recreateTables(params);
+      const seedFiles = getResolvedSeedFiles(params);
+      for await (const seedFile of seedFiles) {
+        this.addWatchFile(fileURLToPath(seedFile));
+        if (existsSync(seedFile)) {
+          params.seedHandler.inProgress = true;
+          await params.seedHandler.execute(seedFile);
+        }
+      }
+      if (params.seedHandler.inProgress) {
+        (params.logger ?? console).info("Seeded database.");
+        params.seedHandler.inProgress = false;
+      }
+      return getLocalVirtualModContents({
+        root: params.root,
+        tables: params.tables.get(),
+        localExecution: false
+      });
     }
   };
 }

package/dist/core/load-file.d.ts

@@ -18,10 +18,10 @@ export declare function resolveDbConfig({ root, integrations, }: Pick<AstroConfi
                     optional: boolean;
                     unique: boolean;
                     deprecated: boolean;
+                    default?: boolean | import("../runtime/types.js").SerializedSQL | undefined;
                     name?: string | undefined;
                     label?: string | undefined;
                     collection?: string | undefined;
-                    default?: boolean | import("../runtime/types.js").SerializedSQL | undefined;
                 };
             } | {
                 type: "number";
@@ -37,8 +37,8 @@ export declare function resolveDbConfig({ root, integrations, }: Pick<AstroConfi
                     default?: number | import("../runtime/types.js").SerializedSQL | undefined;
                 } | {
                     primaryKey: true;
-                    optional?: false | undefined;
                     default?: undefined;
+                    optional?: false | undefined;
                 })) & {
                     references?: import("./types.js").NumberColumn;
                 };
@@ -47,10 +47,10 @@ export declare function resolveDbConfig({ root, integrations, }: Pick<AstroConfi
                 schema: ({
                     unique: boolean;
                     deprecated: boolean;
+                    default?: string | import("../runtime/types.js").SerializedSQL | undefined;
                     name?: string | undefined;
                     label?: string | undefined;
                     collection?: string | undefined;
-                    default?: string | import("../runtime/types.js").SerializedSQL | undefined;
                     multiline?: boolean | undefined;
                     enum?: [string, ...string[]] | undefined;
                 } & ({
@@ -68,10 +68,10 @@ export declare function resolveDbConfig({ root, integrations, }: Pick<AstroConfi
                     optional: boolean;
                     unique: boolean;
                     deprecated: boolean;
+                    default?: string | import("../runtime/types.js").SerializedSQL | undefined;
                     name?: string | undefined;
                     label?: string | undefined;
                     collection?: string | undefined;
-                    default?: string | import("../runtime/types.js").SerializedSQL | undefined;
                 };
             } | {
                 type: "json";
@@ -79,17 +79,17 @@ export declare function resolveDbConfig({ root, integrations, }: Pick<AstroConfi
                     optional: boolean;
                     unique: boolean;
                     deprecated: boolean;
+                    default?: unknown;
                     name?: string | undefined;
                     label?: string | undefined;
                     collection?: string | undefined;
-                    default?: unknown;
                 };
             }>;
             foreignKeys?: (Omit<{
                 columns: import("./schemas.js").MaybeArray<string>;
-                references: () => import("./schemas.js").MaybeArray<Omit<import("zod/v3").input<typeof import("./schemas.js").referenceableColumnSchema>, "references">>;
+                references: () => import("./schemas.js").MaybeArray<Omit<import("zod").input<typeof import("./schemas.js").referenceableColumnSchema>, "references">>;
             }, "references"> & {
-                references: import("./schemas.js").MaybeArray<Omit<import("zod/v3").output<typeof import("./schemas.js").referenceableColumnSchema>, "references">>;
+                references: import("./schemas.js").MaybeArray<Omit<import("zod").output<typeof import("./schemas.js").referenceableColumnSchema>, "references">>;
             })[] | undefined;
         }>;
     };

package/dist/core/queries.d.ts

@@ -19,8 +19,8 @@ export declare function getReferencesConfig(column: DBColumn): {
         default?: number | import("../runtime/types.js").SerializedSQL | undefined;
     } | {
         primaryKey: true;
-        optional?: false | undefined;
         default?: undefined;
+        optional?: false | undefined;
     })) & {
         references?: NumberColumn;
     };
@@ -29,10 +29,10 @@ export declare function getReferencesConfig(column: DBColumn): {
     schema: ({
         unique: boolean;
         deprecated: boolean;
+        default?: string | import("../runtime/types.js").SerializedSQL | undefined;
         name?: string | undefined;
         label?: string | undefined;
         collection?: string | undefined;
-        default?: string | import("../runtime/types.js").SerializedSQL | undefined;
         multiline?: boolean | undefined;
         enum?: [string, ...string[]] | undefined;
     } & ({