Remove options parameter for echo

Author: pearmini

runtime/index.js

@@ -1,11 +1,11 @@
 import {transpileJavaScript} from "@observablehq/notebook-kit";
 import {Runtime} from "@observablehq/runtime";
-import inspector from "object-inspect";
 import {parse} from "acorn";
 import {group} from "d3-array";
 import {dispatch as d3Dispatch} from "d3-dispatch";
 import * as stdlib from "./stdlib.js";
 import {OUTPUT_MARK, ERROR_MARK} from "./constant.js";
+import {Inspector} from "./inspect.js";
 
 const OUTPUT_PREFIX = `//${OUTPUT_MARK}`;
 
@@ -37,35 +37,15 @@ function debounce(fn, delay = 0) {
   };
 }
 
-function isMultiline(value) {
-  const isString = typeof value === "string";
-  if (!isString) return false;
-  const lines = value.split("\n");
-  return lines.length > 1;
+function merge(...strings) {
+  return strings.join("\n");
 }
 
-function inspect(value, {limit = 200, quote = "double", indent = null} = {}) {
-  if (isMultiline(value)) return value;
-  if (typeof value === "string" && !quote) return value;
-  const string = inspector(value, {indent, quoteStyle: quote});
-  if (string.length > limit) return string.slice(0, limit) + "…";
-  return string;
-}
-
-function format(value, options, prefix) {
-  const string = inspect(value, options);
+function addPrefix(string, prefix) {
   const lines = string.split("\n");
   return lines.map((line) => `${prefix} ${line}`).join("\n");
 }
 
-function formatOutput(value, options) {
-  return format(value, options, OUTPUT_PREFIX);
-}
-
-function formatError(value, options) {
-  return format(value, options, ERROR_PREFIX);
-}
-
 export function createRuntime(initialCode) {
   let code = initialCode;
   let prevCode = null;
@@ -85,9 +65,22 @@ export function createRuntime(initialCode) {
       const start = node.start;
       const {values} = node.state;
       if (values.length) {
-        const f = (v, o) => (isError(v) ? formatError(v, o) : formatOutput(v, o));
-        const output = values.map(({value, options}) => f(value, options)).join("\n") + "\n";
-        changes.push({from: start, insert: output});
+        let output = "";
+        let error = false;
+        for (let i = 0; i < values.length; i++) {
+          const line = values[i];
+          const formatted = line.map((v) => {
+            if (isError(v)) error = true;
+            const inspector = v instanceof Inspector ? v : new Inspector(v);
+            return inspector.format();
+          });
+          const merged = merge(...formatted);
+          output += merged;
+          output += i < values.length - 1 ? "\n" : "";
+        }
+        const prefix = error ? ERROR_PREFIX : OUTPUT_PREFIX;
+        const prefixed = addPrefix(output, prefix);
+        changes.push({from: start, insert: prefixed + "\n"});
       }
     }
 
@@ -147,7 +140,7 @@ export function createRuntime(initialCode) {
       const offset = loc.line === 1 ? 0 : 1;
       const from = prevLine.join("\n").length + offset;
       const changes = removeChanges(code);
-      const errorMsg = formatError(error) + "\n";
+      const errorMsg = addPrefix(new Inspector(error).format(), ERROR_PREFIX) + "\n";
       changes.push({from, insert: errorMsg});
       dispatch(changes);
       return null;
@@ -189,9 +182,9 @@ export function createRuntime(initialCode) {
     return changes;
   }
 
-  function echo(state, value, options) {
+  function echo(state, ...values) {
     if (!isRunning) return;
-    state.values.push({value, options});
+    state.values.push(values);
     rerun(code);
   }
 
@@ -270,13 +263,13 @@ export function createRuntime(initialCode) {
           inputs.filter((i) => i !== "echo" && i !== "clear"),
           () => {
             const version = v._version; // Capture version on input change.
-            return (value, options) => {
+            return (value, ...args) => {
               if (version < docVersion) throw new Error("stale echo");
               else if (state.variables[0] !== v) throw new Error("stale echo");
               else if (version > docVersion) clear(state);
               docVersion = version;
-              echo(state, value, options);
-              return value;
+              echo(state, value, ...args);
+              return args.length ? [value, ...args] : value;
             };
           },
         );

runtime/inspect.js

@@ -0,0 +1,30 @@
+import objectInspector from "object-inspect";
+
+function isMultiline(value) {
+  const isString = typeof value === "string";
+  if (!isString) return false;
+  const lines = value.split("\n");
+  return lines.length > 1;
+}
+
+function inspector(value, {limit = 200, quote = "double", indent = null} = {}) {
+  if (isMultiline(value)) return value;
+  if (typeof value === "string" && !quote) return value;
+  const string = objectInspector(value, {indent, quoteStyle: quote});
+  if (string.length > limit) return string.slice(0, limit) + "…";
+  return string;
+}
+
+export class Inspector {
+  constructor(value, options = {}) {
+    this.value = value;
+    this.options = options;
+  }
+  format() {
+    return inspector(this.value, this.options);
+  }
+}
+
+export function inspect(value, options) {
+  return new Inspector(value, options);
+}

runtime/stdlib.js

@@ -1,4 +1,5 @@
 export {require} from "d3-require";
 export {now} from "./now.js";
 export {interval} from "./interval.js";
+export {inspect, Inspector} from "./inspect.js";
 export * from "./controls";

test/js/generator.js

@@ -2,4 +2,4 @@ export const generator = `const now = echo(recho.now());
 
 const x = echo(Math.abs(~~(Math.sin(now / 1000) * 22)));
 
-echo('~'.repeat(x) + '(๑•̀ㅂ•́)و✧', {quote: false});`;
+echo(recho.inspect('~'.repeat(x) + '(๑•̀ㅂ•́)و✧', {quote: false}));`;

test/js/inspector.js

@@ -19,10 +19,10 @@ echo(new Map([[1, 2], [3, 4]]));
 
 echo(new Date('2025-09-23T12:00:00Z'));
 
-echo(new Map([[1, 2], [3, 4]]), {indent: 2});
+echo(recho.inspect(new Map([[1, 2], [3, 4]]), {indent: 2}));
 
 echo(new Array(100).fill(0));
 
-echo(new Array(100).fill(0), {limit: 100});
+echo(recho.inspect(new Array(100).fill(0), {limit: 100}));
 
-echo(new Array(100).fill(0), {limit: Infinity});`;
+echo(recho.inspect(new Array(100).fill(0), {limit: Infinity}));`;

test/output/inspector.js

@@ -31,13 +31,13 @@ echo(new Date('2025-09-23T12:00:00Z'));
 //➜   1 => 2,
 //➜   3 => 4
 //➜ }
-echo(new Map([[1, 2], [3, 4]]), {indent: 2});
+echo(recho.inspect(new Map([[1, 2], [3, 4]]), {indent: 2}));
 
 //➜ [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, …
 echo(new Array(100).fill(0));
 
 //➜ [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,…
-echo(new Array(100).fill(0), {limit: 100});
+echo(recho.inspect(new Array(100).fill(0), {limit: 100}));
 
 //➜ [ 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 ]
-echo(new Array(100).fill(0), {limit: Infinity});
+echo(recho.inspect(new Array(100).fill(0), {limit: Infinity}));