@hpcc-js/observablehq-compiler 1.1.2 → 1.1.4

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@hpcc-js/observablehq-compiler",
-    "version": "1.1.2",
+    "version": "1.1.4",
     "description": "hpcc-js - ObservableHQ Compiler (unoffical)",
     "keywords": [
         "observablehq",
@@ -56,14 +56,14 @@
         "update": "npx --yes npm-check-updates -u -t minor"
     },
     "dependencies": {
-        "@hpcc-js/observable-shim": "^2.3.0",
+        "@hpcc-js/observable-shim": "^2.3.1",
         "node-fetch": "3.2.10",
         "yargs": "17.5.1"
     },
     "devDependencies": {
         "@hpcc-js/bundle": "^2.11.3",
-        "@hpcc-js/util": "^2.49.1",
-        "@observablehq/runtime": "4.24.0",
+        "@hpcc-js/util": "^2.50.0",
+        "@observablehq/runtime": "4.25.0",
         "tslib": "2.4.0"
     },
     "repository": {
@@ -77,5 +77,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization/tree/trunk/packages/observablehq-compiler",
-    "gitHead": "b7e51b0f73c04df612c13cb0bb298d516c4be6f9"
+    "gitHead": "113e49eefde98196062fbf4150b20e833c4c8c19"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/observablehq-compiler";
-export const PKG_VERSION = "1.1.2";
-export const BUILD_VERSION = "2.104.5";
+export const PKG_VERSION = "1.1.4";
+export const BUILD_VERSION = "2.104.8";

package/src/__tests__/node.ts

@@ -98,8 +98,8 @@ describe("ojs", function () {
 
     await main.value("tenTimes");
 
-    for (const cell of define.cells) {
-      cell.dispose();
+    for (const cellID in define.cells) {
+      define.disposeCell(cellID);
       break;
     }
   });

package/src/compiler.md

@@ -107,12 +107,12 @@ Putting it all together:
                   mode: "js"
               },
               {
-                  id: 1,
+                  id: 2,
                   value: "h = \"Hello\"",
                   mode: "js"
               },
               {
-                  id: 2,
+                  id: 3,
                   value: "w = \"World\"",
                   mode: "js"
               }
@@ -153,12 +153,12 @@ To output the generated code simply call `toString` on the compiled function:
                   mode: "js"
               },
               {
-                  id: 1,
+                  id: 2,
                   value: "h = \"Hello\"",
                   mode: "js"
               },
               {
-                  id: 2,
+                  id: 3,
                   value: "w = \"World\"",
                   mode: "js"
               }

package/src/compiler.ts

@@ -1,10 +1,13 @@
-import type { ohq } from "@hpcc-js/observable-shim";
+import { ohq, splitModule } from "@hpcc-js/observable-shim";
 
 import { endsWith, join } from "@hpcc-js/util";
 import { parseCell, ParsedImportCell } from "./cst";
 import { Writer } from "./writer";
 import { encodeBacktick, fetchEx, obfuscatedImport, ojs2notebook, omd2notebook } from "./util";
 
