@observablehq/notebook-kit 1.7.3 → 1.7.5

package/dist/package.json

@@ -5,7 +5,7 @@
         "type": "git",
         "url": "git+https://github.com/observablehq/notebook-kit.git"
     },
-    "version": "1.7.3",
+    "version": "1.7.5",
     "type": "module",
     "scripts": {
         "test": "vitest",

package/dist/src/runtime/index.d.ts

@@ -113,7 +113,15 @@ export declare class NotebookRuntime {
         Mutable: () => typeof import("./stdlib/mutable.js").Mutable;
         Promises: () => typeof import("./stdlib/promises/index.js");
         DOM: () => typeof import("./stdlib/dom/index.js");
-        require: () => typeof import("./stdlib/require.js").require;
+        require: () => {
+            (...specifiers: unknown[]): Promise<unknown>;
+            resolve: (specifier: unknown) => string;
+        } & {
+            alias: (aliases: Record<string, string>) => {
+                (...specifiers: unknown[]): Promise<unknown>;
+                resolve: (specifier: unknown) => string;
+            };
+        };
         __ojs_observer: () => () => import("./stdlib/observer.js").Observer;
     });
     define(state: DefineState, definition: Definition, observer?: typeof observe): void;

package/dist/src/runtime/stdlib/index.d.ts

@@ -6,7 +6,6 @@ import { Interpreter } from "./interpreter.js";
 import { Mutable } from "./mutable.js";
 import { Observer } from "./observer.js";
 import * as Promises from "./promises/index.js";
-import { require } from "./require.js";
 export declare const root: HTMLElement;
 export declare const library: {
     aapl: () => Promise<any>;
@@ -103,6 +102,14 @@ export declare const library: {
     Mutable: () => typeof Mutable;
     Promises: () => typeof Promises;
     DOM: () => typeof DOM;
-    require: () => typeof require;
+    require: () => {
+        (...specifiers: unknown[]): Promise<unknown>;
+        resolve: (specifier: unknown) => string;
+    } & {
+        alias: (aliases: Record<string, string>) => {
+            (...specifiers: unknown[]): Promise<unknown>;
+            resolve: (specifier: unknown) => string;
+        };
+    };
     __ojs_observer: () => () => Observer;
 };

package/dist/src/runtime/stdlib/require.d.ts

@@ -1,4 +1,11 @@
-export declare function require(...specifiers: unknown[]): unknown;
-export declare namespace require {
-    var resolve: (_specifier: unknown) => string;
-}
+export declare const require: {
+    (...specifiers: unknown[]): Promise<unknown>;
+    resolve: (specifier: unknown) => string;
+} & {
+    alias: typeof alias;
+};
+declare function alias(aliases: Record<string, string>): {
+    (...specifiers: unknown[]): Promise<unknown>;
+    resolve: (specifier: unknown) => string;
+};
+export {};

package/dist/src/runtime/stdlib/require.js

@@ -1,9 +1,13 @@
-require.resolve = resolve;
 const cache = new WeakMap();
-export function require(...specifiers) {
-    return specifiers.length === 1
-        ? import(/* @vite-ignore */ resolve(specifiers[0])).then(objectify)
-        : Promise.all(specifiers.map((s) => require(s))).then((modules) => Object.assign({}, ...modules)); // prettier-ignore
+export const require = Object.assign(Requirer(resolve), { alias });
+function Requirer(resolve) {
+    async function require(...specifiers) {
+        return specifiers.length === 1
+            ? import(/* @vite-ignore */ resolve(specifiers[0])).then(objectify)
+            : Promise.all(specifiers.map((s) => require(s))).then(merge);
+    }
+    require.resolve = resolve;
+    return require;
 }
 function parseNpmSpecifier(specifier) {
     const parts = specifier.split("/");
@@ -16,12 +20,19 @@ function parseNpmSpecifier(specifier) {
     const path = parts.length > 0 ? `/${parts.join("/")}` : "";
     return { name, range, path };
 }
+function alias(aliases) {
+    return Requirer((specifier) => {
+        if (specifier in aliases)
+            specifier = aliases[specifier];
+        return resolve(specifier);
+    });
+}
 function resolve(_specifier) {
     const specifier = String(_specifier);
     if (isProtocol(specifier) || isLocal(specifier))
         return specifier;
     const { name, range, path } = parseNpmSpecifier(specifier);
-    return `https://cdn.jsdelivr.net/npm/${name}${range}${path + (isFile(path) || isDirectory(path) ? "" : "/+esm")}`;
+    return `https://cdn.jsdelivr.net/npm/${name}${range}${path + ((isFile(path) && !isJavaScript(path)) || isDirectory(path) ? "" : "/+esm")}`;
 }
 /** Promote exclusive default export to module. */
 function defaultify(module) {
@@ -37,6 +48,9 @@ function objectify(module) {
         cache.set(module, (object = defaultify(module)));
     return object;
 }
+function merge(modules) {
+    return Object.assign({}, ...modules);
+}
 /** Returns true for e.g. https://example.com/ */
 function isProtocol(specifier) {
     return /^\w+:/.test(specifier);
@@ -46,10 +60,14 @@ function isLocal(specifier) {
     return /^(\.\/|\.\.\/|\/)/.test(specifier);
 }
 /** Returns true for e.g. foo/bar.js */
+function isJavaScript(specifier) {
+    return /\.js$/i.test(specifier);
+}
+/** Returns true for e.g. foo/bar.txt */
 function isFile(specifier) {
-    return /(\.\w*)$/.test(specifier);
+    return /\.\w*$/.test(specifier);
 }
 /** Returns true for e.g. foo/bar/ */
 function isDirectory(specifier) {
-    return /(\/)$/.test(specifier);
+    return /\/$/.test(specifier);
 }

package/package.json

@@ -5,7 +5,7 @@
     "type": "git",
     "url": "git+https://github.com/observablehq/notebook-kit.git"
   },
-  "version": "1.7.3",
+  "version": "1.7.5",
   "type": "module",
   "scripts": {
     "test": "vitest",