rm DatabaseClient (#594)

Author: mbostock

src/client/main.js

@@ -1,6 +1,6 @@
 import {Runtime} from "observablehq:runtime";
-import {registerDatabase, registerFile} from "observablehq:stdlib";
-import {DatabaseClient, FileAttachment, Generators, Mutable, resize} from "observablehq:stdlib";
+import {registerFile} from "observablehq:stdlib";
+import {FileAttachment, Generators, Mutable, resize} from "observablehq:stdlib";
 import {inspect, inspectError} from "./inspect.js";
 import * as recommendedLibraries from "./stdlib/recommendedLibraries.js";
 import * as sampleDatasets from "./stdlib/sampleDatasets.js";
@@ -9,7 +9,6 @@ const library = {
   now: () => Generators.now(),
   width: () => Generators.width(document.querySelector("main")),
   resize: () => resize,
-  DatabaseClient: () => DatabaseClient,
   FileAttachment: () => FileAttachment,
   Generators: () => Generators,
   Mutable: () => Mutable,
@@ -23,7 +22,7 @@ export const main = runtime.module();
 export const cellsById = new Map(); // TODO hide
 
 export function define(cell) {
-  const {id, inline, inputs = [], outputs = [], files = [], databases = [], body} = cell;
+  const {id, inline, inputs = [], outputs = [], files = [], body} = cell;
   const variables = [];
   cellsById.get(id)?.variables.forEach((v) => v.delete());
   cellsById.set(id, {cell, variables});
@@ -60,7 +59,6 @@ export function define(cell) {
   variables.push(v);
   for (const o of outputs) variables.push(main.variable(true).define(o, [`cell ${id}`], (exports) => exports[o]));
   for (const f of files) registerFile(f.name, f);
-  for (const d of databases) registerDatabase(d.name, d);
 }
 
 // Note: Element.prototype is instanceof Node, but cannot be inserted!

src/client/preview.js

@@ -62,7 +62,6 @@ export function open({hash, eval: compile} = {}) {
                       inline: item.inline,
                       inputs: item.inputs,
                       outputs: item.outputs,
-                      databases: item.databases,
                       files: item.files,
                       body: compile(item.body)
                     });

src/client/stdlib.js

@@ -1,4 +1,3 @@
-export {DatabaseClient, registerDatabase} from "./stdlib/databaseClient.js";
 export {AbstractFile, FileAttachment, registerFile} from "./stdlib/fileAttachment.js";
 export * as Generators from "./stdlib/generators/index.js";
 export {Mutable} from "./stdlib/mutable.js";

src/client/stdlib/databaseClient.js

@@ -3,7 +3,6 @@ import type {Expression, Identifier, Node, Options, Program} from "acorn";
 import {fileReference} from "./files.js";
 import {findAssignments} from "./javascript/assignments.js";
 import {findAwaits} from "./javascript/awaits.js";
-import {resolveDatabases} from "./javascript/databases.js";
 import {findDeclarations} from "./javascript/declarations.js";
 import {findFeatures} from "./javascript/features.js";
 import {findExports, findImportDeclarations, findImports} from "./javascript/imports.js";
@@ -13,10 +12,6 @@ import {syntaxError} from "./javascript/syntaxError.js";
 import {Sourcemap} from "./sourcemap.js";
 import {red} from "./tty.js";
 
-export interface DatabaseReference {
-  name: string;
-}
-
 export interface FileReference {
   /** The relative path from the page to the original file (e.g., "./test.txt"). */
   name: string;
@@ -32,7 +27,7 @@ export interface ImportReference {
 }
 
 export interface Feature {
-  type: "FileAttachment" | "DatabaseClient" | "Secret";
+  type: "FileAttachment";
   name: string;
 }
 
@@ -42,7 +37,6 @@ export interface BaseTranspile {
   inputs?: string[];
   outputs?: string[];
   inline?: boolean;
-  databases?: DatabaseReference[];
   files?: FileReference[];
   imports?: ImportReference[];
 }
@@ -69,9 +63,6 @@ export function transpileJavaScript(input: string, options: ParseOptions): Pendi
   const {id, root, sourcePath, verbose = true} = options;
   try {
     const node = parseJavaScript(input, options);
-    const databases = node.features
-      .filter((f) => f.type === "DatabaseClient")
-      .map((f): DatabaseReference => ({name: f.name}));
     const files = node.features
       .filter((f) => f.type === "FileAttachment")
       .map(({name}) => fileReference(name, sourcePath));
@@ -85,7 +76,6 @@ export function transpileJavaScript(input: string, options: ParseOptions): Pendi
       ...(inputs.length ? {inputs} : null),
       ...(options.inline ? {inline: true} : null),
       ...(node.declarations?.length ? {outputs: node.declarations.map(({name}) => name)} : null),
-      ...(databases.length ? {databases: resolveDatabases(databases)} : null),
       ...(files.length ? {files} : null),
       body: async () => {
         const output = new Sourcemap(input);

src/javascript.ts

@@ -17,12 +17,12 @@ export function findFeatures(node: Node, path: string, references: Identifier[],
       let type = featureMap.get(callee);
       // If this feature wasn’t explicitly imported into this cell, then ignore
       // function calls that are not references to the feature. For example, if
-      // there’s a local variable called Secret, that will mask the built-in
-      // Secret and won’t be considered a feature.
+      // there’s a local variable called FileAttachment, that will mask the
+      // built-in FileAttachment and won’t be considered a feature.
       if (!type) {
         if (!references.includes(callee)) return;
         const name = callee.name;
-        if (name !== "Secret" && name !== "FileAttachment" && name !== "DatabaseClient") return;
+        if (name !== "FileAttachment") return;
         type = name;
       }
       features.push(getFeature(type, node, path, input));
@@ -50,9 +50,7 @@ export function getFeatureReferenceMap(node: Node): Map<Identifier, Feature["typ
           if (
             specifier.type === "ImportSpecifier" &&
             specifier.imported.type === "Identifier" &&
-            (specifier.imported.name === "FileAttachment" ||
-              specifier.imported.name === "Secret" ||
-              specifier.imported.name === "DatabaseClient")
+            specifier.imported.name === "FileAttachment"
           ) {
             declarations.add(specifier.local);
             alias.set(specifier.local.name, specifier.imported.name);