@astrojs/db 0.4.0 → 0.5.0

package/dist/core/integration/typegen.js

@@ -20,19 +20,7 @@ ${Object.entries(tables).map(([name, collection]) => generateTableType(name, col
 function generateTableType(name, collection) {
   let tableType = `	export const ${name}: import(${RUNTIME_IMPORT}).Table<
 		${JSON.stringify(name)},
-		${JSON.stringify(
-    Object.fromEntries(
-      Object.entries(collection.columns).map(([columnName, column]) => [
-        columnName,
-        {
-          // Only select columns Drizzle needs for inference
-          type: column.type,
-          optional: column.schema.optional,
-          default: column.schema.default
-        }
-      ])
-    )
-  )}
+		${JSON.stringify(collection.columns)}
 	>;`;
   return tableType;
 }

package/dist/core/integration/vite-plugin-db.d.ts

@@ -1,22 +1,26 @@
 import type { DBTables } from '../types.js';
-import type { VitePlugin } from '../utils.js';
-type LateSchema = {
-    tables: () => DBTables;
+import { type VitePlugin } from '../utils.js';
+export type LateTables = {
+    get: () => DBTables;
 };
 type VitePluginDBParams = {
     connectToStudio: false;
-    schemas: LateSchema;
+    tables: LateTables;
+    srcDir: URL;
     root: URL;
 } | {
     connectToStudio: true;
-    schemas: LateSchema;
+    tables: LateTables;
     appToken: string;
+    srcDir: URL;
     root: URL;
 };
 export declare function vitePluginDb(params: VitePluginDBParams): VitePlugin;
-export declare function getVirtualModContents({ tables, root }: {
+export declare function getConfigVirtualModContents(): string;
+export declare function getLocalVirtualModContents({ tables, shouldSeed, }: {
     tables: DBTables;
     root: URL;
+    shouldSeed: boolean;
 }): string;
 export declare function getStudioVirtualModContents({ tables, appToken, }: {
     tables: DBTables;

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

@@ -1,73 +1,118 @@
-import { DB_PATH, RUNTIME_DRIZZLE_IMPORT, RUNTIME_IMPORT, VIRTUAL_MODULE_ID } from "../consts.js";
+import { fileURLToPath } from "node:url";
+import { normalizePath } from "vite";
+import { SEED_DEV_FILE_NAME } from "../../runtime/queries.js";
+import {
+  DB_PATH,
+  RUNTIME_CONFIG_IMPORT,
+  RUNTIME_DRIZZLE_IMPORT,
+  RUNTIME_IMPORT,
+  VIRTUAL_MODULE_ID
+} from "../consts.js";
+import { getDbDirectoryUrl, getRemoteDatabaseUrl } from "../utils.js";
+const LOCAL_DB_VIRTUAL_MODULE_ID = "astro:local";
 const resolvedVirtualModuleId = "\0" + VIRTUAL_MODULE_ID;
+const resolvedLocalDbVirtualModuleId = LOCAL_DB_VIRTUAL_MODULE_ID + "/local-db";
+const resolvedSeedVirtualModuleId = "\0" + VIRTUAL_MODULE_ID + "?shouldSeed";
 function vitePluginDb(params) {
+  const srcDirPath = normalizePath(fileURLToPath(params.srcDir));
   return {
     name: "astro:db",
     enforce: "pre",
-    resolveId(id) {
-      if (id === VIRTUAL_MODULE_ID) {
+    async resolveId(id, rawImporter) {
+      if (id === LOCAL_DB_VIRTUAL_MODULE_ID)
+        return resolvedLocalDbVirtualModuleId;
+      if (id !== VIRTUAL_MODULE_ID)
+        return;
+      if (params.connectToStudio)
+        return resolvedVirtualModuleId;
+      const importer = rawImporter ? await this.resolve(rawImporter) : null;
+      if (!importer)
         return resolvedVirtualModuleId;
+      if (importer.id.startsWith(srcDirPath)) {
+        return resolvedSeedVirtualModuleId;
       }
+      return resolvedVirtualModuleId;
     },
     load(id) {
-      if (id !== resolvedVirtualModuleId)
+      if (id === resolvedLocalDbVirtualModuleId) {
+        const dbUrl = new URL(DB_PATH, params.root);
+        return `import { createLocalDatabaseClient } from ${RUNTIME_IMPORT};
+				const dbUrl = ${JSON.stringify(dbUrl)};
+
+				export const db = createLocalDatabaseClient({ dbUrl });`;
+      }
+      if (id !== resolvedVirtualModuleId && id !== resolvedSeedVirtualModuleId)
         return;
       if (params.connectToStudio) {
         return getStudioVirtualModContents({
           appToken: params.appToken,
-          tables: params.schemas.tables()
+          tables: params.tables.get()
         });
       }
-      return getVirtualModContents({
+      return getLocalVirtualModContents({
         root: params.root,
-        tables: params.schemas.tables()
+        tables: params.tables.get(),
+        shouldSeed: id === resolvedSeedVirtualModuleId
       });
     }
   };
 }
-function getVirtualModContents({ tables, root }) {
-  const dbUrl = new URL(DB_PATH, root);
+function getConfigVirtualModContents() {
+  return `export * from ${RUNTIME_CONFIG_IMPORT}`;
+}
+function getLocalVirtualModContents({
+  tables,
+  shouldSeed
+}) {
+  const seedFilePaths = SEED_DEV_FILE_NAME.map(
+    // Format as /db/[name].ts
+    // for Vite import.meta.glob
+    (name) => new URL(name, getDbDirectoryUrl("file:///")).pathname
+  );
   return `
-import { collectionToTable, createLocalDatabaseClient } from ${RUNTIME_IMPORT};
-import dbUrl from ${JSON.stringify(`${dbUrl}?fileurl`)};
+import { asDrizzleTable, seedLocal } from ${RUNTIME_IMPORT};
+import { db as _db } from ${JSON.stringify(LOCAL_DB_VIRTUAL_MODULE_ID)};
 
-const params = ${JSON.stringify({
-    tables,
-    seeding: false
-  })};
-params.dbUrl = dbUrl;
+export const db = _db;
 
-export const db = await createLocalDatabaseClient(params);
+${shouldSeed ? `await seedLocal({
+	db: _db,
+	tables: ${JSON.stringify(tables)},
+	fileGlob: import.meta.glob(${JSON.stringify(seedFilePaths)}),
+})` : ""}
 
 export * from ${RUNTIME_DRIZZLE_IMPORT};
+export * from ${RUNTIME_CONFIG_IMPORT};
 
-${getStringifiedCollectionExports(tables)}
-`;
+${getStringifiedCollectionExports(tables)}`;
 }
 function getStudioVirtualModContents({
   tables,
   appToken
 }) {
   return `
-import {collectionToTable, createRemoteDatabaseClient} from ${RUNTIME_IMPORT};
+import {asDrizzleTable, createRemoteDatabaseClient} from ${RUNTIME_IMPORT};
 
 export const db = await createRemoteDatabaseClient(${JSON.stringify(
     appToken
-  )}, import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL);
+    // Respect runtime env for user overrides in SSR
+  )}, import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL ?? ${JSON.stringify(getRemoteDatabaseUrl())});
 export * from ${RUNTIME_DRIZZLE_IMPORT};
+export * from ${RUNTIME_CONFIG_IMPORT};
 
 ${getStringifiedCollectionExports(tables)}
 	`;
 }
 function getStringifiedCollectionExports(tables) {
   return Object.entries(tables).map(
-    ([name, collection]) => `export const ${name} = collectionToTable(${JSON.stringify(name)}, ${JSON.stringify(
+    ([name, collection]) => `export const ${name} = asDrizzleTable(${JSON.stringify(name)}, ${JSON.stringify(
       collection
     )}, false)`
   ).join("\n");
 }
 export {
+  getConfigVirtualModContents,
+  getLocalVirtualModContents,
   getStudioVirtualModContents,
-  getVirtualModContents,
   vitePluginDb
 };

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

@@ -1,5 +1,5 @@
-import type { VitePlugin } from '../utils.js';
 import type { AstroIntegrationLogger } from 'astro';
+import type { VitePlugin } from '../utils.js';
 export declare function vitePluginInjectEnvTs({ srcDir, root }: {
     srcDir: URL;
     root: URL;

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

@@ -0,0 +1,31 @@
+export declare function loadDbConfigFile(root: URL): Promise<{
+    mod: {
+        default?: unknown;
+    } | undefined;
+    dependencies: string[];
+}>;
+/**
+ * Bundle arbitrary `mjs` or `ts` file.
+ * Simplified fork from Vite's `bundleConfigFile` function.
+ *
+ * @see https://github.com/vitejs/vite/blob/main/packages/vite/src/node/config.ts#L961
+ */
+export declare function bundleFile({ fileUrl, root, virtualModContents, }: {
+    fileUrl: URL;
+    root: URL;
+    virtualModContents: string;
+}): Promise<{
+    code: string;
+    dependencies: string[];
+}>;
+/**
+ * Forked from Vite config loader, replacing CJS-based path concat with ESM only
+ *
+ * @see https://github.com/vitejs/vite/blob/main/packages/vite/src/node/config.ts#L1074
+ */
+export declare function importBundledFile({ code, root, }: {
+    code: string;
+    root: URL;
+}): Promise<{
+    default?: unknown;
+}>;

package/dist/core/load-file.js

@@ -0,0 +1,98 @@
+import { existsSync } from "node:fs";
+import { unlink, writeFile } from "node:fs/promises";
+import { fileURLToPath } from "node:url";
+import { build as esbuild } from "esbuild";
+import { CONFIG_FILE_NAMES, VIRTUAL_MODULE_ID } from "./consts.js";
+import { getConfigVirtualModContents } from "./integration/vite-plugin-db.js";
+import { getDbDirectoryUrl } from "./utils.js";
+async function loadDbConfigFile(root) {
+  let configFileUrl;
+  for (const fileName of CONFIG_FILE_NAMES) {
+    const fileUrl = new URL(fileName, getDbDirectoryUrl(root));
+    if (existsSync(fileUrl)) {
+      configFileUrl = fileUrl;
+    }
+  }
+  if (!configFileUrl) {
+    return { mod: void 0, dependencies: [] };
+  }
+  const { code, dependencies } = await bundleFile({
+    virtualModContents: getConfigVirtualModContents(),
+    root,
+    fileUrl: configFileUrl
+  });
+  return {
+    mod: await importBundledFile({ code, root }),
+    dependencies
+  };
+}
+async function bundleFile({
+  fileUrl,
+  root,
+  virtualModContents
+}) {
+  const result = await esbuild({
+    absWorkingDir: process.cwd(),
+    entryPoints: [fileURLToPath(fileUrl)],
+    outfile: "out.js",
+    packages: "external",
+    write: false,
+    target: ["node16"],
+    platform: "node",
+    bundle: true,
+    format: "esm",
+    sourcemap: "inline",
+    metafile: true,
+    define: {
+      "import.meta.env.ASTRO_STUDIO_REMOTE_DB_URL": "undefined"
+    },
+    plugins: [
+      {
+        name: "resolve-astro-db",
+        setup(build) {
+          build.onResolve({ filter: /^astro:db$/ }, ({ path }) => {
+            return { path, namespace: VIRTUAL_MODULE_ID };
+          });
+          build.onLoad({ namespace: VIRTUAL_MODULE_ID, filter: /.*/ }, () => {
+            return {
+              contents: virtualModContents,
+              // Needed to resolve runtime dependencies
+              resolveDir: fileURLToPath(root)
+            };
+          });
+        }
+      }
+    ]
+  });
+  const file = result.outputFiles[0];
+  if (!file) {
+    throw new Error(`Unexpected: no output file`);
+  }
+  return {
+    code: file.text,
+    dependencies: Object.keys(result.metafile.inputs)
+  };
+}
+async function importBundledFile({
+  code,
+  root
+}) {
+  const tmpFileUrl = new URL(`./db.timestamp-${Date.now()}.mjs`, root);
+  await writeFile(tmpFileUrl, code, { encoding: "utf8" });
+  try {
+    return await import(
+      /* @vite-ignore */
+      tmpFileUrl.pathname
+    );
+  } finally {
+    try {
+      await unlink(tmpFileUrl);
+    } catch {
+    }
+  }
+}
+export {
+  bundleFile,
+  importBundledFile,
+  loadDbConfigFile
+};

package/dist/core/tokens.js

@@ -2,8 +2,8 @@ import { readFile } from "node:fs/promises";
 import { homedir } from "node:os";
 import { join } from "node:path";
 import { pathToFileURL } from "node:url";
-import { getAstroStudioEnv, getAstroStudioUrl } from "./utils.js";
 import { MISSING_PROJECT_ID_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 {