+const isRelativePath = (path: string) => path[0] === ".";
+const fullUrl = (path: string, basePath: string) => isRelativePath(path) ? join(basePath, path) : path;
+
 interface ImportDefine {
     (runtime: ohq.Runtime, inspector?: ohq.InspectorFactory): ohq.Module;
     dispose: () => void;
@@ -12,7 +15,7 @@ interface ImportDefine {
 }
 
 async function importFile(relativePath: string, baseUrl: string) {
-    const path = join(baseUrl, relativePath);
+    const path = fullUrl(relativePath, baseUrl);
     const content = await fetchEx(path).then(r => r.text());
     let notebook: ohq.Notebook;
     if (endsWith(relativePath, ".ojsnb")) {
@@ -126,7 +129,7 @@ function createImportVariable(name?: string, alias?: string) {
 type ImportVariableFunc = ReturnType<typeof createImportVariable>;
 
 async function createModule(parsed: ParsedImportCell, text: string, baseUrl: string) {
-    const otherModule = [".", "/"].indexOf(parsed.src[0]) === 0 ?
+    const otherModule = isRelativePath(parsed.src) ?
         await importFile(parsed.src, baseUrl) :
         await importCompiledNotebook(parsed.src);
 
@@ -175,31 +178,36 @@ async function createCell(node: ohq.Node, baseUrl: string) {
     const variables: VariableFunc[] = [];
     try {
         const text = node.mode && node.mode !== "js" ? `${node.mode}\`${encodeBacktick(node.value)}\`` : node.value;
-        const parsed = parseCell(text);
-        switch (parsed.type) {
-            case "import":
-                modules.push(await createModule(parsed, text, baseUrl));
-                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));
-                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));
-                break;
-            case "variable":
-                variables.push(createVariable(true, parsed.id, parsed.inputs, parsed.func));
-                break;
+        const parsedModule = splitModule(text);
+        for (const text of parsedModule) {
+            const parsed = parseCell(text);
+            switch (parsed.type) {
+                case "import":
+                    modules.push(await createModule(parsed, text, baseUrl));
+                    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));
+                    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));
+                    break;
+                case "variable":
+                    variables.push(createVariable(true, parsed.id, parsed.inputs, parsed.func));
+                    break;
+            }
         }
     } catch (e) {
+        variables.push(createVariable(true, undefined, [], e.message));
     }
 
     const retVal = (runtime: ohq.Runtime, main: ohq.Module, inspector?: ohq.InspectorFactory) => {
         modules.forEach(imp => imp(runtime, main, inspector));
         variables.forEach(v => v(main, inspector));
     };
