v6; more modular

.github/workflows/publish.yml

@@ -0,0 +1,24 @@
+name: Publish
+
+on:
+  workflow_dispatch: {}
+  release:
+    types: [published]
+
+jobs:
+  publish:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: yarn
+      - run: yarn --frozen-lockfile
+      - run: yarn test
+      - run: npm publish
+        env:
+          NODE_AUTH_TOKEN: ${{ secrets.NPM_TOKEN }}

.github/workflows/test.yml

@@ -0,0 +1,19 @@
+name: Test
+
+on:
+  push:
+    branches: [main]
+  pull_request:
+    branches: [main]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+      - uses: actions/setup-node@v4
+        with:
+          node-version: 20
+          cache: yarn
+      - run: yarn --frozen-lockfile
+      - run: yarn test

.gitignore

@@ -1,6 +1,4 @@
-*.sublime-workspace
 .DS_Store
-.esm-cache/
 dist/
 node_modules
 npm-debug.log

CONTRIBUTING.md

@@ -2,24 +2,14 @@ The Observable runtime is open source and released under the [ISC License](https
 
 ## Development
 
-Install dependencies:
+We use Yarn 1.x (Classic). To install dependencies:
 
 ```
 yarn
 ```
 
-Run tests with Mocha:
+To run tests with Mocha:
 
 ```
 yarn test
 ```
-
-Build with Rollup:
-
-```
-yarn prepublishOnly
-```
-
-## For internal use
-
-See our checklist for [publishing a new release](https://observablehq.com/@observablehq/publishing-new-open-source-releases).

LICENSE

@@ -1,4 +1,4 @@
-Copyright 2018-2023 Observable, Inc.
+Copyright 2018-2024 Observable, Inc.
 
 Permission to use, copy, modify, and/or distribute this software for any purpose
 with or without fee is hereby granted, provided that the above copyright notice

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@observablehq/runtime",
-  "version": "5.9.9",
+  "version": "6.0.0-rc.1",
   "author": {
     "name": "Observable, Inc.",
     "url": "https://observablehq.com"
@@ -9,38 +9,25 @@
   "type": "module",
   "main": "src/index.js",
   "module": "src/index.js",
-  "jsdelivr": "dist/runtime.umd.js",
-  "unpkg": "dist/runtime.umd.js",
   "exports": {
-    "umd": "./dist/runtime.umd.js",
     "default": "./src/index.js"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/observablehq/runtime.git"
   },
   "files": [
-    "dist/**/*.js",
     "src/**/*.js"
   ],
   "scripts": {
-    "test": "mocha 'test/**/*-test.js' && eslint src test",
-    "prepublishOnly": "rm -rf dist && rollup -c",
-    "postpublish": "git push && git push --tags"
+    "test": "mocha 'test/**/*-test.js' && eslint src test"
   },
   "_moduleAliases": {
     "@observablehq/runtime": "./src/index.js"
   },
-  "dependencies": {
-    "@observablehq/inspector": "^5.0.0",
-    "@observablehq/stdlib": "^5.0.0"
-  },
   "devDependencies": {
-    "@rollup/plugin-node-resolve": "^15.0.1",
     "eslint": "^8.27.0",
     "mocha": "^10.1.0",
-    "module-alias": "^2.2.2",
-    "rollup": "^3.2.5",
-    "rollup-plugin-terser": "^7.0.2"
+    "module-alias": "^2.2.2"
   }
 }

src/index.js

@@ -1,4 +1,2 @@
-export {Inspector} from "@observablehq/inspector";
-export {Library} from "@observablehq/stdlib";
 export {RuntimeError} from "./errors.js";
 export {Runtime} from "./runtime.js";

src/runtime.js

@@ -1,4 +1,3 @@
-import {Library, FileAttachments} from "@observablehq/stdlib";
 import {RuntimeError} from "./errors.js";
 import {generatorish} from "./generatorish.js";
 import {Module, variable_variable, variable_invalidation, variable_visibility} from "./module.js";
@@ -9,7 +8,7 @@ const frame = typeof requestAnimationFrame === "function" ? requestAnimationFram
   : typeof setImmediate === "function" ? setImmediate
   : f => setTimeout(f, 0);
 
-export function Runtime(builtins = new Library, global = window_global) {
+export function Runtime(builtins, global = window_global) {
   const builtin = this.module();
   Object.defineProperties(this, {
     _dirty: {value: new Set},
@@ -34,8 +33,7 @@ Object.defineProperties(Runtime.prototype, {
   _computeSoon: {value: runtime_computeSoon, writable: true, configurable: true},
   _computeNow: {value: runtime_computeNow, writable: true, configurable: true},
   dispose: {value: runtime_dispose, writable: true, configurable: true},
-  module: {value: runtime_module, writable: true, configurable: true},
-  fileAttachments: {value: FileAttachments, writable: true, configurable: true}
+  module: {value: runtime_module, writable: true, configurable: true}
 });
 
 function runtime_dispose() {
@@ -223,16 +221,22 @@ function variable_compute(variable) {
 
   const value0 = variable._value;
   const version = ++variable._version;
+  const inputs = variable._inputs;
+  const definition = variable._definition;
 
   // Lazily-constructed invalidation variable; only constructed if referenced as an input.
   let invalidation = null;
 
-  // If the variable doesn’t have any inputs, we can optimize slightly.
-  const promise = variable._promise = (variable._inputs.length
-      ? Promise.all(variable._inputs.map(variable_value)).then(define)
-      : new Promise(resolve => resolve(variable._definition.call(value0))))
+  // Wait for the previous definition to compute before recomputing.
+  const promise = variable._promise = variable._promise
+    .then(init, init)
+    .then(define)
     .then(generate);
 
+  function init() {
+    return Promise.all(inputs.map(variable_value));
+  }
+
   // Compute the initial value of the variable.
   function define(inputs) {
     if (variable._version !== version) throw variable_stale;
@@ -256,7 +260,7 @@ function variable_compute(variable) {
       }
     }
 
-    return variable._definition.apply(value0, inputs);
+    return definition.apply(value0, inputs);
   }
 
   // If the value is a generator, then retrieve its first value, and dispose of

test/runtime/dispose-test.js

@@ -0,0 +1,35 @@
+import {Runtime} from "@observablehq/runtime";
+import assert from "assert";
+import {sleep} from "../variable/valueof.js";
+
+describe("runtime.dispose", () => {
+  it("invalidates all variables", async () => {
+    const runtime = new Runtime();
+    const main = runtime.module();
+    const log = [];
+    main.variable(true).define(["invalidation"], async (invalidation) => {
+      await invalidation;
+      log.push("invalidation");
+    });
+    await sleep();
+    runtime.dispose();
+    await sleep();
+    assert.deepStrictEqual(log, ["invalidation"]);
+  });
+  it("terminates generators", async () => {
+    const runtime = new Runtime();
+    const main = runtime.module();
+    const log = [];
+    main.variable(true).define([], function* () {
+      try {
+        while (true) yield;
+      } finally {
+        log.push("return");
+      }
+    });
+    await sleep();
+    runtime.dispose();
+    await sleep();
+    assert.deepStrictEqual(log, ["return"]);
+  });
+});