@hpcc-js/observablehq-compiler 1.1.4 → 1.2.1

package/bin/ojscc.mjs

@@ -10,7 +10,7 @@ if (!globalThis.fetch) {
     globalThis.Response = Response;
 }
 import { promises as fs } from "fs";
-import { compile, download, Writer } from "../dist/index.js";
+import { compile, download } from "../dist/index.js";
 import yargsMode from "yargs/yargs";
 
 async function doDownload(url, filePath) {
@@ -25,12 +25,11 @@ async function doDownload(url, filePath) {
 async function doCompile(url, filePath) {
     const nb = await download(url);
     const define = await compile(nb, process.cwd());
-    const w = new Writer();
-    define.write(w);
+    const js = define.toString();
     if (filePath) {
-        fs.writeFile(filePath, w.toString());
+        fs.writeFile(filePath, js);
     } else {
-        console.info(w.toString());
+        console.info(js);
     }
 }
 

package/dist/index.esm.js

@@ -1,5 +1,3 @@
-import { join, endsWith } from '@hpcc-js/util';
-
 // This file was generated. Do not modify manually!
 var astralIdentifierCodes = [509, 0, 227, 0, 150, 4, 294, 9, 1368, 2, 2, 1, 6, 3, 41, 2, 5, 0, 166, 1, 574, 3, 9, 9, 370, 1, 154, 10, 50, 3, 123, 2, 54, 14, 32, 10, 3, 1, 11, 3, 46, 10, 8, 0, 46, 9, 7, 2, 37, 13, 2, 9, 6, 1, 45, 0, 13, 2, 49, 13, 9, 3, 2, 11, 83, 11, 7, 0, 161, 11, 6, 9, 7, 3, 56, 1, 2, 6, 3, 1, 3, 2, 10, 0, 11, 1, 3, 6, 4, 4, 193, 17, 10, 9, 5, 0, 82, 19, 13, 9, 214, 6, 3, 8, 28, 1, 83, 16, 16, 9, 82, 12, 9, 9, 84, 14, 5, 9, 243, 14, 166, 9, 71, 5, 2, 1, 3, 3, 2, 0, 2, 1, 13, 9, 120, 6, 3, 6, 4, 0, 29, 9, 41, 6, 2, 3, 9, 0, 10, 10, 47, 15, 406, 7, 2, 7, 17, 9, 57, 21, 2, 13, 123, 5, 4, 0, 2, 1, 2, 6, 2, 0, 9, 9, 49, 4, 2, 1, 2, 4, 9, 9, 330, 3, 19306, 9, 87, 9, 39, 4, 60, 6, 26, 9, 1014, 0, 2, 54, 8, 3, 82, 0, 12, 1, 19628, 1, 4706, 45, 3, 22, 543, 4, 4, 5, 9, 7, 3, 6, 31, 3, 149, 2, 1418, 49, 513, 54, 5, 49, 9, 0, 15, 0, 23, 4, 2, 14, 1361, 6, 2, 16, 3, 6, 2, 1, 2, 4, 262, 6, 10, 9, 357, 0, 62, 13, 1495, 6, 110, 6, 6, 9, 4759, 9, 787719, 239];
 
@@ -6618,8 +6616,13 @@ class ModuleParser extends CellParser {
     }
 }
 function splitModule(input) {
-    // @ts-ignore
-    return ModuleParser.parse(input, { ecmaVersion: "latest" }).cells.map(cell => input.substring(cell.start, cell.end));
+    return ModuleParser
+        .parse(input, { ecmaVersion: "latest" })
+        .cells.map((cell) => ({
+        text: input.substring(cell.start, cell.end),
+        start: cell.start,
+        end: cell.end
+    }));
 }
 function parseCell$2(input) {
     return parseCell$1(input);
@@ -6652,6 +6655,18 @@ function createFunction(refs, async = false, generator = false, blockStatement =
         body.substring(1, body.length - 1).trim() :
         `return (\n${body}\n);`);
 }
+function join(baseURL, relativeURL) {
+    return relativeURL
+        ? baseURL.replace(/\/+$/, "") + "/" + relativeURL.replace(/^\/+/, "")
+        : baseURL;
+}
+const isRelativePath = (path) => path[0] === ".";
+const fixRelativeUrl = (path, basePath) => {
+    if (isRelativePath(path)) {
+        return join(basePath, path);
+    }
+    return path;
+};
 //  Hide "import" from bundlers as they have a habit of replacing "import" with "require"
 async function obfuscatedImport(url) {
     return new FuncTypes.asyncFunctionType("url", "return import(url)")(url);
@@ -6677,7 +6692,7 @@ function createParsedOJS(ojs, offset, inlineMD) {
         error
     };
 }
-function parseOmd(_) {
+function splitOmd(_) {
     const retVal = [];
     //  Load Markdown  ---
     const re = /(```(?:\s|\S)[\s\S]*?```)/g;
@@ -6712,20 +6727,24 @@ function ojs2notebook(ojs) {
             return {
                 id: idx,
                 mode: "js",
-                value: cell
+                value: cell.text,
+                start: cell.start,
+                end: cell.end
             };
         })
     };
 }
 function omd2notebook(omd) {
-    const cells = parseOmd(omd);
+    const cells = splitOmd(omd);
     return {
         files: [],
         nodes: cells.map((cell, idx) => {
             return {
                 id: idx,
                 mode: cell.inlineMD ? "md" : "js",
-                value: cell.ojs
+                value: cell.ojs,
+                start: cell.offset,
+                end: cell.offset + cell.ojs.length
             };
         })
     };
@@ -6790,7 +6809,7 @@ function calcRefs(cellAst, cellStr) {
     }
     return retVal;
 }