+    retVal.id = "" + node.id;
     retVal.modules = modules;
     retVal.variables = variables;
     retVal.dispose = () => {
@@ -214,23 +222,26 @@ async function createCell(node: ohq.Node, baseUrl: string) {
 }
 export type CellFunc = Awaited<ReturnType<typeof createCell>>;
 
-function createFile(file: ohq.File): [string, any] {
+function createFile(file: ohq.File, baseUrl: string): [string, any] {
     function toString() { return globalThis.url; }
-    return [file.name, { url: new URL(file.url), mimeType: file.mime_type, toString }];
+    return [file.name, { url: new URL(fullUrl(file.url, baseUrl)), mimeType: file.mime_type, toString }];
 }
 export type FileFunc = ReturnType<typeof createFile>;
 
 export async function compile(notebook: ohq.Notebook, baseUrl: string = ".") {
 
-    const files = notebook.files.map(f => createFile(f));
+    const files = notebook.files.map(f => createFile(f, baseUrl));
     const fileAttachments = new Map<string, any>(files);
-    let cells: CellFunc[] = await Promise.all(notebook.nodes.map(n => createCell(n, baseUrl)));
+    const _cells: CellFunc[] = await Promise.all(notebook.nodes.map(n => createCell(n, baseUrl)));
+    const cells = new Map<string, CellFunc>(_cells.map(c => [c.id, c]));
 
     const retVal = (runtime: ohq.Runtime, inspector?: ohq.InspectorFactory): ohq.Module => {
         const main = runtime.module();
         main.builtin("FileAttachment", runtime.fileAttachments(name => {
-            return fileAttachments.get(name) ?? { url: new URL(name), mimeType: null };
+            return fileAttachments.get(name) ?? { url: new URL(fullUrl(name, baseUrl)), mimeType: null };
         }));
+        main.builtin("fetchEx", fetchEx);
+
         cells.forEach(cell => {
             cell(runtime, main, inspector);
         });
@@ -238,18 +249,22 @@ export async function compile(notebook: ohq.Notebook, baseUrl: string = ".") {
     };
     retVal.fileAttachments = fileAttachments;
     retVal.cells = cells;
-    retVal.appendCell = async (n: ohq.Node, baseUrl: string = ".") => {
+    retVal.appendCell = async (n: ohq.Node, baseUrl) => {
         const cell = await createCell(n, baseUrl);
-        cells.push(cell);
+        retVal.disposeCell(cell.id);
+        cells.set(cell.id, cell);
         return cell;
     };
-    retVal.disposeCell = async (cell: CellFunc) => {
-        cells = cells.filter(c => c !== cell);
-        cell.dispose();
+    retVal.disposeCell = async (id: string) => {
+        const cell = cells.get(id);
+        if (cell) {
+            cells.delete(id);
+            cell.dispose();
+        }
     };
     retVal.dispose = () => {
         cells.forEach(cell => cell.dispose());
-        cells = [];
+        cells.clear();
     };
     retVal.write = (w: Writer) => {
         w.files(notebook.files);

package/src/index.ts

@@ -1,7 +1,6 @@
 export type { ohq } from "@hpcc-js/observable-shim";
 
 export * from "./compiler";
-export { ojs2notebook, omd2notebook, download } from "./util";
-export * from "./writer";
+export { ojs2notebook, omd2notebook, parseOmd, download } from "./util";
 
 import "../src/index.css";

package/src/util.ts

@@ -1,5 +1,5 @@
 import type { ohq } from "@hpcc-js/observable-shim";
-import { parseModule } from "@hpcc-js/observable-shim";
+import { parseCell, splitModule } from "@hpcc-js/observable-shim";
 
 const FuncTypes = {
     functionType: Object.getPrototypeOf(function () { }).constructor,
@@ -50,6 +50,8 @@ interface ParsedOJS {
     ojs: string;
     offset: number;
     inlineMD: boolean;
+    cell: any;
+    error: any;
 }
 
 export function encodeBacktick(str: string) {
@@ -59,14 +61,23 @@ export function encodeBacktick(str: string) {
 }
 
 function createParsedOJS(ojs: string, offset: number, inlineMD: boolean): ParsedOJS {
+    let cell;
+    let error;
+    try {
+        cell = parseCell(ojs);
+    } catch (e) {
+        error = e;
+    }
     return {
         ojs,
         offset,
-        inlineMD
+        inlineMD,
+        cell,
+        error
     };
 }
 
-function parseOmd(_: string): ParsedOJS[] {
+export function parseOmd(_: string): ParsedOJS[] {
     const retVal: ParsedOJS[] = [];
     //  Load Markdown  ---
     const re = /(```(?:\s|\S)[\s\S]*?```)/g;
@@ -101,7 +112,7 @@ export function notebook2ojs(_: string): ParsedOJS[] {
 }
 
 export function ojs2notebook(ojs: string): ohq.Notebook {
-    const cells = parseModule(ojs);
+    const cells = splitModule(ojs);
     return {
         files: [],
         nodes: cells.map((cell, idx) => {
@@ -128,14 +139,14 @@ export function omd2notebook(omd: string): ohq.Notebook {
     } as ohq.Notebook;
 }
 
-export function fetchEx(url: string) {
+export function fetchEx(url: string, proxyPrefix = "https://observable-cors.glitch.me/", proxyPostfix = "") {
     return fetch(url)
         .then(response => {
             if (response.ok) return response;
             throw new Error("CORS?");
         }).catch(e => {
             const matches = url.match(/^(?:https?:\/\/)?(?:[^@\n]+@)?(?:www\.)?([^:\/\n?]+)/img);
-            url = "https://observable-cors.glitch.me/" + url;
+            url = `${proxyPrefix}${url}${proxyPostfix}`;
             return fetch(url, {
                 headers: {
                     origin: matches[0],
@@ -150,5 +161,4 @@ export function download(impUrl: string): Promise<ohq.Notebook> {
     return fetchEx(impUrl.replace(`https://observablehq.com/${isShared ? "d/" : ""}`, "https://api.observablehq.com/document/"))
         .then(r => r.json())
         ;
-
 }

package/types/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/observablehq-compiler";
-export declare const PKG_VERSION = "1.1.2";
-export declare const BUILD_VERSION = "2.104.5";
+export declare const PKG_VERSION = "1.1.4";
+export declare const BUILD_VERSION = "2.104.8";
 //# sourceMappingURL=__package__.d.ts.map

package/types/compiler.d.ts

@@ -1,7 +1,8 @@
-import type { ohq } from "@hpcc-js/observable-shim";
+import { ohq } from "@hpcc-js/observable-shim";
 import { Writer } from "./writer";
 declare function createCell(node: ohq.Node, baseUrl: string): Promise<{
     (runtime: ohq.Runtime, main: ohq.Module, inspector?: ohq.InspectorFactory): void;
+    id: string;
     modules: {
         (runtime: ohq.Runtime, main: ohq.Module, inspector?: ohq.InspectorFactory): ohq.Module;
         importVariables: {
@@ -25,13 +26,14 @@ declare function createCell(node: ohq.Node, baseUrl: string): Promise<{
     write(w: Writer): void;
 }>;
 export declare type CellFunc = Awaited<ReturnType<typeof createCell>>;
-declare function createFile(file: ohq.File): [string, any];
+declare function createFile(file: ohq.File, baseUrl: string): [string, any];
 export declare type FileFunc = ReturnType<typeof createFile>;
 export declare function compile(notebook: ohq.Notebook, baseUrl?: string): Promise<{
     (runtime: ohq.Runtime, inspector?: ohq.InspectorFactory): ohq.Module;
     fileAttachments: Map<string, any>;
-    cells: {
+    cells: Map<string, {
         (runtime: ohq.Runtime, main: ohq.Module, inspector?: ohq.InspectorFactory): void;
+        id: string;
         modules: {
             (runtime: ohq.Runtime, main: ohq.Module, inspector?: ohq.InspectorFactory): ohq.Module;
             importVariables: {
@@ -53,9 +55,10 @@ export declare function compile(notebook: ohq.Notebook, baseUrl?: string): Promi
         }[];
         dispose(): void;
         write(w: Writer): void;
-    }[];
-    appendCell(n: ohq.Node, baseUrl?: string): Promise<{
+    }>;
+    appendCell(n: ohq.Node, baseUrl: any): Promise<{
         (runtime: ohq.Runtime, main: ohq.Module, inspector?: ohq.InspectorFactory): void;
+        id: string;
         modules: {
             (runtime: ohq.Runtime, main: ohq.Module, inspector?: ohq.InspectorFactory): ohq.Module;
             importVariables: {
@@ -78,7 +81,7 @@ export declare function compile(notebook: ohq.Notebook, baseUrl?: string): Promi
         dispose(): void;
         write(w: Writer): void;
     }>;
-    disposeCell(cell: CellFunc): Promise<void>;
+    disposeCell(id: string): Promise<void>;
     dispose(): void;
     write(w: Writer): void;
     toString(w?: Writer): string;

package/types/compiler.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../src/compiler.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAIpD,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AAwKlC,iBAAe,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM;cA0B5B,IAAI,OAAO,QAAQ,IAAI,MAAM,cAAc,IAAI,gBAAgB;;;;;;;;;;;;;;;;;;;;;aAUrE,MAAM;GAK5B;AACD,oBAAY,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC;AAE9D,iBAAS,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAGjD;AACD,oBAAY,QAAQ,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAErD,wBAAsB,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,OAAO,GAAE,MAAY;cAM9C,IAAI,OAAO,cAAc,IAAI,gBAAgB,GAAG,IAAI,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;kBAYrD,QAAQ,YAAW,MAAM;;;;;;;;;;;;;;;;;;;;;;;;sBAKrB,QAAQ;;aAQvB,MAAM;;GAS5B;AACD,oBAAY,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC"}
+{"version":3,"file":"compiler.d.ts","sourceRoot":"","sources":["../src/compiler.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAe,MAAM,0BAA0B,CAAC;AAI5D,OAAO,EAAE,MAAM,EAAE,MAAM,UAAU,CAAC;AA2KlC,iBAAe,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM;cA8B5B,IAAI,OAAO,QAAQ,IAAI,MAAM,cAAc,IAAI,gBAAgB;;;;;;;;;;;;;;;;;;;;;;aAWrE,MAAM;GAK5B;AACD,oBAAY,QAAQ,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC,CAAC;AAE9D,iBAAS,UAAU,CAAC,IAAI,EAAE,GAAG,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,GAAG,CAAC,MAAM,EAAE,GAAG,CAAC,CAGlE;AACD,oBAAY,QAAQ,GAAG,UAAU,CAAC,OAAO,UAAU,CAAC,CAAC;AAErD,wBAAsB,OAAO,CAAC,QAAQ,EAAE,GAAG,CAAC,QAAQ,EAAE,OAAO,GAAE,MAAY;cAO9C,IAAI,OAAO,cAAc,IAAI,gBAAgB,GAAG,IAAI,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;kBAcrD,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;oBAMN,MAAM;;aAWnB,MAAM;;GAS5B;AACD,oBAAY,WAAW,GAAG,OAAO,CAAC,UAAU,CAAC,OAAO,OAAO,CAAC,CAAC,CAAC"}

package/types/index.d.ts

@@ -1,6 +1,5 @@
 export type { ohq } from "@hpcc-js/observable-shim";
 export * from "./compiler";
-export { ojs2notebook, omd2notebook, download } from "./util";
-export * from "./writer";
+export { ojs2notebook, omd2notebook, parseOmd, download } from "./util";
 import "../src/index.css";
 //# sourceMappingURL=index.d.ts.map

package/types/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAEpD,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC9D,cAAc,UAAU,CAAC;AAEzB,OAAO,kBAAkB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAEpD,cAAc,YAAY,CAAC;AAC3B,OAAO,EAAE,YAAY,EAAE,YAAY,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAExE,OAAO,kBAAkB,CAAC"}

package/types/util.d.ts

@@ -15,12 +15,15 @@ interface ParsedOJS {
     ojs: string;
     offset: number;
     inlineMD: boolean;
+    cell: any;
+    error: any;
 }
 export declare function encodeBacktick(str: string): string;
+export declare function parseOmd(_: string): ParsedOJS[];
 export declare function notebook2ojs(_: string): ParsedOJS[];
 export declare function ojs2notebook(ojs: string): ohq.Notebook;
 export declare function omd2notebook(omd: string): ohq.Notebook;
-export declare function fetchEx(url: string): Promise<Response>;
+export declare function fetchEx(url: string, proxyPrefix?: string, proxyPostfix?: string): Promise<Response>;
 export declare function download(impUrl: string): Promise<ohq.Notebook>;
 export {};
 //# sourceMappingURL=util.d.ts.map

package/types/util.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAiBpD,UAAU,GAAG;IACT,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,IAAI;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;CAClB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,UAAQ,EAAE,SAAS,UAAQ,EAAE,cAAc,UAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,OAYjH;AAGD,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,gBAEjD;AAED,UAAU,SAAS;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;CACrB;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,UAIzC;AAuCD,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,CAGnD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CAYtD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CAYtD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,qBAelC;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAM9D"}
+{"version":3,"file":"util.d.ts","sourceRoot":"","sources":["../src/util.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,GAAG,EAAE,MAAM,0BAA0B,CAAC;AAiBpD,UAAU,GAAG;IACT,KAAK,EAAE,MAAM,CAAC;IACd,GAAG,EAAE,MAAM,CAAC;IACZ,OAAO,EAAE,MAAM,CAAA;CAClB;AAED,MAAM,WAAW,IAAI;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,IAAI,EAAE,MAAM,EAAE,CAAC;IACf,OAAO,EAAE,GAAG,EAAE,CAAC;CAClB;AAED,wBAAgB,cAAc,CAAC,IAAI,EAAE,IAAI,EAAE,KAAK,UAAQ,EAAE,SAAS,UAAQ,EAAE,cAAc,UAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,OAYjH;AAGD,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,gBAEjD;AAED,UAAU,SAAS;IACf,GAAG,EAAE,MAAM,CAAC;IACZ,MAAM,EAAE,MAAM,CAAC;IACf,QAAQ,EAAE,OAAO,CAAC;IAClB,IAAI,EAAE,GAAG,CAAC;IACV,KAAK,EAAE,GAAG,CAAC;CACd;AAED,wBAAgB,cAAc,CAAC,GAAG,EAAE,MAAM,UAIzC;AAmBD,wBAAgB,QAAQ,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,CA2B/C;AAED,wBAAgB,YAAY,CAAC,CAAC,EAAE,MAAM,GAAG,SAAS,EAAE,CAGnD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CAYtD;AAED,wBAAgB,YAAY,CAAC,GAAG,EAAE,MAAM,GAAG,GAAG,CAAC,QAAQ,CAYtD;AAED,wBAAgB,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,WAAW,SAAuC,EAAE,YAAY,SAAK,qBAezG;AAED,wBAAgB,QAAQ,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,CAK9D"}

package/types-3.4/__package__.d.ts

@@ -1,4 +1,4 @@
 export declare const PKG_NAME = "@hpcc-js/observablehq-compiler";
-export declare const PKG_VERSION = "1.1.2";
-export declare const BUILD_VERSION = "2.104.5";
+export declare const PKG_VERSION = "1.1.4";
+export declare const BUILD_VERSION = "2.104.8";
 //# sourceMappingURL=__package__.d.ts.map

package/types-3.4/compiler.d.ts

@@ -2,6 +2,7 @@ import { ohq } from "@hpcc-js/observable-shim";
 import { Writer } from "./writer";
 declare function createCell(node: ohq.Node, baseUrl: string): Promise<{
     (runtime: ohq.Runtime, main: ohq.Module, inspector?: ohq.InspectorFactory): void;
+    id: string;
     modules: {
         (runtime: ohq.Runtime, main: ohq.Module, inspector?: ohq.InspectorFactory): ohq.Module;
         importVariables: {
@@ -25,7 +26,7 @@ declare function createCell(node: ohq.Node, baseUrl: string): Promise<{
     write(w: Writer): void;
 }>;
 export declare type CellFunc = Awaited<ReturnType<typeof createCell>>;
-declare function createFile(file: ohq.File): [
+declare function createFile(file: ohq.File, baseUrl: string): [
     string,
     any
 ];
@@ -33,8 +34,9 @@ export declare type FileFunc = ReturnType<typeof createFile>;
 export declare function compile(notebook: ohq.Notebook, baseUrl?: string): Promise<{
     (runtime: ohq.Runtime, inspector?: ohq.InspectorFactory): ohq.Module;
     fileAttachments: Map<string, any>;
-    cells: {
+    cells: Map<string, {
         (runtime: ohq.Runtime, main: ohq.Module, inspector?: ohq.InspectorFactory): void;
+        id: string;
         modules: {
             (runtime: ohq.Runtime, main: ohq.Module, inspector?: ohq.InspectorFactory): ohq.Module;
             importVariables: {
@@ -56,9 +58,10 @@ export declare function compile(notebook: ohq.Notebook, baseUrl?: string): Promi
         }[];
         dispose(): void;
         write(w: Writer): void;
-    }[];
-    appendCell(n: ohq.Node, baseUrl?: string): Promise<{
+    }>;
+    appendCell(n: ohq.Node, baseUrl: any): Promise<{
         (runtime: ohq.Runtime, main: ohq.Module, inspector?: ohq.InspectorFactory): void;
+        id: string;
         modules: {
             (runtime: ohq.Runtime, main: ohq.Module, inspector?: ohq.InspectorFactory): ohq.Module;
             importVariables: {
@@ -81,7 +84,7 @@ export declare function compile(notebook: ohq.Notebook, baseUrl?: string): Promi
         dispose(): void;
         write(w: Writer): void;
     }>;
-    disposeCell(cell: CellFunc): Promise<void>;
+    disposeCell(id: string): Promise<void>;
     dispose(): void;
     write(w: Writer): void;
     toString(w?: Writer): string;

package/types-3.4/index.d.ts

@@ -1,6 +1,5 @@
 export { ohq } from "@hpcc-js/observable-shim";
 export * from "./compiler";
-export { ojs2notebook, omd2notebook, download } from "./util";
-export * from "./writer";
+export { ojs2notebook, omd2notebook, parseOmd, download } from "./util";
 import "../src/index.css";
 //# sourceMappingURL=index.d.ts.map

package/types-3.4/util.d.ts

@@ -15,12 +15,15 @@ interface ParsedOJS {
     ojs: string;
     offset: number;
     inlineMD: boolean;
+    cell: any;
+    error: any;
 }
 export declare function encodeBacktick(str: string): string;
+export declare function parseOmd(_: string): ParsedOJS[];
 export declare function notebook2ojs(_: string): ParsedOJS[];
 export declare function ojs2notebook(ojs: string): ohq.Notebook;
 export declare function omd2notebook(omd: string): ohq.Notebook;
-export declare function fetchEx(url: string): Promise<Response>;
+export declare function fetchEx(url: string, proxyPrefix?: string, proxyPostfix?: string): Promise<Response>;
 export declare function download(impUrl: string): Promise<ohq.Notebook>;
 export {};
 //# sourceMappingURL=util.d.ts.map

package/src/__tests__/tsconfig.json

@@ -1,21 +0,0 @@
-{
-    "extends": "../tsconfig.settings.json",
-    "compilerOptions": {
-        "rootDir": "./src",
-        "outDir": "./lib-umd",
-        "declarationDir": "./types",
-        "target": "ES2018",
-        "noImplicitThis": true,
-        "resolveJsonModule": true,
-        "lib": [
-            "dom",
-            "ES2018"
-        ],
-        "types": [
-            "mocha"
-        ]
-    },
-    "include": [
-        "./src/**/*"
-    ]
-}