@observablehq/notebook-kit 2.6.0 → 2.6.2

package/dist/package.json

@@ -5,7 +5,7 @@
         "type": "git",
         "url": "git+https://github.com/observablehq/notebook-kit.git"
     },
-    "version": "2.6.0",
+    "version": "2.6.2",
     "type": "module",
     "scripts": {
         "test": "TZ=America/Los_Angeles vitest",

package/dist/src/javascript/imports/observable.d.ts

@@ -6,10 +6,10 @@ import type { NamedImportSpecifier } from "../imports.js";
 export declare function resolveObservableImport(specifier: string): string;
 export declare function isObservableImport(node: ImportDeclaration, specifier: string): boolean;
 /** Note: mutates inputs! */
-export declare function renderObservableImport(source: string, node: ImportDeclaration | ImportWithDeclaration, inputs: string[]): string;
+export declare function renderObservableImport(source: string, node: ImportDeclaration | ImportWithDeclaration, inputs: string[], renameImport?: (name: string) => string): string;
 export declare function toSpecialIdentifier(identifier: Identifier, type: "viewof" | "mutable"): Identifier;
 export declare function toSpecialImportSpecifier(specifier: ImportSpecifier, type: "viewof" | "mutable"): ImportSpecifier;
 export declare function isViewImport(node: NamedImportSpecifier): node is ImportSpecifier;
 export declare function isMutableImport(node: NamedImportSpecifier): node is ImportSpecifier;
-/** Turns e.g. "viewof$foo" into "viewof foo", and "$$" into "$". */
+/** Turns e.g. "viewof$foo" into "viewof foo", and "viewof$$foo" into "viewof$foo". */
 export declare function dedollar(input: string): string;

package/dist/src/javascript/imports/observable.js

@@ -1,5 +1,4 @@
 import { flatMapImportSpecifiers, getImportedName, getLocalName } from "../imports.js";
-const CODE_DOLLAR = 36;
 /** If specifier is an observable: protocol import, resolves it. */
 export function resolveObservableImport(specifier) {
     if (!specifier.startsWith("observable:"))
@@ -17,13 +16,13 @@ function getImportAttributeKey(node) {
     return node.key.type === "Identifier" ? node.key.name : String(node.key.value);
 }
 /** Note: mutates inputs! */
-export function renderObservableImport(source, node, inputs) {
+export function renderObservableImport(source, node, inputs, renameImport = String) {
     if (!inputs.includes("@variable"))
         inputs.push("@variable");
     return `(import(${source}).then((_) => {
   const module = __variable._module._runtime.module(_.default)${"injections" in node ? `.derive([${renderObservableInjections(node)}], __variable._module)` : ""};
   const outputs = new Map(Array.from(__variable._outputs, (v) => [v._name, v]));${flatMapImportSpecifiers(node, (specifier) => {
-        const i = dedollar(getImportedName(specifier));
+        const i = renameImport(getImportedName(specifier));
         const l = getLocalName(specifier);
         return `
   outputs.get(${JSON.stringify(l)})?.import(${JSON.stringify(i)}${i === l ? "" : `, ${JSON.stringify(l)}`}, module);`;
@@ -75,29 +74,8 @@ export function isViewImport(node) {
 export function isMutableImport(node) {
     return "mutable" in node && !!node.mutable;
 }
-/** Turns e.g. "viewof$foo" into "viewof foo", and "$$" into "$". */
+/** Turns e.g. "viewof$foo" into "viewof foo", and "viewof$$foo" into "viewof$foo". */
 export function dedollar(input) {
-    const start = 0;
-    const end = input.length;
-    let dollars = 0;
-    for (let i = start; i < end; ++i) {
-        switch (input.charCodeAt(i)) {
-            case CODE_DOLLAR: {
-                ++dollars;
-                break;
-            }
-            default: {
-                if (dollars > 0) {
-                    input = `${input.slice(0, i - 1)}${dollars === 1 ? " " : ""}${input.slice(i)}`;
-                    dollars = 0;
-                }
-                break;
-            }
-        }
-    }
-    if (dollars > 0) {
-        input = `${input.slice(0, end - 1)}${dollars === 1 ? " " : ""}`;
-        dollars = 0;
-    }
-    return input;
+    const match = /^(viewof|mutable)([$]+)([^$].*)$/.exec(input);
+    return match ? `${match[1]}${match[2].length > 1 ? match[2].slice(1) : " "}${match[3]}` : input;
 }

package/dist/src/javascript/imports.d.ts

@@ -20,10 +20,12 @@ export type ImportOptions = {
     resolveImport?: (specifier: string) => string;
     /** If true, resolve local imports relative to document.baseURI. */
     resolveLocalImports?: boolean;
+    /** If specified, allows renaming of imported variables such as viewof$foo for backwards compatibility. */
+    renameObservableImport?: (name: string) => string;
 };
 export declare function rewriteImportExpressions(output: Sourcemap, body: Node, { resolveImport, resolveLocalImports }?: ImportOptions): void;
 /** Note: mutates inputs! */
-export declare function rewriteImportDeclarations(output: Sourcemap, body: Node, inputs: string[], { resolveImport, resolveLocalImports }?: ImportOptions): void;
+export declare function rewriteImportDeclarations(output: Sourcemap, body: Node, inputs: string[], { resolveImport, resolveLocalImports, renameObservableImport }?: ImportOptions): void;
 export declare function getLocalName(node: NamedImportSpecifier): string;
 export declare function getImportedName(node: NamedImportSpecifier): string;
 export declare function flatMapImportSpecifiers<T>(node: ImportDeclaration, f: (node: NamedImportSpecifier) => T): T[];

package/dist/src/javascript/imports.js

@@ -1,6 +1,6 @@
 import { resolveJsrImport } from "./imports/jsr.js";
 import { resolveNpmImport } from "./imports/npm.js";
-import { isObservableImport, isMutableImport, isViewImport } from "./imports/observable.js";
+import { isObservableImport, isMutableImport, isViewImport, dedollar } from "./imports/observable.js";
 import { resolveObservableImport, renderObservableImport } from "./imports/observable.js";
 import { toSpecialImportSpecifier } from "./imports/observable.js";
 import { getStringLiteralValue, isStringLiteral } from "./strings.js";
@@ -79,7 +79,7 @@ export function rewriteImportExpressions(output, body, { resolveImport = resolve
     });
 }
 /** Note: mutates inputs! */
-export function rewriteImportDeclarations(output, body, inputs, { resolveImport = resolveImportDefault, resolveLocalImports } = {}) {
+export function rewriteImportDeclarations(output, body, inputs, { resolveImport = resolveImportDefault, resolveLocalImports, renameObservableImport = dedollar } = {}) {
     const declarations = [];
     simple(body, {
         ImportDeclaration(node) {
@@ -102,7 +102,7 @@ export function rewriteImportDeclarations(output, body, inputs, { resolveImport
             ? `new URL(${JSON.stringify(resolution)}, document.baseURI)`
             : JSON.stringify(resolution);
         imports.push(isObservableImport(node, value)
-            ? renderObservableImport(source, node, inputs)
+            ? renderObservableImport(source, node, inputs, renameObservableImport)
             : renderImport(source, node, output.input));
     }
     if (declarations.length > 1) {

package/package.json

@@ -5,7 +5,7 @@
     "type": "git",
     "url": "git+https://github.com/observablehq/notebook-kit.git"
   },
-  "version": "2.6.0",
+  "version": "2.6.2",
   "type": "module",
   "scripts": {
     "test": "TZ=America/Los_Angeles vitest",