@fougere/defaults 0.5.0-alpha.1 → 0.6.0-alpha.0

package/dist/storage.d.ts

@@ -9,14 +9,17 @@
  * why an engine change looked like it touched seven files.
  */
 import type { App } from '@fougere/core';
-import { type DialectName, type Setup } from '@fougere/adapter-sql';
+import { type Source } from '@fougere/core';
+import '@fougere/adapter-sql/sqlite';
 /** The `db` field of fougere.config.ts, read structurally. */
 export type DbConfig = false | 'sqlite' | {
+    source?: string;
     dialect?: string;
     path?: string;
 } | undefined;
 /** A named source and the entities it holds — the `sources` field, read structurally. */
 export type SourcesConfig = Record<string, {
+    source?: string;
     dialect?: string;
     path?: string;
     entities: string[];
@@ -24,7 +27,7 @@ export type SourcesConfig = Record<string, {
 export interface ResolvedStorage {
     /** Opaque handle handed to auth providers. */
     db?: unknown;
-    ormFactory: ((entity: any, name: string) => any) | undefined;
+    storageFactory: ((entity: any, name: string) => any) | undefined;
     /**
      * The source an entity's rows live in — what decides whether a frame gets a real
      * transaction or an unwind it replays itself.
@@ -42,8 +45,8 @@ export interface ResolvedStorage {
     dbOf?: (source: string) => unknown;
     /** Every source that has an engine, the default one first. */
     sources?: () => string[];
-    /** Run `fn` inside one transaction of that source, with an ORM factory bound to it. */
-    transacted?: <R>(source: string, fn: (ormFactory: (entity: any, name: string) => any) => Promise<R>) => Promise<R>;
+    /** Run `fn` inside one transaction of that source, with a storage factory bound to it. */
+    transacted?: <R>(source: string, fn: (storageFactory: (entity: any, name: string) => any) => Promise<R>) => Promise<R>;
     /**
      * Brings the schema up to date once the app is scanned — the storage's `up`, handed to
      * `migrating()`. It was called `afterBoot`, a word that also meant the host's own
@@ -59,11 +62,6 @@ export interface ResolvedStorage {
      * ordinary rather than rare.
      */
     close?: () => Promise<void>;
-    /** Raw synchronous handle, when the engine exposes one. */
-    raw?: {
-        exec(sql: string): void;
-    };
-    dialect?: DialectName;
 }
 /** Does this config ask for persistence at all? */
 export declare function declaresStorage(dbConf: DbConfig): boolean;
@@ -76,14 +74,14 @@ export declare function declaresStorage(dbConf: DbConfig): boolean;
  * exactly as before.
  */
 export declare function resolveStorage(dbConf: DbConfig, sources?: SourcesConfig): ResolvedStorage;
-/** One source: the engine that holds it, and the entities that live there. */
+/** One source: what realizes it, and the entities that live there. */
 export interface Placement {
-    setup: Setup;
+    source: Source;
     entities: string[];
 }
 export interface DeclaredStorage {
     /** The default source — where an entity no placement names lands. */
-    db: Setup;
+    db: Source;
     /** The other places. Absent means one source, the way it always was. */
     sources?: Record<string, Placement>;
 }

package/dist/storage.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAW,KAAK,WAAW,EAAE,KAAK,KAAK,EAAE,MAAM,sBAAsB,CAAC;AAG7E,8DAA8D;AAC9D,MAAM,MAAM,QAAQ,GAChB,KAAK,GACL,QAAQ,GACR;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GACnC,SAAS,CAAC;AAEd,yFAAyF;AACzF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAAS,CAAC;AAEhH,MAAM,WAAW,eAAe;IAC9B,8CAA8C;IAC9C,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,UAAU,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC;IAC7D;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,CAAC;IAC1C;;;OAGG;IACH,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IACnC,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IACzB,uFAAuF;IACvF,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,UAAU,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACnH;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC7C;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;IAC5B,2DAA2D;IAC3D,GAAG,CAAC,EAAE;QAAE,IAAI,CAAC,GAAG,EAAE,MAAM,GAAG,IAAI,CAAA;KAAE,CAAC;IAClC,OAAO,CAAC,EAAE,WAAW,CAAC;CACvB;AAED,mDAAmD;AACnD,wBAAgB,eAAe,CAAC,MAAM,EAAE,QAAQ,GAAG,OAAO,CAGzD;AAqDD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,eAAe,CAazF;AAED,8EAA8E;AAC9E,MAAM,WAAW,SAAS;IACxB,KAAK,EAAE,KAAK,CAAC;IACb,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,qEAAqE;IACrE,EAAE,EAAE,KAAK,CAAC;IACV,wEAAwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACrC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,eAAe,GAAG,eAAe,CA6DtE"}
+{"version":3,"file":"storage.d.ts","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"AAAA;;;;;;;;;GASG;AACH,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,eAAe,CAAC;AAGzC,OAAO,EAAW,KAAK,MAAM,EAAmB,MAAM,eAAe,CAAC;AAEtE,OAAO,6BAA6B,CAAC;AAErC,8DAA8D;AAC9D,MAAM,MAAM,QAAQ,GAChB,KAAK,GACL,QAAQ,GACR;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAA;CAAE,GACpD,SAAS,CAAC;AAEd,yFAAyF;AACzF,MAAM,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,EAAE;IAAE,MAAM,CAAC,EAAE,MAAM,CAAC;IAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAAC,IAAI,CAAC,EAAE,MAAM,CAAC;IAAC,QAAQ,EAAE,MAAM,EAAE,CAAA;CAAE,CAAC,GAAG,SAAS,CAAC;AAEjI,MAAM,WAAW,eAAe;IAC9B,8CAA8C;IAC9C,EAAE,CAAC,EAAE,OAAO,CAAC;IACb,cAAc,EAAE,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,GAAG,CAAC,GAAG,SAAS,CAAC;IACjE;;;;;;;;OAQG;IACH,QAAQ,CAAC,EAAE,CAAC,UAAU,EAAE,MAAM,KAAK,MAAM,CAAC;IAC1C;;;OAGG;IACH,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC;IACnC,8DAA8D;IAC9D,OAAO,CAAC,EAAE,MAAM,MAAM,EAAE,CAAC;IACzB,0FAA0F;IAC1F,UAAU,CAAC,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,cAAc,EAAE,CAAC,MAAM,EAAE,GAAG,EAAE,IAAI,EAAE,MAAM,KAAK,GAAG,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,OAAO,CAAC,CAAC,CAAC,CAAC;IACvH;;;;OAIG;IACH,OAAO,CAAC,EAAE,CAAC,GAAG,EAAE,GAAG,KAAK,OAAO,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;IAC7C;;;;;;;OAOG;IACH,KAAK,CAAC,EAAE,MAAM,OAAO,CAAC,IAAI,CAAC,CAAC;CAE7B;AAED,mDAAmD;AACnD,wBAAgB,eAAe,CAAC,MAAM,EAAE,QAAQ,GAAG,OAAO,CAGzD;AAoCD;;;;;;;GAOG;AACH,wBAAgB,cAAc,CAAC,MAAM,EAAE,QAAQ,EAAE,OAAO,CAAC,EAAE,aAAa,GAAG,eAAe,CAWzF;AAyBD,sEAAsE;AACtE,MAAM,WAAW,SAAS;IACxB,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,eAAe;IAC9B,qEAAqE;IACrE,EAAE,EAAE,MAAM,CAAC;IACX,wEAAwE;IACxE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,CAAC;CACrC;AAED;;;;;;;;;;;;;;;;;;;;GAoBG;AACH,wBAAgB,WAAW,CAAC,QAAQ,EAAE,eAAe,GAAG,eAAe,CA+DtE"}

package/dist/storage.js

@@ -1,29 +1,14 @@
 import { Fronds } from '@fougere/core';
 import { lowerFirst } from '@fougere/core/contract';
-import { migrate } from '@fougere/adapter-sql';
-import { setupSqlite } from '@fougere/adapter-sql/sqlite';
+import { Sources } from '@fougere/core';
+// Imported for its side effect: it is what makes `source: 'sql'` an answered name.
+import '@fougere/adapter-sql/sqlite';
 /** Does this config ask for persistence at all? */
 export function declaresStorage(dbConf) {
     if (dbConf === false || dbConf === undefined)
         return false;
     return true;
 }
-/**
- * Only sqlite is resolvable from a NAME — its driver is a dependency here. Any other
- * engine needs a Kysely dialect INSTANCE, which only the host can build because only
- * the host has its driver. So the name is refused, and the way in is named.
- *
- * `dialect` used to be declared and never read: `db: { dialect: 'postgres' }` started
- * SQLite and said nothing — a config whose central word was ignored.
- */
-function refuseUnresolvable(declared, field) {
-    if (declared === undefined || declared === 'sqlite')
-        return;
-    throw new Error(`${field} '${declared}' cannot be resolved from its name — only 'sqlite' can, ` +
-        `because it is the one driver this package depends on. For ${declared}, build the ` +
-        `Kysely dialect yourself and call setupKysely(dialect, '${declared}') ` +
-        `from @fougere/adapter-sql.`);
-}
 /**
  * The app as ONE source sees it: the entities that live there, and the names of those
  * that do not.
@@ -36,7 +21,7 @@ function refuseUnresolvable(declared, field) {
  * Auth entities ride with the default source: a provider's tables are the app's own,
  * and nothing yet lets one declare where it lives.
  */
-function partition(app, holds, withAuth) {
+function viewOf(app, holds, withAuth) {
     const typed = app;
     const fronds = typed.fronds
         .map((frond) => ({ ...frond, entities: frond.entities.filter((entry) => holds(entry.name)) }))
@@ -46,7 +31,7 @@ function partition(app, holds, withAuth) {
         auth: withAuth ? typed.auth : undefined,
         // Lifted, because this function reads its app structurally on purpose — a caller
         // may hand it a shape that is app-LIKE, and the question is still the same one.
-        elsewhere: Fronds.scanned(typed.fronds).entityNames().filter((name) => !holds(name)),
+        elsewhere: Fronds.hosting(typed.fronds).entityNames().filter((name) => !holds(name)),
     };
 }
 /**
@@ -59,18 +44,34 @@ function partition(app, holds, withAuth) {
  */
 export function resolveStorage(dbConf, sources) {
     if (!declaresStorage(dbConf))
-        return { ormFactory: undefined };
-    refuseUnresolvable(typeof dbConf === 'object' ? dbConf.dialect : (dbConf || undefined), 'db.dialect');
+        return { storageFactory: undefined };
     const named = {};
     for (const [name, conf] of Object.entries(sources ?? {})) {
-        refuseUnresolvable(conf.dialect, `sources.${name}.dialect`);
-        named[name] = { setup: setupSqlite({ path: conf.path }), entities: conf.entities };
+        named[name] = { source: built(conf, `sources.${name}`), entities: conf.entities };
     }
     return storageFrom({
-        db: setupSqlite({ path: typeof dbConf === 'object' ? dbConf.path : undefined }),
+        db: built(typeof dbConf === 'object' ? dbConf : {}, 'db'),
         sources: named,
     });
 }
+/**
+ * One config entry, resolved to the adapter it names.
+ *
+ * `source:` defaults to `'sql'` — the convention a first run meets, and the reason a config
+ * saying only `db: 'sqlite'` keeps working. What the entry says BELOW that key belongs to the
+ * adapter it named, which is also the only one that can refuse it: this function knows no
+ * dialect and no driver.
+ */
+function built(conf, field) {
+    const name = conf.source ?? DEFAULT_ADAPTER;
+    if (!Sources.answers(name)) {
+        throw new Error(`${field}.source '${name}' is not answered — import the adapter that does. `
+            + `This process answers ${Sources.answered().join(', ') || 'nothing yet'}.`);
+    }
+    return Sources.resolve(name, conf);
+}
+/** What a config naming no adapter means. */
+const DEFAULT_ADAPTER = 'sql';
 /**
  * The same routing `resolveStorage` performs, over engines the CALLER built.
  *
@@ -100,7 +101,7 @@ export function storageFrom(declared) {
     const home = new Map();
     const engines = new Map();
     for (const [name, placement] of Object.entries(sources ?? {})) {
-        engines.set(name, placement.setup);
+        engines.set(name, placement.source);
         for (const entity of placement.entities) {
             const key = lowerFirst(entity);
             const claimed = home.get(key);
@@ -120,34 +121,37 @@ export function storageFrom(declared) {
         return (source && engines.get(source)) || base;
     };
     return {
+        // Opaque, and narrowed by whoever needs it — auth wants a handle, the CLI wants Kysely.
         db: base.db,
-        ormFactory: (entity, name) => engineFor(name).ormFactory(entity, name),
+        storageFactory: (entity, name) => engineFor(name).storageFactory(entity, name),
         sourceOf,
         dbOf: (source) => engineOf(source)?.db,
         sources: () => [DEFAULT, ...engines.keys()],
-        transacted: (source, fn) => {
+        // A source that hands out no transaction leaves the key absent, and a frame reads the
+        // absence: `boot/together.ts` compensates instead, and says which of the two it built.
+        transacted: base.transacted ? async (source, fn) => {
             const engine = engineOf(source);
             if (!engine)
                 throw new Error(`No source named '${source}' — declared sources are ${[DEFAULT, ...engines.keys()].join(', ')}.`);
+            if (!engine.transacted)
+                throw new Error(`Source '${source}' hands out no transaction.`);
             return engine.transacted(fn);
-        },
-        raw: base.sqlite,
-        dialect: base.dialect,
-        // Additive migration: creates missing tables AND adds columns an entity gained.
-        // One pass per source, each seeing only its own tables — which is what makes a
-        // cross-source `ref()` a miss rather than a constraint against a stranger.
+        } : undefined,
+        // One pass per source, each seeing only its own entities and the NAMES of the others —
+        // which is what makes a cross-source `ref()` a miss rather than a constraint against a
+        // stranger. What a pass DOES is the source's own: it knows its engine, this does not.
         migrate: async (app) => {
-            await migrate(partition(app, (name) => !home.has(lowerFirst(name)), true), base.db);
+            await base.migrate?.(viewOf(app, (name) => !home.has(lowerFirst(name)), true));
             for (const [name, engine] of engines) {
-                await migrate(partition(app, (e) => home.get(lowerFirst(e)) === name, false), engine.db);
+                await engine.migrate?.(viewOf(app, (e) => home.get(lowerFirst(e)) === name, false));
             }
         },
-        // Every engine, the default one last: a named source may hold what the default
-        // refers to, and closing in reverse of opening is the rule everywhere else.
+        // Every source, the default one last: a named source may hold what the default refers
+        // to, and closing in reverse of opening is the rule everywhere else.
         close: async () => {
             for (const engine of [...engines.values()].reverse())
-                await engine.db.destroy();
-            await base.db.destroy();
+                await engine.close?.();
+            await base.close?.();
         },
     };
 }

package/dist/storage.js.map

@@ -1 +1 @@
-{"version":3,"file":"storage.js","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"storage.js","sourceRoot":"","sources":["../src/storage.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fougere/defaults",
-  "version": "0.5.0-alpha.1",
+  "version": "0.6.0-alpha.0",
   "description": "The conventional boot of a Fougere app — the one place storage is wired.",
   "keywords": [
     "fougere",
@@ -29,10 +29,10 @@
     "src"
   ],
   "dependencies": {
-    "@fougere/core": "0.5.0-alpha.1",
-    "@fougere/adapter-sql": "0.5.0-alpha.1",
-    "@fougere/container": "0.5.0-alpha.1",
-    "@fougere/transport-http": "0.5.0-alpha.1"
+    "@fougere/core": "0.6.0-alpha.0",
+    "@fougere/container": "0.6.0-alpha.0",
+    "@fougere/adapter-sql": "0.6.0-alpha.0",
+    "@fougere/transport-http": "0.6.0-alpha.0"
   },
   "publishConfig": {
     "access": "public"
@@ -41,7 +41,7 @@
     "kysely": "^0.28.17",
     "better-sqlite3": "^13.0.3",
     "@types/better-sqlite3": "^7.6.13",
-    "@fougere/schema": "0.5.0-alpha.1"
+    "@fougere/schema": "0.6.0-alpha.0"
   },
   "scripts": {
     "build": "rm -rf dist && tsc",

package/src/storage.ts

@@ -11,23 +11,24 @@
 import type { App } from '@fougere/core';
 import { Fronds, type FrondDescriptor } from '@fougere/core';
 import { lowerFirst } from '@fougere/core/contract';
-import { migrate, type DialectName, type Setup } from '@fougere/adapter-sql';
-import { setupSqlite } from '@fougere/adapter-sql/sqlite';
+import { Sources, type Source, type SourceView } from '@fougere/core';
+// Imported for its side effect: it is what makes `source: 'sql'` an answered name.
+import '@fougere/adapter-sql/sqlite';
 
 /** The `db` field of fougere.config.ts, read structurally. */
 export type DbConfig =
   | false
   | 'sqlite'
-  | { dialect?: string; path?: string }
+  | { source?: string; dialect?: string; path?: string }
   | undefined;
 
 /** A named source and the entities it holds — the `sources` field, read structurally. */
-export type SourcesConfig = Record<string, { dialect?: string; path?: string; entities: string[] }> | undefined;
+export type SourcesConfig = Record<string, { source?: string; dialect?: string; path?: string; entities: string[] }> | undefined;
 
 export interface ResolvedStorage {
   /** Opaque handle handed to auth providers. */
   db?: unknown;
-  ormFactory: ((entity: any, name: string) => any) | undefined;
+  storageFactory: ((entity: any, name: string) => any) | undefined;
   /**
    * The source an entity's rows live in — what decides whether a frame gets a real
    * transaction or an unwind it replays itself.
@@ -45,8 +46,8 @@ export interface ResolvedStorage {
   dbOf?: (source: string) => unknown;
   /** Every source that has an engine, the default one first. */
   sources?: () => string[];
-  /** Run `fn` inside one transaction of that source, with an ORM factory bound to it. */
-  transacted?: <R>(source: string, fn: (ormFactory: (entity: any, name: string) => any) => Promise<R>) => Promise<R>;
+  /** Run `fn` inside one transaction of that source, with a storage factory bound to it. */
+  transacted?: <R>(source: string, fn: (storageFactory: (entity: any, name: string) => any) => Promise<R>) => Promise<R>;
   /**
    * Brings the schema up to date once the app is scanned — the storage's `up`, handed to
    * `migrating()`. It was called `afterBoot`, a word that also meant the host's own
@@ -63,8 +64,6 @@ export interface ResolvedStorage {
    */
   close?: () => Promise<void>;
   /** Raw synchronous handle, when the engine exposes one. */
-  raw?: { exec(sql: string): void };
-  dialect?: DialectName;
 }
 
 /** Does this config ask for persistence at all? */
@@ -73,23 +72,6 @@ export function declaresStorage(dbConf: DbConfig): boolean {
   return true;
 }
 
-/**
- * Only sqlite is resolvable from a NAME — its driver is a dependency here. Any other
- * engine needs a Kysely dialect INSTANCE, which only the host can build because only
- * the host has its driver. So the name is refused, and the way in is named.
- *
- * `dialect` used to be declared and never read: `db: { dialect: 'postgres' }` started
- * SQLite and said nothing — a config whose central word was ignored.
- */
-function refuseUnresolvable(declared: string | undefined, field: string): void {
-  if (declared === undefined || declared === 'sqlite') return;
-  throw new Error(
-    `${field} '${declared}' cannot be resolved from its name — only 'sqlite' can, ` +
-    `because it is the one driver this package depends on. For ${declared}, build the ` +
-    `Kysely dialect yourself and call setupKysely(dialect, '${declared}') ` +
-    `from @fougere/adapter-sql.`,
-  );
-}
 
 /**
  * The app as ONE source sees it: the entities that live there, and the names of those
@@ -103,11 +85,11 @@ function refuseUnresolvable(declared: string | undefined, field: string): void {
  * Auth entities ride with the default source: a provider's tables are the app's own,
  * and nothing yet lets one declare where it lives.
  */
-function partition(
+function viewOf(
   app: App,
   holds: (name: string) => boolean,
   withAuth: boolean,
-): unknown {
+): SourceView {
   const typed = app as unknown as {
     fronds: { name: string; entities: { name: string }[] }[];
     auth?: unknown;
@@ -120,7 +102,7 @@ function partition(
     auth: withAuth ? typed.auth : undefined,
     // Lifted, because this function reads its app structurally on purpose — a caller
     // may hand it a shape that is app-LIKE, and the question is still the same one.
-    elsewhere: Fronds.scanned(typed.fronds as FrondDescriptor[]).entityNames().filter((name) => !holds(name)),
+    elsewhere: Fronds.hosting(typed.fronds as FrondDescriptor[]).entityNames().filter((name) => !holds(name)),
   };
 }
 
@@ -133,29 +115,50 @@ function partition(
  * exactly as before.
  */
 export function resolveStorage(dbConf: DbConfig, sources?: SourcesConfig): ResolvedStorage {
-  if (!declaresStorage(dbConf)) return { ormFactory: undefined };
+  if (!declaresStorage(dbConf)) return { storageFactory: undefined };
 
-  refuseUnresolvable(typeof dbConf === 'object' ? dbConf.dialect : (dbConf || undefined), 'db.dialect');
   const named: Record<string, Placement> = {};
   for (const [name, conf] of Object.entries(sources ?? {})) {
-    refuseUnresolvable(conf.dialect, `sources.${name}.dialect`);
-    named[name] = { setup: setupSqlite({ path: conf.path }), entities: conf.entities };
+    named[name] = { source: built(conf, `sources.${name}`), entities: conf.entities };
   }
   return storageFrom({
-    db: setupSqlite({ path: typeof dbConf === 'object' ? dbConf.path : undefined }),
+    db: built(typeof dbConf === 'object' ? dbConf : {}, 'db'),
     sources: named,
   });
 }
 
-/** One source: the engine that holds it, and the entities that live there. */
+/**
+ * One config entry, resolved to the adapter it names.
+ *
+ * `source:` defaults to `'sql'` — the convention a first run meets, and the reason a config
+ * saying only `db: 'sqlite'` keeps working. What the entry says BELOW that key belongs to the
+ * adapter it named, which is also the only one that can refuse it: this function knows no
+ * dialect and no driver.
+ */
+function built(conf: Record<string, unknown>, field: string): Source {
+  const name = (conf.source as string | undefined) ?? DEFAULT_ADAPTER;
+  if (!Sources.answers(name)) {
+    throw new Error(
+      `${field}.source '${name}' is not answered — import the adapter that does. `
+      + `This process answers ${Sources.answered().join(', ') || 'nothing yet'}.`,
+    );
+  }
+
+  return Sources.resolve(name, conf as never);
+}
+
+/** What a config naming no adapter means. */
+const DEFAULT_ADAPTER = 'sql';
+
+/** One source: what realizes it, and the entities that live there. */
 export interface Placement {
-  setup: Setup;
+  source: Source;
   entities: string[];
 }
 
 export interface DeclaredStorage {
   /** The default source — where an entity no placement names lands. */
-  db: Setup;
+  db: Source;
   /** The other places. Absent means one source, the way it always was. */
   sources?: Record<string, Placement>;
 }
@@ -188,9 +191,9 @@ export function storageFrom(declared: DeclaredStorage): ResolvedStorage {
   // both: the rows would be read from one and written to the other, by whichever
   // registration ran last — the same silent duplicate `remotes:` refuses one level up.
   const home = new Map<string, string>();
-  const engines = new Map<string, Setup>();
+  const engines = new Map<string, Source>();
   for (const [name, placement] of Object.entries(sources ?? {})) {
-    engines.set(name, placement.setup);
+    engines.set(name, placement.source);
     for (const entity of placement.entities) {
       const key = lowerFirst(entity);
       const claimed = home.get(key);
@@ -214,32 +217,34 @@ export function storageFrom(declared: DeclaredStorage): ResolvedStorage {
   };
 
   return {
-    db: base.db,
-    ormFactory: (entity: any, name: string) => engineFor(name).ormFactory(entity, name),
+    // Opaque, and narrowed by whoever needs it — auth wants a handle, the CLI wants Kysely.
+    db: (base as { db?: unknown }).db,
+    storageFactory: (entity: any, name: string) => engineFor(name).storageFactory(entity, name),
     sourceOf,
-    dbOf: (source) => engineOf(source)?.db,
+    dbOf: (source) => (engineOf(source) as { db?: unknown } | undefined)?.db,
     sources: () => [DEFAULT, ...engines.keys()],
-    transacted: (source, fn) => {
+    // A source that hands out no transaction leaves the key absent, and a frame reads the
+    // absence: `boot/together.ts` compensates instead, and says which of the two it built.
+    transacted: base.transacted ? async (source, fn) => {
       const engine = engineOf(source);
       if (!engine) throw new Error(`No source named '${source}' — declared sources are ${[DEFAULT, ...engines.keys()].join(', ')}.`);
+      if (!engine.transacted) throw new Error(`Source '${source}' hands out no transaction.`);
       return engine.transacted(fn);
-    },
-    raw: (base as { sqlite?: { exec(sql: string): void } }).sqlite,
-    dialect: base.dialect,
-    // Additive migration: creates missing tables AND adds columns an entity gained.
-    // One pass per source, each seeing only its own tables — which is what makes a
-    // cross-source `ref()` a miss rather than a constraint against a stranger.
+    } : undefined,
+    // One pass per source, each seeing only its own entities and the NAMES of the others —
+    // which is what makes a cross-source `ref()` a miss rather than a constraint against a
+    // stranger. What a pass DOES is the source's own: it knows its engine, this does not.
     migrate: async (app) => {
-      await migrate(partition(app, (name) => !home.has(lowerFirst(name)), true) as never, base.db);
+      await base.migrate?.(viewOf(app, (name) => !home.has(lowerFirst(name)), true));
       for (const [name, engine] of engines) {
-        await migrate(partition(app, (e) => home.get(lowerFirst(e)) === name, false) as never, engine.db);
+        await engine.migrate?.(viewOf(app, (e) => home.get(lowerFirst(e)) === name, false));
       }
     },
-    // Every engine, the default one last: a named source may hold what the default
-    // refers to, and closing in reverse of opening is the rule everywhere else.
+    // Every source, the default one last: a named source may hold what the default refers
+    // to, and closing in reverse of opening is the rule everywhere else.
     close: async () => {
-      for (const engine of [...engines.values()].reverse()) await engine.db.destroy();
-      await base.db.destroy();
+      for (const engine of [...engines.values()].reverse()) await engine.close?.();
+      await base.close?.();
     },
   };
 }