@fougere/adapter-duckdb 0.19.0-alpha.0 → 0.20.0-alpha.0

package/dist/index.d.ts

@@ -1,25 +1,14 @@
 import { type Entity } from '@fougere/schema';
-/** The engines DuckDB can attach — and the reason the list is short. */
-export type Attachable = 'sqlite' | 'postgres' | 'mysql';
-export interface SourceDeclaration {
-    /** A file, for sqlite. */
+/** An entry of `sources:` as this reader sees it — what its own adapter declared, nothing added. */
+export interface SourceEntry {
+    type?: string;
     path?: string;
-    /** A connection string, for an engine reached over the network. */
-    attach?: string;
-    /** Defaults to sqlite, the engine `db:` resolves from a name. */
-    type?: Attachable;
-    /** Registration names of the entities whose rows live here. */
-    entities: string[];
+    url?: string;
+    entities?: string[];
 }
 export interface ConnectOptions {
-    /** The default source — where an entity no declaration names lives. */
-    db: {
-        path?: string;
-        attach?: string;
-        type?: Attachable;
-    };
-    /** The other places, exactly as `fougere.config.ts` states them. */
-    sources?: Record<string, SourceDeclaration>;
+    /** The app's sources, exactly as `fougere.config.ts` states them. */
+    sources: Record<string, SourceEntry>;
     /** What this scope may read — and therefore what gets attached at all. */
     reads: readonly Entity[];
     /** Same resolver the storage uses, when an app renames tables. */

package/dist/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAI3E,wEAAwE;AACxE,MAAM,MAAM,UAAU,GAAG,QAAQ,GAAG,UAAU,GAAG,OAAO,CAAC;AAEzD,MAAM,WAAW,iBAAiB;IAChC,0BAA0B;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,mEAAmE;IACnE,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,iEAAiE;IACjE,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,+DAA+D;IAC/D,QAAQ,EAAE,MAAM,EAAE,CAAC;CACpB;AAED,MAAM,WAAW,cAAc;IAC7B,uEAAuE;IACvE,EAAE,EAAE;QAAE,IAAI,CAAC,EAAE,MAAM,CAAC;QAAC,MAAM,CAAC,EAAE,MAAM,CAAC;QAAC,IAAI,CAAC,EAAE,UAAU,CAAA;KAAE,CAAC;IAC1D,oEAAoE;IACpE,OAAO,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,iBAAiB,CAAC,CAAC;IAC5C,0EAA0E;IAC1E,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,kEAAkE;IAClE,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACtC;AAED,2EAA2E;AAC3E,MAAM,WAAW,KAAK;IACpB,6DAA6D;IAC7D,IAAI,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,oBAAoB,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAChH,uEAAuE;IACvE,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AA+BD,kDAAkD;AAClD,wBAAsB,cAAc,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,CA4D5E"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,OAAO,EAAc,KAAK,MAAM,EAAmB,MAAM,iBAAiB,CAAC;AAI3E,oGAAoG;AACpG,MAAM,WAAW,WAAW;IAC1B,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,MAAM,WAAW,cAAc;IAC7B,qEAAqE;IACrE,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,CAAC;IACrC,0EAA0E;IAC1E,KAAK,EAAE,SAAS,MAAM,EAAE,CAAC;IACzB,kEAAkE;IAClE,SAAS,CAAC,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAC;CACtC;AAED,2EAA2E;AAC3E,MAAM,WAAW,KAAK;IACpB,6DAA6D;IAC7D,IAAI,CAAC,CAAC,SAAS,MAAM,EAAE,KAAK,EAAE,CAAC,GAAG,CAAC,GAAG,EAAE,oBAAoB,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;IAChH,uEAAuE;IACvE,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,MAAM,CAAC,CAAC;IACtC,KAAK,IAAI,OAAO,CAAC,IAAI,CAAC,CAAC;CACxB;AAeD,kDAAkD;AAClD,wBAAsB,cAAc,CAAC,OAAO,EAAE,cAAc,GAAG,OAAO,CAAC,KAAK,CAAC,CAkE5E"}

package/dist/index.js

@@ -2,34 +2,27 @@
 import { DuckDBInstance } from '@duckdb/node-api';
 import { lowerFirst } from '@fougere/schema';
 import { toTable, toTableName, toSnakeCase, codecsOf } from '@fougere/adapter-sql';
-const EXTENSION = {
-    sqlite: 'sqlite',
-    postgres: 'postgres',
-    mysql: 'mysql',
+/**
+ * What DuckDB attaches, read off the entry's own type — the extension it loads and the key that
+ * says where. MSSQL, files and memory have no extension, which is why the list is short.
+ */
+const ATTACHABLE = {
+    sqlite: { extension: 'sqlite', target: (entry) => entry.path },
+    pg: { extension: 'postgres', target: (entry) => entry.url },
+    mysql: { extension: 'mysql', target: (entry) => entry.url },
 };
-const TYPE_CLAUSE = {
-    sqlite: 'sqlite',
-    postgres: 'postgres',
-    mysql: 'mysql',
-};
-/** The default source's alias — the same word `fougere.config.ts` uses for it. */
-const DEFAULT_ALIAS = 'db';
-/** 'Book' and 'book' name the same rows — the spelling `sources:` accepts either way. */
-function targetOf(declaration, alias) {
-    const target = declaration.attach ?? declaration.path;
-    if (!target) {
-        throw new Error(`source '${alias}': neither \`path\` nor \`attach\` — DuckDB is told what to open, ` +
-            `and an in-memory database of its own would hold none of your rows.`);
-    }
-    return target;
-}
+/** DuckDB reserves `main`, `temp` and `system`, and a source may be called any of them. */
+const attachedAs = (source) => `source_${source}`;
 /** Open a read-only view of the app's sources. */
 export async function connectSources(options) {
     const resolve = options.tableName ?? toTableName;
-    // Where each named entity lives; anything unnamed is in the default source.
+    // Where each named entity lives; anything unnamed is in the one source listing none.
     const home = new Map();
-    for (const [alias, declaration] of Object.entries(options.sources ?? {})) {
-        for (const entity of declaration.entities)
+    let fallback;
+    for (const [alias, entry] of Object.entries(options.sources)) {
+        if (entry.entities === undefined)
+            fallback = alias;
+        for (const entity of entry.entities ?? [])
             home.set(lowerFirst(entity), alias);
     }
     // Only what this scope reads is attached — the declaration IS the environment.
@@ -37,7 +30,9 @@ export async function connectSources(options) {
     const placed = new Map();
     for (const shape of options.reads) {
         const name = lowerFirst(shape.name ?? '');
-        const alias = home.get(name) ?? DEFAULT_ALIAS;
+        const alias = home.get(name) ?? fallback;
+        if (!alias)
+            throw new Error(`${name} lives in no declared source — no source lists it, and none holds the rest.`);
         wanted.add(alias);
         placed.set(shape, { alias, table: resolve(name) });
     }
@@ -45,20 +40,23 @@ export async function connectSources(options) {
     const db = await instance.connect();
     const attached = new Map();
     for (const alias of wanted) {
-        const declaration = alias === DEFAULT_ALIAS
-            ? { ...options.db, entities: [] }
-            : options.sources?.[alias];
-        if (!declaration)
+        const entry = options.sources[alias];
+        if (!entry)
             throw new Error(`source '${alias}' is read but never declared.`);
-        const type = declaration.type ?? 'sqlite';
-        if (!(type in EXTENSION)) {
-            throw new Error(`source '${alias}' is a ${type} database, which DuckDB cannot attach — there is no ` +
+        const type = entry.type ?? 'sqlite';
+        const attachable = ATTACHABLE[type];
+        if (!attachable) {
+            throw new Error(`source '${alias}' is a ${type} source, which DuckDB cannot attach — there is no ` +
                 `such extension. Read it by key through its own storage, or mirror it into one of ` +
-                `${Object.keys(EXTENSION).join(', ')}.`);
+                `${Object.keys(ATTACHABLE).join(', ')}.`);
+        }
+        const target = attachable.target(entry);
+        if (!target) {
+            throw new Error(`source '${alias}': nothing says where it is — DuckDB is told what to open.`);
         }
-        await db.run(`INSTALL ${EXTENSION[type]}; LOAD ${EXTENSION[type]};`);
-        await db.run(`ATTACH '${targetOf(declaration, alias)}' AS ${quote(alias)} (TYPE ${TYPE_CLAUSE[type]}, READ_ONLY);`);
-        attached.set(alias, targetOf(declaration, alias));
+        await db.run(`INSTALL ${attachable.extension}; LOAD ${attachable.extension};`);
+        await db.run(`ATTACH '${target}' AS ${quote(attachedAs(alias))} (TYPE ${attachable.extension}, READ_ONLY);`);
+        attached.set(alias, target);
     }
     return {
         attached,
@@ -82,7 +80,7 @@ export async function connectSources(options) {
 function qualify(ref, placed) {
     const found = placed.get(ref);
     if (found)
-        return `${quote(found.alias)}.${quote(found.table)}`;
+        return `${quote(attachedAs(found.alias))}.${quote(found.table)}`;
     const name = ref?.name;
     if (name) {
         throw new Error(`${name} is named in a query but not in \`reads\` — its source is not attached, so its ` +

package/dist/index.js.map

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@fougere/adapter-duckdb",
-  "version": "0.19.0-alpha.0",
+  "version": "0.20.0-alpha.0",
   "description": "Read across an app's sources — one SQL query over what DuckDB can attach.",
   "keywords": [
     "fougere",
@@ -29,8 +29,8 @@
     "src"
   ],
   "dependencies": {
-    "@fougere/schema": "0.19.0-alpha.0",
-    "@fougere/adapter-sql": "0.19.0-alpha.0"
+    "@fougere/schema": "0.20.0-alpha.0",
+    "@fougere/adapter-sql": "0.20.0-alpha.0"
   },
   "peerDependencies": {
     "@duckdb/node-api": ">=1.4.0-0"

package/src/index.ts

@@ -4,25 +4,17 @@ import { lowerFirst, type Entity, type SchemaView } from '@fougere/schema';
 import { toTable, toTableName, toSnakeCase, codecsOf } from '@fougere/adapter-sql';
 
 
-/** The engines DuckDB can attach — and the reason the list is short. */
-export type Attachable = 'sqlite' | 'postgres' | 'mysql';
-
-export interface SourceDeclaration {
-  /** A file, for sqlite. */
+/** An entry of `sources:` as this reader sees it — what its own adapter declared, nothing added. */
+export interface SourceEntry {
+  type?: string;
   path?: string;
-  /** A connection string, for an engine reached over the network. */
-  attach?: string;
-  /** Defaults to sqlite, the engine `db:` resolves from a name. */
-  type?: Attachable;
-  /** Registration names of the entities whose rows live here. */
-  entities: string[];
+  url?: string;
+  entities?: string[];
 }
 
 export interface ConnectOptions {
-  /** The default source — where an entity no declaration names lives. */
-  db: { path?: string; attach?: string; type?: Attachable };
-  /** The other places, exactly as `fougere.config.ts` states them. */
-  sources?: Record<string, SourceDeclaration>;
+  /** The app's sources, exactly as `fougere.config.ts` states them. */
+  sources: Record<string, SourceEntry>;
   /** What this scope may read — and therefore what gets attached at all. */
   reads: readonly Entity[];
   /** Same resolver the storage uses, when an app renames tables. */
@@ -38,43 +30,29 @@ export interface Reads {
   close(): Promise<void>;
 }
 
-const EXTENSION: Record<Attachable, string> = {
-  sqlite: 'sqlite',
-  postgres: 'postgres',
-  mysql: 'mysql',
-};
-
-const TYPE_CLAUSE: Record<Attachable, string> = {
-  sqlite: 'sqlite',
-  postgres: 'postgres',
-  mysql: 'mysql',
+/**
+ * What DuckDB attaches, read off the entry's own type — the extension it loads and the key that
+ * says where. MSSQL, files and memory have no extension, which is why the list is short.
+ */
+const ATTACHABLE: Record<string, { extension: string; target: (entry: SourceEntry) => string | undefined }> = {
+  sqlite: { extension: 'sqlite', target: (entry) => entry.path },
+  pg: { extension: 'postgres', target: (entry) => entry.url },
+  mysql: { extension: 'mysql', target: (entry) => entry.url },
 };
 
-/** The default source's alias — the same word `fougere.config.ts` uses for it. */
-const DEFAULT_ALIAS = 'db';
-
-/** 'Book' and 'book' name the same rows — the spelling `sources:` accepts either way. */
-
-function targetOf(declaration: { path?: string; attach?: string }, alias: string): string {
-  const target = declaration.attach ?? declaration.path;
-  if (!target) {
-    throw new Error(
-      `source '${alias}': neither \`path\` nor \`attach\` — DuckDB is told what to open, ` +
-      `and an in-memory database of its own would hold none of your rows.`,
-    );
-  }
-
-  return target;
-}
+/** DuckDB reserves `main`, `temp` and `system`, and a source may be called any of them. */
+const attachedAs = (source: string): string => `source_${source}`;
 
 /** Open a read-only view of the app's sources. */
 export async function connectSources(options: ConnectOptions): Promise<Reads> {
   const resolve = options.tableName ?? toTableName;
 
-  // Where each named entity lives; anything unnamed is in the default source.
+  // Where each named entity lives; anything unnamed is in the one source listing none.
   const home = new Map<string, string>();
-  for (const [alias, declaration] of Object.entries(options.sources ?? {})) {
-    for (const entity of declaration.entities) home.set(lowerFirst(entity), alias);
+  let fallback: string | undefined;
+  for (const [alias, entry] of Object.entries(options.sources)) {
+    if (entry.entities === undefined) fallback = alias;
+    for (const entity of entry.entities ?? []) home.set(lowerFirst(entity), alias);
   }
 
   // Only what this scope reads is attached — the declaration IS the environment.
@@ -82,7 +60,8 @@ export async function connectSources(options: ConnectOptions): Promise<Reads> {
   const placed = new Map<Entity, { alias: string; table: string }>();
   for (const shape of options.reads) {
     const name = lowerFirst((shape as { name?: string }).name ?? '');
-    const alias = home.get(name) ?? DEFAULT_ALIAS;
+    const alias = home.get(name) ?? fallback;
+    if (!alias) throw new Error(`${name} lives in no declared source — no source lists it, and none holds the rest.`);
     wanted.add(alias);
     placed.set(shape, { alias, table: resolve(name) });
   }
@@ -92,22 +71,25 @@ export async function connectSources(options: ConnectOptions): Promise<Reads> {
   const attached = new Map<string, string>();
 
   for (const alias of wanted) {
-    const declaration = alias === DEFAULT_ALIAS
-      ? { ...options.db, entities: [] }
-      : options.sources?.[alias];
-    if (!declaration) throw new Error(`source '${alias}' is read but never declared.`);
+    const entry = options.sources[alias];
+    if (!entry) throw new Error(`source '${alias}' is read but never declared.`);
 
-    const type = declaration.type ?? 'sqlite';
-    if (!(type in EXTENSION)) {
+    const type = entry.type ?? 'sqlite';
+    const attachable = ATTACHABLE[type];
+    if (!attachable) {
       throw new Error(
-        `source '${alias}' is a ${type} database, which DuckDB cannot attach — there is no ` +
+        `source '${alias}' is a ${type} source, which DuckDB cannot attach — there is no ` +
         `such extension. Read it by key through its own storage, or mirror it into one of ` +
-        `${Object.keys(EXTENSION).join(', ')}.`,
+        `${Object.keys(ATTACHABLE).join(', ')}.`,
       );
     }
-    await db.run(`INSTALL ${EXTENSION[type]}; LOAD ${EXTENSION[type]};`);
-    await db.run(`ATTACH '${targetOf(declaration, alias)}' AS ${quote(alias)} (TYPE ${TYPE_CLAUSE[type]}, READ_ONLY);`);
-    attached.set(alias, targetOf(declaration, alias));
+    const target = attachable.target(entry);
+    if (!target) {
+      throw new Error(`source '${alias}': nothing says where it is — DuckDB is told what to open.`);
+    }
+    await db.run(`INSTALL ${attachable.extension}; LOAD ${attachable.extension};`);
+    await db.run(`ATTACH '${target}' AS ${quote(attachedAs(alias))} (TYPE ${attachable.extension}, READ_ONLY);`);
+    attached.set(alias, target);
   }
 
   return {
@@ -133,7 +115,7 @@ export async function connectSources(options: ConnectOptions): Promise<Reads> {
 /** `${Book}` becomes `archive.books` — the alias AND the table, from one declaration. */
 function qualify(ref: unknown, placed: Map<Entity, { alias: string; table: string }>): string {
   const found = placed.get(ref as Entity);
-  if (found) return `${quote(found.alias)}.${quote(found.table)}`;
+  if (found) return `${quote(attachedAs(found.alias))}.${quote(found.table)}`;
   const name = (ref as { name?: string } | undefined)?.name;
   if (name) {
     throw new Error(