@observablehq/notebook-kit 2.3.0 → 2.4.1

package/dist/package.json

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

package/dist/src/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./javascript/globals.js";
+export { resolveImportDefault } from "./javascript/imports.js";
 export * from "./javascript/parse.js";
 export * from "./javascript/template.js";
 export * from "./javascript/transpile.js";

package/dist/src/index.js

@@ -1,4 +1,5 @@
 export * from "./javascript/globals.js";
+export { resolveImportDefault } from "./javascript/imports.js";
 export * from "./javascript/parse.js";
 export * from "./javascript/template.js";
 export * from "./javascript/transpile.js";

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

@@ -20,7 +20,7 @@ function getImportAttributeKey(node) {
 export function renderObservableImport(source, node, inputs) {
     if (!inputs.includes("@variable"))
         inputs.push("@variable");
-    return `(import(${JSON.stringify(source)}).then((_) => {
+    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));

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

@@ -14,13 +14,16 @@ export declare function isImportMetaResolve(node: CallExpression): boolean;
 /** Returns true if the given node is an import.meta.url expression. */
 export declare function isImportMetaUrl(node: MemberExpression): boolean;
 export declare function isTypeImport(node: AnyImportSpecifier | ImportDeclaration): boolean;
-export type RewriteImportOptions = {
+export declare function resolveImportDefault(specifier: string): string;
+export type ImportOptions = {
+    /** Returns the URL for the given import specifier; defaults to resolveImportDefault. */
+    resolveImport?: (specifier: string) => string;
     /** If true, resolve local imports relative to document.baseURI. */
     resolveLocalImports?: boolean;
 };
-export declare function rewriteImportExpressions(output: Sourcemap, body: Node, { resolveLocalImports }?: RewriteImportOptions): void;
+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[], { resolveLocalImports }?: RewriteImportOptions): void;
+export declare function rewriteImportDeclarations(output: Sourcemap, body: Node, inputs: string[], { resolveImport, resolveLocalImports }?: 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

@@ -47,10 +47,10 @@ export function isImportMetaUrl(node) {
 export function isTypeImport(node) {
     return node.importKind === "type";
 }
-function resolveImport(specifier) {
+export function resolveImportDefault(specifier) {
     return resolveObservableImport(resolveJsrImport(resolveNpmImport(specifier)));
 }
-export function rewriteImportExpressions(output, body, { resolveLocalImports } = {}) {
+export function rewriteImportExpressions(output, body, { resolveImport = resolveImportDefault, resolveLocalImports } = {}) {
     function rewriteImportSource(source, node = source) {
         const value = getStringLiteralValue(source);
         const resolution = resolveImport(value);
@@ -79,7 +79,7 @@ export function rewriteImportExpressions(output, body, { resolveLocalImports } =
     });
 }
 /** Note: mutates inputs! */
-export function rewriteImportDeclarations(output, body, inputs, { resolveLocalImports } = {}) {
+export function rewriteImportDeclarations(output, body, inputs, { resolveImport = resolveImportDefault, resolveLocalImports } = {}) {
     const declarations = [];
     simple(body, {
         ImportDeclaration(node) {
@@ -93,16 +93,17 @@ export function rewriteImportDeclarations(output, body, inputs, { resolveLocalIm
     });
     const specifiers = [];
     const imports = [];
-    for (const [node, source] of declarations) {
+    for (const [node, literal] of declarations) {
         output.delete(node.start, node.end + +(output.input[node.end] === "\n"));
         specifiers.push(rewriteImportSpecifiers(node));
-        const value = getStringLiteralValue(source);
+        const value = getStringLiteralValue(literal);
         const resolution = resolveImport(value);
+        const source = resolveLocalImports && isLocalImport(resolution)
+            ? `new URL(${JSON.stringify(resolution)}, document.baseURI)`
+            : JSON.stringify(resolution);
         imports.push(isObservableImport(node, value)
-            ? renderObservableImport(resolution, node, inputs)
-            : renderImport(resolveLocalImports && isLocalImport(resolution)
-                ? `new URL(${JSON.stringify(resolution)}, document.baseURI)`
-                : JSON.stringify(resolution), node, output.input));
+            ? renderObservableImport(source, node, inputs)
+            : renderImport(source, node, output.input));
     }
     if (declarations.length > 1) {
         output.insertLeft(0, `const [${specifiers.join(", ")}] = await Promise.all([${imports.join(", ")}]);\n`); // prettier-ignore

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

@@ -1,4 +1,5 @@
 import type { Cell } from "../lib/notebook.js";
+import type { ImportOptions } from "./imports.js";
 export type TranspiledJavaScript = {
     /** the source code of a JavaScript function defining the primary variable */
     body: string;
@@ -21,12 +22,10 @@ export type TranspiledJavaScript = {
     /** the names of any referenced secrets */
     secrets?: Set<string>;
 };
-export type TranspileOptions = {
-    /** If true, resolve local imports paths relative to document.baseURI. */
-    resolveLocalImports?: boolean;
+export interface TranspileOptions extends ImportOptions {
     /** If true, resolve file using import.meta.url (so Vite treats it as an asset). */
     resolveFiles?: boolean;
-};
+}
 /** @deprecated */
 export declare function transpile(input: string, mode: Cell["mode"], options?: TranspileOptions): TranspiledJavaScript;
 export declare function transpile(input: Cell, options?: TranspileOptions): TranspiledJavaScript;

package/package.json

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