Fix: drizzle vs. config runtime export conflict (#10357)

* fix: drizzle vs config export problem * chore: remove drizzle runtime export * chore: changeset
withastro · Mar 7, 2024 · 5a9dab2 · 5a9dab2
1 parent 652bd49
commit 5a9dab2
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 20 deletions.
diff --git a/.changeset/chilly-cherries-appear.md b/.changeset/chilly-cherries-appear.md
@@ -0,0 +1,5 @@
+---
+"@astrojs/db": patch
+---
+
+Fix runtime export error when building with the node adapter
diff --git a/packages/db/package.json b/packages/db/package.json
@@ -20,10 +20,6 @@
       "types": "./dist/runtime/index.d.ts",
       "import": "./dist/runtime/index.js"
     },
-    "./runtime/drizzle": {
-      "types": "./dist/runtime/drizzle.d.ts",
-      "import": "./dist/runtime/drizzle.js"
-    },
     "./runtime/config": {
       "types": "./dist/runtime/config.d.ts",
       "import": "./dist/runtime/config.js"
@@ -41,9 +37,6 @@
       "runtime": [
         "./dist/runtime/index.d.ts"
       ],
-      "runtime/drizzle": [
-        "./dist/runtime/drizzle.d.ts"
-      ],
       "runtime/config": [
         "./dist/runtime/config.d.ts"
       ]

diff --git a/packages/db/src/core/consts.ts b/packages/db/src/core/consts.ts
@@ -5,7 +5,6 @@ export const PACKAGE_NAME = JSON.parse(
 ).name;
 
 export const RUNTIME_IMPORT = JSON.stringify(`${PACKAGE_NAME}/runtime`);
-export const RUNTIME_DRIZZLE_IMPORT = JSON.stringify(`${PACKAGE_NAME}/runtime/drizzle`);
 export const RUNTIME_CONFIG_IMPORT = JSON.stringify(`${PACKAGE_NAME}/runtime/config`);
 
 export const DB_TYPES_FILE = 'db-types.d.ts';

diff --git a/packages/db/src/core/integration/typegen.ts b/packages/db/src/core/integration/typegen.ts
@@ -1,14 +1,14 @@
 import { existsSync } from 'node:fs';
 import { mkdir, writeFile } from 'node:fs/promises';
-import { DB_TYPES_FILE, RUNTIME_DRIZZLE_IMPORT, RUNTIME_IMPORT } from '../consts.js';
+import { DB_TYPES_FILE, RUNTIME_CONFIG_IMPORT, RUNTIME_IMPORT } from '../consts.js';
 import type { DBTable, DBTables } from '../types.js';
 
 export async function typegen({ tables, root }: { tables: DBTables; root: URL }) {
 	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_DRIZZLE_IMPORT};
+	export * from ${RUNTIME_CONFIG_IMPORT};
 
 ${Object.entries(tables)
 	.map(([name, collection]) => generateTableType(name, collection))

diff --git a/packages/db/src/core/integration/vite-plugin-db.ts b/packages/db/src/core/integration/vite-plugin-db.ts
@@ -1,13 +1,7 @@
 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 { DB_PATH, RUNTIME_CONFIG_IMPORT, RUNTIME_IMPORT, VIRTUAL_MODULE_ID } from '../consts.js';
 import type { DBTables } from '../types.js';
 import { type VitePlugin, getDbDirectoryUrl, getRemoteDatabaseUrl } from '../utils.js';
 
@@ -116,7 +110,6 @@ ${
 		: ''
 }
 
-export * from ${RUNTIME_DRIZZLE_IMPORT};
 export * from ${RUNTIME_CONFIG_IMPORT};
 
 ${getStringifiedCollectionExports(tables)}`;
@@ -136,7 +129,7 @@ export const db = await createRemoteDatabaseClient(${JSON.stringify(
 		appToken
 		// 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)}

diff --git a/packages/db/src/runtime/config.ts b/packages/db/src/runtime/config.ts
@@ -45,4 +45,29 @@ export function defineDB(userConfig: DBConfigInput) {
 	return userConfig;
 }
 
-export { sql, NOW, TRUE, FALSE } from './index.js';
+export { NOW, TRUE, FALSE } from './index.js';
+
+export {
+	sql,
+	eq,
+	gt,
+	gte,
+	lt,
+	lte,
+	ne,
+	isNull,
+	isNotNull,
+	inArray,
+	notInArray,
+	exists,
+	notExists,
+	between,
+	notBetween,
+	like,
+	notIlike,
+	not,
+	asc,
+	desc,
+	and,
+	or,
+} from 'drizzle-orm';