@astrojs/db 0.18.3 → 0.19.0-alpha.1

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 'astro/zod';
+import type { z } from 'zod/v3';
 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';
+import { type ZodTypeDef, z } from 'zod/v3';
 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';
+import type { z } from 'zod/v3';
 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/core/cli/print-help.js

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

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

@@ -1,4 +1,4 @@
-import z from "zod";
+import z from "zod/v3";
 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 'astro/zod';
+import type { z } from 'zod/v3';
 export declare const errorMap: z.ZodErrorMap;

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

@@ -1,5 +1,5 @@
 import type { AstroIntegration } from 'astro';
-import { z } from 'zod';
+import { z } from 'zod/v3';
 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";
+import { z } from "zod/v3";
 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,8 +117,9 @@ function astroDBIntegration(options) {
         });
       },
       "astro:server:setup": async ({ server, logger }) => {
+        const environment = server.environments.ssr;
         seedHandler.execute = async (fileUrl) => {
-          await executeSeedFile({ fileUrl, viteServer: server });
+          await executeSeedFile({ fileUrl, environment });
         };
         const filesToWatch = [
           ...CONFIG_FILE_NAMES.map((c) => new URL(c, getDbDirectoryUrl(root))),
@@ -130,20 +131,18 @@ function astroDBIntegration(options) {
             server.restart();
           }
         });
-        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);
+        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));
+          });
+        }
       },
       "astro:build:start": async ({ logger }) => {
         if (!connectToRemote && !databaseFileEnvDefined() && finalBuildOutput === "server") {
@@ -157,8 +156,9 @@ 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, viteServer: tempViteServer });
+          await executeSeedFile({ fileUrl, environment });
         };
       },
       "astro:build:done": async ({}) => {
@@ -176,10 +176,10 @@ function integration(options) {
 }
 async function executeSeedFile({
   fileUrl,
-  viteServer
+  environment
 }) {
   const pathname = decodeURIComponent(fileUrl.pathname);
-  const mod = await viteServer.ssrLoadModule(pathname);
+  const mod = await environment.runner.import(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.hot.send;
-  tempViteServer.hot.send = (payload) => {
+  const hotSend = tempViteServer.environments.client.hot.send;
+  tempViteServer.environments.client.hot.send = (payload) => {
     if (payload.type === "error") {
       throw payload.err;
     }

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;
-                    default?: undefined;
                     optional?: false | undefined;
+                    default?: 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").input<typeof import("./schemas.js").referenceableColumnSchema>, "references">>;
+                references: () => import("./schemas.js").MaybeArray<Omit<import("zod/v3").input<typeof import("./schemas.js").referenceableColumnSchema>, "references">>;
             }, "references"> & {
-                references: import("./schemas.js").MaybeArray<Omit<import("zod").output<typeof import("./schemas.js").referenceableColumnSchema>, "references">>;
+                references: import("./schemas.js").MaybeArray<Omit<import("zod/v3").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;
-        default?: undefined;
         optional?: false | undefined;
+        default?: 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;
     } & ({