Expose SQLiteDatabaseClient (#232)

* expose SQLiteDatabaseClient

* open(blob)

Author: mbostock

rollup.config.js

@@ -11,7 +11,15 @@ export default [
       node(),
       terser({
         output: {preamble: copyright},
-        mangle: {reserved: ["RequireError"]}
+        mangle: {
+          reserved: [
+            "FileAttachment",
+            "RequireError",
+            "SQLiteDatabaseClient",
+            "ZipArchive",
+            "ZipArchiveEntry"
+          ]
+        }
       })
     ],
     output: {

src/fileAttachment.js

@@ -1,5 +1,5 @@
 import {require as requireDefault} from "d3-require";
-import sqlite, {SQLiteDatabaseClient} from "./sqlite.js";
+import {SQLiteDatabaseClient} from "./sqlite.js";
 import jszip from "./zip.js";
 
 async function remote_fetch(file) {
@@ -53,9 +53,7 @@ class AbstractFile {
     });
   }
   async sqlite() {
-    const [SQL, buffer] = await Promise.all([sqlite(requireDefault), this.arrayBuffer()]);
-    const db = new SQL.Database(new Uint8Array(buffer));
-    return new SQLiteDatabaseClient(db);
+    return SQLiteDatabaseClient.open(remote_fetch(this));
   }
   async zip() {
     const [JSZip, buffer] = await Promise.all([jszip(requireDefault), this.arrayBuffer()]);

src/library.js

@@ -10,7 +10,7 @@ import now from "./now.js";
 import Promises from "./promises/index.js";
 import resolve from "./resolve.js";
 import requirer from "./require.js";
-import SQLite from "./sqlite.js";
+import SQLite, {SQLiteDatabaseClient} from "./sqlite.js";
 import svg from "./svg.js";
 import tex from "./tex.js";
 import vegalite from "./vegalite.js";
@@ -24,6 +24,7 @@ export default Object.assign(function Library(resolver) {
     Mutable: () => Mutable,
     Plot: () => require("@observablehq/[email protected]/dist/plot.umd.min.js"),
     SQLite: () => SQLite(require),
+    SQLiteDatabaseClient: () => SQLiteDatabaseClient,
     _: () => require("[email protected]/lodash.min.js"),
     d3: () => require("[email protected]/dist/d3.min.js"),
     dot: () => require("@observablehq/[email protected]/dist/graphviz.min.js"),

src/sqlite.js

@@ -1,3 +1,5 @@
+import {require as requireDefault} from "d3-require";
+
 export default async function sqlite(require) {
   const sql = await require("[email protected]/dist/sql-wasm.js");
   return sql({locateFile: file => `https://cdn.jsdelivr.net/npm/[email protected]/dist/${file}`});
@@ -9,6 +11,10 @@ export class SQLiteDatabaseClient {
       _db: {value: db}
     });
   }
+  static async open(source) {
+    const [SQL, buffer] = await Promise.all([sqlite(requireDefault), Promise.resolve(source).then(load)]);
+    return new SQLiteDatabaseClient(new SQL.Database(buffer));
+  }
   async query(query, params) {
     return await exec(this._db, query, params);
   }
@@ -34,6 +40,13 @@ export class SQLiteDatabaseClient {
   }
 }
 
+function load(source) {
+  return typeof source === "string" ? fetch(source).then(load)
+    : source instanceof Response || source instanceof Blob ? source.arrayBuffer().then(load)
+    : source instanceof ArrayBuffer ? new Uint8Array(source)
+    : source;
+}
+
 async function exec(db, query, params) {
   const [result] = await db.exec(query, params);
   if (!result) return [];

test/index-test.js

@@ -12,6 +12,7 @@ test("new Library returns a library with the expected keys", async t => {
     "Plot",
     "Promises",
     "SQLite",
+    "SQLiteDatabaseClient",
     "_",
     "d3",
     "dot",