kempo 4.5.5 → 4.5.7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kempo",
-  "version": "4.5.5",
+  "version": "4.5.7",
   "type": "module",
   "description": "A fullstack CMS framework for creating websites with user authentication",
   "scripts": {

package/server/db/index.js

@@ -20,7 +20,15 @@ if(existsSync(appSchemaPath) && realpathSync(appSchemaPath) !== realpathSync(fra
 
 const schema = { ...frameworkSchema, ...appSchema };
 
-let db;
+/*
+  One database per process, whatever URL this module was loaded under. On Windows `c:\x` and `C:\x`
+  are different module URLs, so the same file can be evaluated twice (a test preload and a test file,
+  say), and the second evaluation would otherwise open a second connection, or boot a second in-memory
+  database that the first one's data is not in.
+*/
+const SINGLETON = Symbol.for('kempo.database');
+
+let db = globalThis[SINGLETON];
 
 /*
   KEMPO_DB=pglite swaps the server for an in-process, in-memory Postgres (PGlite) with the schema
@@ -28,12 +36,28 @@ let db;
   (jsonb, partial indexes, ON CONFLICT, triggers), not a mock. Nothing outside tests sets it, and
   PGlite is a dev dependency that is only imported on this branch.
 */
-if(process.env.KEMPO_DB === 'pglite'){
+if(db){
+  // already created by an earlier evaluation of this module
+} else if(process.env.KEMPO_DB === 'pglite'){
   const [{ PGlite }, { drizzle: drizzlePglite }, { generateDrizzleJson, generateMigration }] = await Promise.all([
     import('@electric-sql/pglite'),
     import('drizzle-orm/pglite'),
     import('drizzle-kit/api')
   ]);
+  /*
+    A project's drizzle.config.js lists every schema its database holds (its own, kempo's and any
+    extensions it sits on), because `drizzle-kit push` needs the same list. Use it, so the in-memory
+    database is exactly what a push would have made.
+  */
+  const configPath = join(process.cwd(), 'drizzle.config.js');
+  if(existsSync(configPath)){
+    const { default: config } = await import(pathToFileURL(configPath).href);
+    for(const entry of [config?.schema].flat().filter(Boolean)){
+      const file = join(process.cwd(), entry);
+      if(existsSync(file)) Object.assign(schema, await import(pathToFileURL(realpathSync(file)).href));
+    }
+  }
+
   const client = new PGlite();
   db = drizzlePglite(client, { schema });
 
@@ -57,4 +81,6 @@ if(process.env.KEMPO_DB === 'pglite'){
   db = drizzle(postgres(process.env.DATABASE_URL), { schema });
 }
 
+globalThis[SINGLETON] = db;
+
 export default db;