-function parseImportExpression(cellAst) {
+function parseImportDeclaration(cellAst) {
     var _a, _b, _c, _d;
     return {
         type: "import",
@@ -6867,14 +6886,17 @@ function parseVariableExpression(cellStr, cellAst, refs, bodyStr) {
         func: createFunction(refs, cellAst.async, cellAst.generator, cellAst.body.type === "BlockStatement", bodyStr)
     };
 }
-function parseCell(cellStr) {
+function parseCell(cellStr, baseUrl) {
     var _a, _b;
     const cellAst = parseCell$2(cellStr);
-    if (((_a = (cellAst.body)) === null || _a === void 0 ? void 0 : _a.type) == "ImportDeclaration") {
-        return parseImportExpression(cellAst);
+    let bodyStr = cellAst.body && cellStr.substring(cellAst.body.start, cellAst.body.end);
+    switch ((_a = (cellAst.body)) === null || _a === void 0 ? void 0 : _a.type) {
+        case "ImportDeclaration":
+            return parseImportDeclaration(cellAst);
+        case "ImportExpression":
+            bodyStr = `import("${fixRelativeUrl(cellAst.body.source.value, baseUrl)}")`;
     }
     const refs = calcRefs(cellAst, cellStr);
-    const bodyStr = cellAst.body && cellStr.substring(cellAst.body.start, cellAst.body.end);
     switch ((_b = cellAst.id) === null || _b === void 0 ? void 0 : _b.type) {
         case "ViewExpression":
             return parseViewExpression(cellStr, cellAst, refs, bodyStr);
@@ -6955,29 +6977,27 @@ export default function define(runtime, observer) {
     }
 }
 
-const isRelativePath = (path) => path[0] === ".";
-const fullUrl = (path, basePath) => isRelativePath(path) ? join(basePath, path) : path;
 async function importFile(relativePath, baseUrl) {
-    const path = fullUrl(relativePath, baseUrl);
+    const path = fixRelativeUrl(relativePath, baseUrl);
     const content = await fetchEx(path).then(r => r.text());
     let notebook;
-    if (endsWith(relativePath, ".ojsnb")) {
+    if (relativePath.endsWith(".ojsnb")) {
         notebook = JSON.parse(content);
     }
-    else if (endsWith(relativePath, ".ojs")) {
+    else if (relativePath.endsWith(".ojs")) {
         notebook = ojs2notebook(content);
     }
-    else if (endsWith(relativePath, ".omd")) {
+    else if (relativePath.endsWith(".omd")) {
         notebook = omd2notebook(content);
     }
-    const retVal = compile(notebook, baseUrl);
-    retVal.dispose = () => { };
+    const retVal = compile(notebook, { baseUrl });
+    retVal.delete = () => { };
     retVal.write = (w) => {
         w.import(path);
     };
     return retVal;
 }
-// @ts-ignore - use precompiled notebook from observable
+// Import precompiled notebook from observable  ---
 async function importCompiledNotebook(partial) {
     const url = `https://api.observablehq.com/${partial[0] === "@" ? partial : `d/${partial}`}.js?v=3`;
     let impMod = {
@@ -6991,17 +7011,72 @@ async function importCompiledNotebook(partial) {
     catch (e) {
     }
     const retVal = impMod.default;
-    retVal.dispose = () => { };
+    retVal.delete = () => { };
     retVal.write = (w) => {
         w.import(url);
     };
     return retVal;
 }
-function createVariable(inspect, name, inputs, definition, inline = false) {
+// Recursive notebook parsing and compiling
+async function importNotebook(partial) {
+    const url = `https://api.observablehq.com/document/${partial}`;
+    const notebook = fetchEx(url)
+        .then(r => {
+        return r.json();
+    }).catch(e => {
+        console.error(url);
+        console.error(e);
+    });
+    const retVal = compile(await notebook);
+    retVal.delete = () => { };
+    retVal.write = (w) => {
+        w.import(url);
+    };
+    return retVal;
+}
+async function createModule(node, parsed, text, { baseUrl, importMode }) {
+    const otherModule = isRelativePath(parsed.src) ?
+        await importFile(parsed.src, baseUrl) :
+        importMode === "recursive" ?
+            await importNotebook(parsed.src) :
+            await importCompiledNotebook(parsed.src);
+    const importVariables = [];
+    const variables = [];
+    parsed.specifiers.forEach(spec => {
+        const viewof = spec.view ? "viewof " : "";
+        importVariables.push(createImportVariable(viewof + spec.name, viewof + spec.alias));
+        if (spec.view) {
+            importVariables.push(createImportVariable(spec.name, spec.alias));
+        }
+    });
+    const retVal = (runtime, main, inspector) => {
+        let mod = runtime.module(otherModule);
+        if (parsed.injections.length) {
+            mod = mod.derive(parsed.injections, main);
+        }
+        variables.forEach(v => v(main, inspector));
+        importVariables.forEach(v => v(main, mod));
+        return mod;
+    };
+    retVal.importVariables = importVariables;
+    retVal.variables = variables;
+    retVal.delete = () => {
+        importVariables.forEach(v => v.delete());
+        variables.forEach(v => v.delete());
+        otherModule.delete();
+    };
+    retVal.write = (w) => {
+        otherModule.write(w);
+        w.importDefine(parsed);
+    };
+    return retVal;
+}
+//  Variable  ---
+function createVariable(node, inspect, name, inputs, definition, inline = false) {
     let i;
     let v;
     const retVal = (module, inspector) => {
-        i = inspect ? inspector(name) : undefined;
+        i = inspect ? inspector(name, node.id) : undefined;
         v = module.variable(i);
         if (arguments.length > 1) {
             try {
@@ -7011,9 +7086,22 @@ function createVariable(inspect, name, inputs, definition, inline = false) {
                 console.error(e === null || e === void 0 ? void 0 : e.message);
             }
         }
+        if (node.pinned) {
+            v = module.variable(inspector(name, node.id));
+            try {
+                v.define(undefined, ["md"], md => {
+                    return md `\`\`\`js
+${node.value}
+\`\`\``;
+                });
+            }
+            catch (e) {
+                console.error(e === null || e === void 0 ? void 0 : e.message);
+            }
+        }
         return v;
     };
-    retVal.dispose = () => {
+    retVal.delete = () => {
         var _a;
         try {
             (_a = i === null || i === void 0 ? void 0 : i._node) === null || _a === void 0 ? void 0 : _a.remove();
@@ -7045,91 +7133,52 @@ function createImportVariable(name, alias) {
         v = main.variable();
         v.import(name, alias, otherModule);
     };
-    retVal.dispose = () => {
+    retVal.delete = () => {
         v === null || v === void 0 ? void 0 : v.delete();
     };
     return retVal;
 }
-async function createModule(parsed, text, baseUrl) {
-    const otherModule = isRelativePath(parsed.src) ?
-        await importFile(parsed.src, baseUrl) :
-        await importCompiledNotebook(parsed.src);
-    const importVariables = [];
-    const variables = [];
-    parsed.specifiers.forEach(spec => {
-        const viewof = spec.view ? "viewof " : "";
-        importVariables.push(createImportVariable(viewof + spec.name, viewof + spec.alias));
-        if (spec.view) {
-            importVariables.push(createImportVariable(spec.name, spec.alias));
-        }
-    });
-    variables.push(createVariable(true, undefined, ["md"], md => {
-        return md `\`\`\`JavaScript
-${text}
-\`\`\``;
-    }));
-    const retVal = (runtime, main, inspector) => {
-        let mod = runtime.module(otherModule);
-        if (parsed.injections.length) {
-            mod = mod.derive(parsed.injections, main);
-        }
-        variables.forEach(v => v(main, inspector));
-        importVariables.forEach(v => v(main, mod));
-        return mod;
-    };
-    retVal.importVariables = importVariables;
-    retVal.variables = variables;
-    retVal.dispose = () => {
-        importVariables.forEach(v => v.dispose());
-        variables.forEach(v => v.dispose());
-        otherModule.dispose();
-    };
-    retVal.write = (w) => {
-        otherModule.write(w);
-        w.importDefine(parsed);
-    };
-    return retVal;
-}
-async function createCell(node, baseUrl) {
+// Cell  ---
+async function createCell(node, options) {
     const modules = [];
     const variables = [];
     try {
         const text = node.mode && node.mode !== "js" ? `${node.mode}\`${encodeBacktick(node.value)}\`` : node.value;
         const parsedModule = splitModule(text);
-        for (const text of parsedModule) {
-            const parsed = parseCell(text);
+        for (const cell of parsedModule) {
+            const parsed = parseCell(cell.text, options.baseUrl);
             switch (parsed.type) {
                 case "import":
-                    modules.push(await createModule(parsed, text, baseUrl));
+                    modules.push(await createModule(node, parsed, cell.text, options));
                     break;
                 case "viewof":
-                    variables.push(createVariable(true, parsed.variable.id, parsed.variable.inputs, parsed.variable.func));
-                    variables.push(createVariable(false, parsed.variableValue.id, parsed.variableValue.inputs, parsed.variableValue.func, true));
+                    variables.push(createVariable(node, true, parsed.variable.id, parsed.variable.inputs, parsed.variable.func));
+                    variables.push(createVariable(node, false, parsed.variableValue.id, parsed.variableValue.inputs, parsed.variableValue.func, true));
                     break;
                 case "mutable":
-                    variables.push(createVariable(false, parsed.initial.id, parsed.initial.inputs, parsed.initial.func));
-                    variables.push(createVariable(false, parsed.variable.id, parsed.variable.inputs, parsed.variable.func));
-                    variables.push(createVariable(true, parsed.variableValue.id, parsed.variableValue.inputs, parsed.variableValue.func, true));
+                    variables.push(createVariable(node, false, parsed.initial.id, parsed.initial.inputs, parsed.initial.func));
+                    variables.push(createVariable(node, false, parsed.variable.id, parsed.variable.inputs, parsed.variable.func));
+                    variables.push(createVariable(node, true, parsed.variableValue.id, parsed.variableValue.inputs, parsed.variableValue.func, true));
                     break;
                 case "variable":
-                    variables.push(createVariable(true, parsed.id, parsed.inputs, parsed.func));
+                    variables.push(createVariable(node, true, parsed.id, parsed.inputs, parsed.func));
                     break;
             }
         }
     }
     catch (e) {
-        variables.push(createVariable(true, undefined, [], e.message));
+        variables.push(createVariable(node, true, undefined, [], e.message));
     }
     const retVal = (runtime, main, inspector) => {
         modules.forEach(imp => imp(runtime, main, inspector));
         variables.forEach(v => v(main, inspector));
     };
-    retVal.id = "" + node.id;
+    retVal.id = node.id;
     retVal.modules = modules;
     retVal.variables = variables;
-    retVal.dispose = () => {
-        variables.forEach(v => v.dispose());
-        modules.forEach(mod => mod.dispose());
+    retVal.delete = () => {
+        variables.forEach(v => v.delete());
+        modules.forEach(mod => mod.delete());
     };
     retVal.write = (w) => {
         modules.forEach(imp => imp.write(w));
@@ -7137,20 +7186,20 @@ async function createCell(node, baseUrl) {
     };
     return retVal;
 }
-function createFile(file, baseUrl) {
+//  File  ---
+function createFile(file, options) {
     function toString() { return globalThis.url; }
-    return [file.name, { url: new URL(fullUrl(file.url, baseUrl)), mimeType: file.mime_type, toString }];
+    return [file.name, { url: new URL(fixRelativeUrl(file.url, options.baseUrl)), mimeType: file.mime_type, toString }];
 }
-async function compile(notebook, baseUrl = ".") {
-    const files = notebook.files.map(f => createFile(f, baseUrl));
+function notebook(_files = [], _cells = [], { baseUrl = ".", importMode = "precompiled" } = {}) {
+    const files = _files.map(f => createFile(f, { baseUrl, importMode }));
     const fileAttachments = new Map(files);
-    const _cells = await Promise.all(notebook.nodes.map(n => createCell(n, baseUrl)));
     const cells = new Map(_cells.map(c => [c.id, c]));
     const retVal = (runtime, inspector) => {
         const main = runtime.module();
         main.builtin("FileAttachment", runtime.fileAttachments(name => {
             var _a;
-            return (_a = fileAttachments.get(name)) !== null && _a !== void 0 ? _a : { url: new URL(fullUrl(name, baseUrl)), mimeType: null };
+            return (_a = fileAttachments.get(name)) !== null && _a !== void 0 ? _a : { url: new URL(fixRelativeUrl(name, baseUrl)), mimeType: null };
         }));
         main.builtin("fetchEx", fetchEx);
         cells.forEach(cell => {
@@ -7160,25 +7209,29 @@ async function compile(notebook, baseUrl = ".") {
     };
     retVal.fileAttachments = fileAttachments;
     retVal.cells = cells;
-    retVal.appendCell = async (n, baseUrl) => {
-        const cell = await createCell(n, baseUrl);
-        retVal.disposeCell(cell.id);
+    retVal.set = async (n) => {
+        const cell = await createCell(n, { baseUrl, importMode });
+        retVal.delete(cell.id);
         cells.set(cell.id, cell);
         return cell;
     };
-    retVal.disposeCell = async (id) => {
+    retVal.get = (id) => {
+        return cells.get(id);
+    };
+    retVal.delete = (id) => {
         const cell = cells.get(id);
         if (cell) {
-            cells.delete(id);
-            cell.dispose();
+            cell.delete();
+            return cells.delete(id);
         }
+        return false;
     };
-    retVal.dispose = () => {
-        cells.forEach(cell => cell.dispose());
+    retVal.clear = () => {
+        cells.forEach(cell => cell.delete());
         cells.clear();
     };
     retVal.write = (w) => {
-        w.files(notebook.files);
+        w.files(_files);
         cells.forEach(cell => cell.write(w));
     };
     retVal.toString = (w = new Writer()) => {
@@ -7187,6 +7240,11 @@ async function compile(notebook, baseUrl = ".") {
     };
     return retVal;
 }
+async function compile(notebookOrOjs, { baseUrl = ".", importMode = "precompiled" } = {}) {
+    const ojsNotebook = typeof notebookOrOjs === "string" ? ojs2notebook(notebookOrOjs) : notebookOrOjs;
+    const _cells = await Promise.all(ojsNotebook.nodes.map(n => createCell(n, { baseUrl, importMode })));
+    return notebook(ojsNotebook.files, _cells, { baseUrl, importMode });
+}
 
-export { compile, download, ojs2notebook, omd2notebook, parseOmd };
+export { compile, download, notebook, ojs2notebook, omd2notebook };
 //# sourceMappingURL=index.esm.js.map