@hpcc-js/observablehq-compiler 1.3.0 → 3.1.0

package/package.json

@@ -1,74 +1,63 @@
 {
     "name": "@hpcc-js/observablehq-compiler",
-    "version": "1.3.0",
+    "version": "3.1.0",
     "description": "hpcc-js - ObservableHQ Compiler (unoffical)",
-    "keywords": [
-        "observablehq",
-        "markdown",
-        "observable",
-        "compiler",
-        "interpreter",
-        "renderer"
-    ],
-    "main": "dist/index.js",
-    "module": "dist/index.esm.js",
-    "browser": "dist/index.js",
-    "unpkg": "dist/index.min.js",
-    "jsdelivr": "dist/index.min.js",
-    "types": "types/index.d.ts",
-    "typesVersions": {
-        "<3.8": {
-            "*": [
-                "types-3.4/index.d.ts"
-            ]
+    "type": "module",
+    "exports": {
+        ".": {
+            "types": "./types/index.d.ts",
+            "default": "./dist/index.js"
         }
     },
-    "bin": {
-        "ojscc": "bin/ojscc.mjs"
-    },
+    "main": "./dist/index.js",
+    "types": "./types/index.d.ts",
     "files": [
         "dist/*",
-        "types/*",
-        "types-3.4/*",
-        "src/*"
+        "src/*",
+        "types/*"
     ],
+    "bin": {
+        "ojscc": "bin/ojscc.mjs"
+    },
     "scripts": {
-        "clean": "rimraf --glob lib* dist* types *.tsbuildinfo",
-        "compile-es6": "tsc --module es2020 --outDir ./lib-es6",
-        "compile-es6-watch": "npm run compile-es6 -- -w",
-        "compile-umd": "tsc --module umd --outDir ./lib-umd",
-        "compile-umd-watch": "npm run compile-umd -- -w",
-        "bundle": "rollup -c",
-        "bundle-watch": "npm run bundle -- -w",
-        "minimize-index": "terser dist/index.js -c -m --source-map \"content='dist/index.js.map',url='index.min.js.map'\" -o dist/index.min.js",
-        "minimize-index-es6": "terser dist/index.esm.js -c -m --source-map \"content='dist/index.esm.js.map',url='index.esm.min.js.map'\" -o dist/index.esm.min.js",
-        "minimize": "run-p minimize-index minimize-index-es6",
-        "gen-legacy-types": "downlevel-dts ./types ./types-3.4",
-        "build": "npm run compile-es6 && npm run bundle",
-        "watch": "npm-run-all compile-es6 -p compile-es6-watch bundle-watch",
+        "clean": "rimraf --glob lib* types dist dist-test *.tsbuildinfo .turbo",
+        "bundle": "node esbuild.js",
+        "bundle-watch": "npm run bundle -- --development --watch",
+        "gen-types": "tsc --project tsconfig.json",
+        "gen-types-watch": "npm run gen-types -- --watch",
+        "build": "run-p gen-types bundle",
         "stamp": "node ../../node_modules/@hpcc-js/bundle/src/stamp.js",
         "lint": "eslint ./src",
         "docs": "typedoc --options tdoptions.json .",
-        "dev-start": "ws",
-        "test-cli": "node ./bin/ojscc.mjs --version",
-        "test-node": "mocha ./dist-test/index.mjs --reporter spec",
-        "test": "run-s test-cli test-node",
-        "update": "npx --yes npm-check-updates -u -t minor"
+        "test-browser": "vitest run --project browser",
+        "test-node": "vitest run --project node",
+        "test-both": "vitest run",
+        "test-bin": "node ./bin/ojscc.mjs --version",
+        "test": "run-p test-both test-bin",
+        "coverage": "vitest run --coverage",
+        "update": "npx -y npm-check-updates -u -t minor",
+        "update-major": "npx -y npm-check-updates -u"
     },
     "dependencies": {
-        "@hpcc-js/observable-shim": "^2.6.0",
-        "node-fetch": "3.3.2",
         "yargs": "17.7.2"
     },
     "devDependencies": {
-        "@hpcc-js/bundle": "^2.12.0",
-        "@observablehq/runtime": "5.9.8",
-        "tslib": "2.6.3"
+        "@hpcc-js/esbuild-plugins": "^1.2.0",
+        "@hpcc-js/observable-shim": "^3.1.0",
+        "@observablehq/runtime": "5.9.9"
     },
     "repository": {
         "type": "git",
         "url": "git+https://github.com/hpcc-systems/Visualization.git"
     },
+    "keywords": [
+        "observablehq",
+        "markdown",
+        "observable",
+        "compiler",
+        "interpreter",
+        "renderer"
+    ],
     "author": "Gordon Smith <gordonjsmith@gmail.com>",
     "contributors": [],
     "license": "Apache-2.0",
@@ -76,5 +65,5 @@
         "url": "https://github.com/hpcc-systems/Visualization/issues"
     },
     "homepage": "https://github.com/hpcc-systems/Visualization/tree/trunk/packages/observablehq-compiler",
-    "gitHead": "99332f074dd1fff0cbb8eae52c5b6c98d6ad5a7a"
+    "gitHead": "1fc4d0ad31fe8e30ae5348fdee67284df4c928ed"
 }

package/src/__package__.ts

@@ -1,3 +1,3 @@
 export const PKG_NAME = "@hpcc-js/observablehq-compiler";
-export const PKG_VERSION = "1.3.0";
-export const BUILD_VERSION = "2.106.0";
+export const PKG_VERSION = "3.1.0";
+export const BUILD_VERSION = "2.107.0";

package/src/compiler.ts

@@ -1,16 +1,16 @@
 import { ohq, splitModule } from "@hpcc-js/observable-shim";
-import { parseCell, ParsedImportCell } from "./cst";
-import { Writer } from "./writer";
-import { fixRelativeUrl, isRelativePath, encodeBacktick, fetchEx, obfuscatedImport, ojs2notebook, omd2notebook } from "./util";
+import { parseCell, ParsedImportCell } from "./cst.ts";
+import { Writer } from "./writer.ts";
+import { fixRelativeUrl, isRelativePath, encodeBacktick, fetchEx, obfuscatedImport, ojs2notebook, omd2notebook } from "./util.ts";
 
 //  Inspector Factory  ---
 export type InspectorFactoryEx = (name: string | undefined, id: string | number) => Inspector;
 
 export interface Inspector {
     _node?: HTMLDivElement;
-    pending();
-    fulfilled(value);
-    rejected(error);
+    pending(): void;
+    fulfilled(value: any): void;
+    rejected(error: Error): void;
 }
 
 //  Module  ---
@@ -31,6 +31,9 @@ async function importFile(relativePath: string, baseUrl: string) {
         notebook = ojs2notebook(content);
     } else if (relativePath.endsWith(".omd")) {
         notebook = omd2notebook(content);
+    } else {
+        console.warn(`Unknown file type: ${relativePath}, assuming .ojsnb`);
+        notebook = JSON.parse(content);
     }
     const retVal: ImportDefine = compile(notebook, { baseUrl }) as any;
     retVal.delete = () => { };
@@ -44,7 +47,7 @@ async function importFile(relativePath: string, baseUrl: string) {
 async function importCompiledNotebook(partial: string) {
     const url = `https://api.observablehq.com/${partial[0] === "@" ? partial : `d/${partial}`}.js?v=3`;
     let impMod = {
-        default: function (runtime: ohq.Runtime, inspector?: InspectorFactoryEx): ohq.Module {
+        default: function (runtime: ohq.Runtime, inspector?: InspectorFactoryEx): ohq.Module | undefined {
             return undefined;
         } as any
     };
@@ -80,7 +83,7 @@ async function importNotebook(partial: string) {
 
 async function createModule(node: ohq.Node, parsed: ParsedImportCell, text: string, { baseUrl, importMode }: CompileOptions) {
     const otherModule = isRelativePath(parsed.src) ?
-        await importFile(parsed.src, baseUrl) :
+        await importFile(parsed.src, baseUrl ?? "") :
         importMode === "recursive" ?
             await importNotebook(parsed.src) :
             await importCompiledNotebook(parsed.src);
@@ -123,11 +126,13 @@ type ModuleFunc = Awaited<ReturnType<typeof createModule>>;
 //  Variable  ---
 function createVariable(node: ohq.Node, inspect: boolean, name?: string, inputs?: string[], definition?: any, inline = false) {
 
-    let i: ohq.Inspector;
-    let v: ohq.Variable;
+    let i: ohq.Inspector | undefined;
+    let v: ohq.Variable | undefined;
 
     const retVal = (module: ohq.Module, inspector?: InspectorFactoryEx) => {
-        i = inspect ? inspector(name, node.id) : undefined;
+        if (inspect && inspector) {
+            i = inspector(name, node.id);
+        }
         v = module.variable(i);
         if (arguments.length > 1) {
             try {
@@ -137,9 +142,9 @@ function createVariable(node: ohq.Node, inspect: boolean, name?: string, inputs?
             }
         }
         if (node.pinned) {
-            v = module.variable(inspector(name, node.id));
+            v = inspector ? module.variable(inspector(name, node.id)) : module.variable();
             try {
-                v.define(undefined, ["md"], md => {
+                v.define(undefined, ["md"], (md: any) => {
                     return md`\`\`\`js
 ${node.value}
 \`\`\``;
@@ -174,13 +179,17 @@ ${node.value}
 }
 type VariableFunc = ReturnType<typeof createVariable>;
 
-function createImportVariable(name?: string, alias?: string) {
+function createImportVariable(name: string, alias?: string) {
 
     let v: ohq.Variable;
 
     const retVal = (main: ohq.Module, otherModule: ohq.Module) => {
         v = main.variable();
-        v.import(name, alias, otherModule);
+        if (alias === undefined) {
+            v.import(name, otherModule);
+        } else {
+            v.import(name, alias, otherModule);
+        }
     };
 
     retVal.delete = () => {
@@ -198,7 +207,7 @@ async function createCell(node: ohq.Node, options: CompileOptions) {
         const text = node.mode && node.mode !== "js" ? `${node.mode}\`${encodeBacktick(node.value)}\`` : node.value;
         const parsedModule = splitModule(text);
         for (const cell of parsedModule) {
-            const parsed = parseCell(cell.text, options.baseUrl);
+            const parsed = parseCell(cell.text, options.baseUrl ?? "");
             switch (parsed.type) {
                 case "import":
                     modules.push(await createModule(node, parsed, cell.text, options));
@@ -217,8 +226,8 @@ async function createCell(node: ohq.Node, options: CompileOptions) {
                     break;
             }
         }
-    } catch (e) {
-        variables.push(createVariable(node, true, undefined, [], e.message));
+    } catch (e: any) {
+        variables.push(createVariable(node, true, undefined, [], e.message ?? "Unkown error"));
     }
 
     const retVal = (runtime: ohq.Runtime, main: ohq.Module, inspector?: InspectorFactoryEx) => {
@@ -242,8 +251,11 @@ export type CellFunc = Awaited<ReturnType<typeof createCell>>;
 
 //  File  ---
 function createFile(file: ohq.File, options: CompileOptions): [string, any] {
-    function toString() { return globalThis.url; }
-    return [file.name, { url: new URL(fixRelativeUrl(file.url, options.baseUrl)), mimeType: file.mime_type, toString }];
+    function toString() {
+        // TODO Double check url should not be URL?
+        return (globalThis as any).url ?? "";
+    }
+    return [file.name, { url: new URL(fixRelativeUrl(file.url, options.baseUrl ?? "")), mimeType: file.mime_type, toString }];
 }
 type FileFunc = ReturnType<typeof createFile>;
 
@@ -277,7 +289,7 @@ export function notebook(_files: ohq.File[] = [], _cells: CellFunc[] = [], { bas
         cells.set(cell.id, cell);
         return cell;
     };
-    retVal.get = (id: string | number): CellFunc => {
+    retVal.get = (id: string | number): CellFunc | undefined => {
         return cells.get(id);
     };
     retVal.delete = (id: string | number): boolean => {

package/src/cst.ts

@@ -1,20 +1,18 @@
-import { parseCell as ohqParseCell } from "@hpcc-js/observable-shim";
-import { acorn, walk } from "@observablehq/parser";
-import { ancestor } from "acorn-walk";
+import { ancestor, parseCell as ohqParseCell, Cell, Node, walk, AncestorVisitors } from "@hpcc-js/observable-shim";
 
-import { fixRelativeUrl, createFunction, Refs } from "./util";
+import { fixRelativeUrl, createFunction, Refs } from "./util.ts";
 
-function calcRefs(cellAst, cellStr): Refs {
+function calcRefs(cellAst: Cell, cellStr: string): Refs {
     if (cellAst.references === undefined) return { inputs: [], args: [], patches: [] };
 
-    const dedup = {};
-    cellAst.references.forEach(r => dedup[cellStr.substring(r.start, r.end)] = true);
+    const dedup: { [id: string]: boolean } = {};
+    cellAst.references.forEach((r: any) => dedup[cellStr.substring(r.start, r.end)] = true);
     const retVal: Refs = {
         inputs: Object.keys(dedup),
         args: Object.keys(dedup).map(r => r.split(" ").join("_")),
         patches: []
     };
-    const pushPatch = (node, newText) => retVal.patches.push({ start: node.start - cellAst.body.start, end: node.end - cellAst.body.start, newText });
+    const pushPatch = (node: Node, newText: string) => retVal.patches.push({ start: node.start - (cellAst.body?.start ?? 0), end: node.end - (cellAst.body?.start ?? 0), newText });
     if (cellAst.body) {
         ancestor(cellAst.body, {
             Identifier(node) {
@@ -22,23 +20,23 @@ function calcRefs(cellAst, cellStr): Refs {
                 if (dedup[value]) {
                 }
             },
-            MutableExpression(node) {
+            MutableExpression(node: Node) {
                 const value = cellStr.substring(node.start, node.end);
                 const newText = value.split(" ").join("_") + ".value";
                 pushPatch(node, newText);
             },
-            ViewExpression(node) {
+            ViewExpression(node: Node) {
                 const value = cellStr.substring(node.start, node.end);
                 const newText = value.split(" ").join("_");
                 pushPatch(node, newText);
             },
-            ThisExpression(node, ancestors: acorn.Node[]) {
+            ThisExpression(node: Node, ancestors: Node[]) {
                 const value = cellStr.substring(node.start, node.end);
                 if (value === "this" && !ancestors.find(n => n.type === "FunctionExpression")) {
                     pushPatch(node, "((this === globalThis || this === globalThis.window)? undefined : this?.valueOf())");
                 }
             }
-        } as acorn.AncestorVisitors, walk);
+        } as AncestorVisitors<any>, walk);
     }
     return retVal;
 }
@@ -54,18 +52,18 @@ export interface ParsedImportCell extends ParsedCell {
     injections: { name: string, alias: string }[];
 }
 
-function parseImportDeclaration(cellAst): ParsedImportCell {
+function parseImportDeclaration(cellAst: any): ParsedImportCell {
     return {
         type: "import",
         src: cellAst.body.source.value,
-        specifiers: cellAst.body.specifiers?.map(spec => {
+        specifiers: cellAst.body.specifiers?.map((spec: any) => {
             return {
                 view: spec.view,
                 name: spec.imported.name,
                 alias: (spec.local?.name && spec.imported.name !== spec.local.name) ? spec.local.name : spec.imported.name
             };
         }) ?? [],
-        injections: cellAst.body.injections?.map(inj => {
+        injections: cellAst.body.injections?.map((inj: any) => {
             return {
                 name: inj.imported.name,
                 alias: inj.local?.name ?? inj.imported.name
@@ -87,7 +85,7 @@ export interface ParsedViewCell extends ParsedCell {
     variableValue: ParsedVariable;
 }
 
-function parseViewExpression(cellStr: string, cellAst, refs: Refs, bodyStr?: string): ParsedViewCell {
+function parseViewExpression(cellStr: string, cellAst: any, refs: Refs, bodyStr?: string): ParsedViewCell {
     const id = cellAst.id && cellStr.substring(cellAst.id.start, cellAst.id.end);
     return {
         type: "viewof",
@@ -101,7 +99,7 @@ function parseViewExpression(cellStr: string, cellAst, refs: Refs, bodyStr?: str
             type: "variable",
             id: cellAst?.id?.id?.name,
             inputs: ["Generators", id],
-            func: (G, _) => G.input(_)
+            func: (G: any, _: any) => G.input(_)
         }
     };
 }
@@ -113,7 +111,7 @@ interface ParsedMutableCell extends ParsedCell {
     variableValue: ParsedVariable;
 }
 
-function parseMutableExpression(cellStr: string, cellAst, refs: Refs, bodyStr?: string): ParsedMutableCell {
+function parseMutableExpression(cellStr: string, cellAst: any, refs: Refs, bodyStr?: string): ParsedMutableCell {
     const id = cellAst.id && cellStr.substring(cellAst.id.start, cellAst.id.end);
     const initialValueId = cellAst?.id?.id?.name;
     const initialId = `initial ${initialValueId}`;
@@ -129,13 +127,13 @@ function parseMutableExpression(cellStr: string, cellAst, refs: Refs, bodyStr?:
             type: "variable",
             id,
             inputs: ["Mutable", initialId],
-            func: (M, _) => new M(_)
+            func: (M: any, _: any) => new M(_)
         },
         variableValue: {
             type: "variable",
             id: initialValueId,
             inputs: [id],
-            func: _ => _.generator
+            func: (_: any) => _.generator
         }
     };
 }
@@ -147,7 +145,7 @@ interface ParsedVariableCell extends ParsedCell {
     func: any,
 }
 
-function parseVariableExpression(cellStr: string, cellAst, refs: Refs, bodyStr?: string): ParsedVariableCell {
+function parseVariableExpression(cellStr: string, cellAst: any, refs: Refs, bodyStr?: string): ParsedVariableCell {
     return {
         type: "variable",
         id: cellAst.id && cellStr.substring(cellAst.id?.start, cellAst.id?.end),
@@ -163,10 +161,15 @@ export function parseCell(cellStr: string, baseUrl: string): ParsedImportCell |
         case "ImportDeclaration":
             return parseImportDeclaration(cellAst);
         case "ImportExpression":
-            bodyStr = `import("${fixRelativeUrl(cellAst.body.source.value, baseUrl)}")`;
+            switch (cellAst.body.source.type) {
+                case "Literal":
+                    bodyStr = `import("${fixRelativeUrl("" + cellAst.body.source.value, baseUrl)}")`;
+                    break;
+                default:
+                    console.error("Unexpected import value");
+            }
     }
     const refs = calcRefs(cellAst, cellStr);
-
     switch (cellAst.id?.type) {
         case "ViewExpression":
             return parseViewExpression(cellStr, cellAst, refs, bodyStr);
@@ -176,3 +179,4 @@ export function parseCell(cellStr: string, baseUrl: string): ParsedImportCell |
             return parseVariableExpression(cellStr, cellAst, refs, bodyStr);
     }
 }
+

package/src/index.ts

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

package/src/util.ts

@@ -41,7 +41,7 @@ export function createFunction(refs: Refs, async = false, generator = false, blo
         `return (\n${body}\n);`);
 }
 
-function join(baseURL, relativeURL) {
+function join(baseURL: string, relativeURL: string) {
     return relativeURL
         ? baseURL.replace(/\/+$/, "") + "/" + relativeURL.replace(/^\/+/, "")
         : baseURL;
@@ -159,6 +159,9 @@ export function omd2notebook(omd: string): ohq.Notebook {
 
 export function fetchEx(url: string, proxyPrefix = "https://api.codetabs.com/v1/proxy/?quest=", proxyPostfix = "") {
     const matches = url.match(/^(?:https?:\/\/)?(?:[^@\n]+@)?(?:www\.)?([^:\/\n?]+)/img);
+    if (!matches || matches.length === 0) {
+        throw new Error(`Invalid URL:  ${url}`);
+    }
     return fetch(url, { headers: { origin: matches[0], referer: url } }).then(response => {
         if (response.ok) return response;
         throw new Error("CORS?");

package/src/writer.ts

@@ -1,5 +1,5 @@
 import { ohq } from "@hpcc-js/observable-shim";
-import { ParsedImportCell, ParsedVariable } from "./cst";
+import { ParsedImportCell, ParsedVariable } from "./cst.ts";
 
 export class Writer {
 
@@ -43,14 +43,16 @@ export default function define(runtime, observer) {
     }
 
     importDefine(imp: Partial<ParsedImportCell>) {
-        const injections = imp.injections.map(inj => {
+        const impInjections = imp.injections ?? [];
+        const injections = impInjections.map(inj => {
             return inj.name === inj.alias ?
                 `"${inj.name}"` :
                 `{name: "${inj.name}", alias: "${inj.alias}"}`;
         });
-        const derive = imp.injections.length ? `.derive([${injections.join(", ")}], main)` : "";
+        const derive = impInjections.length ? `.derive([${injections.join(", ")}], main)` : "";
         this._defines.push(`const child${this._defineUid} = runtime.module(define${this._defineUid})${derive};`);
-        imp.specifiers.forEach(s => {
+        const impSpecifiers = imp.specifiers ?? [];
+        impSpecifiers.forEach(s => {
             this._defines.push(`main.import("${s.name}"${s.alias && s.alias !== s.name ? `, "${s.alias}"` : ""}, child${this._defineUid}); `);
         });
     }
@@ -67,7 +69,8 @@ export default function define(runtime, observer) {
         funcId = funcId ?? variable.id;
         const observe = observable ? `.variable(observer(${variable.id ? JSON.stringify(variable.id) : ""}))` : "";
         const id = variable.id ? `${JSON.stringify(variable.id)}, ` : "";
-        const inputs = variable.inputs.length ? `[${variable.inputs.map(i => JSON.stringify(i)).join(", ")}], ` : "";
+        const variableInputs = variable.inputs ?? [];
+        const inputs = variableInputs.length ? `[${variableInputs.map(i => JSON.stringify(i)).join(", ")}], ` : "";
         const func = inlineFunc ?
             variable.func?.toString() :
             funcId;

package/types/compiler.d.ts

@@ -1,11 +1,11 @@
 import { ohq } from "@hpcc-js/observable-shim";
-import { Writer } from "./writer";
+import { Writer } from "./writer.ts";
 export type InspectorFactoryEx = (name: string | undefined, id: string | number) => Inspector;
 export interface Inspector {
     _node?: HTMLDivElement;
-    pending(): any;
-    fulfilled(value: any): any;
-    rejected(error: any): any;
+    pending(): void;
+    fulfilled(value: any): void;
+    rejected(error: Error): void;
 }
 declare function createCell(node: ohq.Node, options: CompileOptions): Promise<{
     (runtime: ohq.Runtime, main: ohq.Module, inspector?: InspectorFactoryEx): void;
@@ -66,7 +66,7 @@ export declare function notebook(_files?: ohq.File[], _cells?: CellFunc[], { bas
         write(w: Writer): void;
     }>;
     set(n: ohq.Node): Promise<CellFunc>;
-    get(id: string | number): CellFunc;
+    get(id: string | number): CellFunc | undefined;
     delete(id: string | number): boolean;
     clear(): void;
     write(w: Writer): void;
@@ -101,7 +101,7 @@ export declare function compile(notebookOrOjs: ohq.Notebook | string, { baseUrl,
         write(w: Writer): void;
     }>;
     set(n: ohq.Node): Promise<CellFunc>;
-    get(id: string | number): CellFunc;
+    get(id: string | number): CellFunc | undefined;
     delete(id: string | number): boolean;
     clear(): void;
     write(w: Writer): void;
@@ -109,4 +109,3 @@ export declare function compile(notebookOrOjs: ohq.Notebook | string, { baseUrl,
 }>;
 export type compileFunc = Awaited<ReturnType<typeof compile>>;
 export {};
-//# sourceMappingURL=compiler.d.ts.map

package/types/cst.d.ts

@@ -39,4 +39,3 @@ interface ParsedVariableCell extends ParsedCell {
 }
 export declare function parseCell(cellStr: string, baseUrl: string): ParsedImportCell | ParsedViewCell | ParsedMutableCell | ParsedVariableCell;
 export {};
-//# sourceMappingURL=cst.d.ts.map

package/types/index.d.ts

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

package/types/util.d.ts

@@ -11,7 +11,7 @@ export interface Refs {
 }
 export declare function createFunction(refs: Refs, async?: boolean, generator?: boolean, blockStatement?: boolean, body?: string): any;
 export declare const isRelativePath: (path: string) => boolean;
-export declare const fixRelativeUrl: (path: string, basePath: string) => any;
+export declare const fixRelativeUrl: (path: string, basePath: string) => string;
 export declare function obfuscatedImport(url: string): Promise<any>;
 interface ParsedOJS {
     ojs: string;
@@ -27,4 +27,3 @@ export declare function omd2notebook(omd: string): ohq.Notebook;
 export declare function fetchEx(url: string, proxyPrefix?: string, proxyPostfix?: string): Promise<Response>;
 export declare function download(impUrl: string, proxyPrefix?: string, proxyPostfix?: string): Promise<ohq.Notebook>;
 export {};
-//# sourceMappingURL=util.d.ts.map

package/types/writer.d.ts

@@ -1,5 +1,5 @@
 import { ohq } from "@hpcc-js/observable-shim";
-import { ParsedImportCell, ParsedVariable } from "./cst";
+import { ParsedImportCell, ParsedVariable } from "./cst.ts";
 export declare class Writer {
     protected _files: ohq.File[];
     protected _imports: string[];
@@ -16,4 +16,3 @@ export declare class Writer {
     define(variable: Partial<ParsedVariable>, observable?: boolean, inlineFunc?: boolean, funcId?: string): void;
     error(msg: string): void;
 }
-//# sourceMappingURL=writer.d.ts.map

package/dist/index.esm.css

@@ -1 +0,0 @@
-@import url("https://fonts.googleapis.com/css2?family=Source+Serif+Pro:ital,wght@0,400;0,600;0,700;1,400;1,600;1,700&display=swap");:root{--syntax-normal:#1b1e23;--syntax-comment:#828282;--syntax-number:#20a5ba;--syntax-keyword:#c30771;--syntax-atom:#10a778;--syntax-string:#008ec4;--syntax-error:#ffbedc;--syntax-unknown-variable:#838383;--syntax-known-variable:#005f87;--syntax-matchbracket:#20bbfc;--syntax-key:#6636b4;--mono-fonts:82%/1.5 Menlo,Consolas,monospace}.observablehq--collapsed,.observablehq--expanded,.observablehq--function,.observablehq--gray,.observablehq--import,.observablehq--string:after,.observablehq--string:before{color:var(--syntax-normal)}.observablehq--collapsed,.observablehq--expanded.observablehq--inspect a{cursor:pointer}.observablehq--field{margin-left:1em;text-indent:-1em}.observablehq--empty{color:var(--syntax_comment)}.observablehq--blue,.observablehq--keyword,a[href]{color:#3182bd}.hljs-deletion,.hljs-variable,.observablehq--forbidden,.observablehq--pink{color:#e377c2}.observablehq--orange{color:#e6550d}.hljs-literal,.observablehq--boolean,.observablehq--null,.observablehq--undefined{color:var(--syntax-atom)}.hljs-bullet,.hljs-link,.hljs-number,.hljs-regexp,.observablehq--bigint,.observablehq--date,.observablehq--green,.observablehq--number,.observablehq--regexp,.observablehq--symbol{color:var(--syntax-number)}.observablehq--index,.observablehq--key{color:var(--syntax-key)}.observablehq--prototype-key{color:#aaa}.observablehq--empty{font-style:oblique}.hljs-addition,.hljs-meta,.hljs-string,.hljs-symbol,.hljs-template-tag,.hljs-template-variable,.observablehq--purple,.observablehq--string{color:var(--syntax-string)}.observablehq--error,.observablehq--red{color:#e7040f}.observablehq--inspect,.observablehq:empty:after,.observablehq>link:only-child,.observablehq>style:only-child{display:block;font:var(--monospace-font);overflow-x:auto;padding:4px 0;white-space:pre}.observablehq--error .observablehq--inspect{white-space:pre-wrap;word-break:break-all}:root{--syntax-diff:#24292e;--syntax-diff-bg:#fff;--hr:rgba(0,0,0,.05);--monospace:Menlo,Consolas,monospace;--monospace-font:14px/1.5 var(--monospace);--serif:"Source Serif Pro","Iowan Old Style","Apple Garamond","Palatino Linotype","Times New Roman","Droid Serif",Times,serif,"Apple Color Emoji","Segoe UI Emoji","Segoe UI Symbol";--sans-serif:-apple-system,BlinkMacSystemFont,"avenir next",avenir,helvetica,"helvetica neue",ubuntu,roboto,noto,"segoe ui",arial,sans-serif}html{-webkit-text-size-adjust:100%;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale;color:#1b1e23;font:17px/1.5 var(--serif)}body{margin:0 14px}body.fullscreen{margin:0}h1,h2,h3,h4,h5,h6{color:#333;font-weight:700;line-height:1.15;margin-bottom:.25rem;margin-top:0}h2~p,h2~table,h3~p,h3~table,h4~p,h4~table{margin-top:0}.observablehq:first-of-type h1+h2{font-size:20px;font-style:italic;font-weight:400;margin-bottom:1rem}a[href]{text-decoration:none}a[href]:hover{text-decoration:underline}h1 code,h2 code,h3 code,h4 code,h5 code,h6 code{font-size:90%}code,pre,tt{font-family:var(--monospace);font-size:14px;line-height:1.5}img{max-width:calc(100vw - 28px)}.katex-display,figcaption,figure,h1,h2,h3,h4,h5,h6,p,table{max-width:640px}blockquote,ol,ul{max-width:600px}blockquote{margin:1rem 1.5rem}ol,ul{padding-left:28px}hr{background:no-repeat 50%/100% 1px linear-gradient(to right,var(--hr),var(--hr));border:none;height:1px;margin:1rem 0;padding:1rem 0}pre{padding:2px 0}.observablehq--md-pre{overflow-x:auto}input:not([type]),input[type=email],input[type=number],input[type=password],input[type=range],input[type=search],input[type=tel],input[type=text],input[type=url]{width:240px}button,canvas,input{vertical-align:middle}button,input,textarea{accent-color:#3b5fc0}table{border-collapse:collapse;font:13px/1.2 var(--sans-serif);width:100%}table code,table pre,table tt{font-size:inherit;line-height:inherit}td>pre:only-child,th>pre:only-child{margin:0;padding:0}th{color:#111;text-align:left;vertical-align:bottom}td{color:#444;vertical-align:top}td,th{padding:3px 6.5px 3px 0}td:last-child,th:last-child{padding-right:0}tr:not(:last-child){border-bottom:1px solid #eee}thead tr{border-bottom:1px solid #ccc}figure,table{margin:1rem 0}figure img{max-width:100%}figcaption{color:var(--syntax-unknown-variable);font:small var(--sans-serif)}.observablehq--caret{margin-right:4px;vertical-align:baseline}.observablehq--field{margin-left:1rem;text-indent:-1rem}.hljs-comment,.observablehq--empty,.observablehq--prototype-key{color:var(--syntax-comment)}.hljs-built_in{color:var(--syntax-known-variable)}.observablehq--unknown{color:var(--syntax-unknown-variable)}.hljs-doctag,.hljs-keyword,.hljs-name,.hljs-section,.hljs-selector-class,.hljs-selector-id,.hljs-selector-tag,.hljs-strong,.hljs-tag,.hljs-type{color:var(--syntax-keyword)}.observablehq{margin:17px 0;min-height:1.5rem;position:relative}.observablehq:before{bottom:1px;content:"";left:-14px;position:absolute;top:0;transition:background-color .25s linear;width:4px}.observablehq--changed:before,.observablehq--running:before{background-color:#a9b0bc;transition:none}.observablehq--error:before{background-color:#e7040f}.observablehq:not(.observablehq--running):empty:after{color:var(--syntax-comment);content:"<detached>";font-style:oblique}.observablehq>link:only-child,.observablehq>style:only-child{color:var(--syntax-keyword);visibility:hidden;white-space:nowrap}.observablehq>link:only-child:before{content:"<link>";pointer-events:none;text-decoration:none;visibility:visible}.observablehq>style:only-child:before{content:"<style>";visibility:visible}.observablehq--inspect.observablehq--import{white-space:normal}.observablehq--inspect::-webkit-scrollbar{display:none}.observablehq--string-expand{background:#eee;border-radius:2px;color:var(--syntax-normal);cursor:pointer;font-size:80%;margin-left:6px;padding:2px 6px;position:sticky;right:0;vertical-align:middle}.observablehq--string-expand:active,.observablehq--string-expand:hover{background:#ddd}