@hpcc-js/observablehq-compiler 1.1.2 → 1.1.3

package/dist/index.js

@@ -6233,15 +6233,15 @@
     if (tag != null && input) {
       cell = TemplateCellParser.parse(input, options);
       const parsedTag = CellTagParser.parse(tag, options);
-      parseReferences(parsedTag, tag, globals);
-      parseFeatures(parsedTag, tag);
+      parseReferences$1(parsedTag, tag, globals);
+      parseFeatures$1(parsedTag, tag);
       cell.tag = parsedTag;
       cell.raw = !!raw;
     } else {
       cell = CellParser.parse(input, options);
     }
-    parseReferences(cell, input, globals);
-    parseFeatures(cell, input);
+    parseReferences$1(cell, input, globals);
+    parseFeatures$1(cell, input);
     return cell;
   }
 
@@ -6553,7 +6553,7 @@
   // Find references.
   // Check for illegal references to arguments.
   // Check for illegal assignments to global references.
-  function parseReferences(cell, input, globals = defaultGlobals) {
+  function parseReferences$1(cell, input, globals = defaultGlobals) {
     if (!cell.body) {
       cell.references = [];
     } else if (cell.body.type === "ImportDeclaration") {
@@ -6580,7 +6580,7 @@
   // Find features: file attachments, secrets, database clients.
   // Check for illegal references to arguments.
   // Check for illegal assignments to global references.
-  function parseFeatures(cell, input) {
+  function parseFeatures$1(cell, input) {
     if (cell.body && cell.body.type !== "ImportDeclaration") {
       try {
         cell.fileAttachments = findFeatures(cell, "FileAttachment");
@@ -6603,7 +6603,6 @@
     }
     return cell;
   }
-
   class ModuleParser extends CellParser {
       parseTopLevel(node) {
           if (!node.cells)
@@ -6622,10 +6621,12 @@
           return this.finishNode(node, "Program");
       }
   }
-  // @ts-ignore
-  function parseModule(input, { globals } = {}) {
+  function splitModule(input) {
       // @ts-ignore
-      return ModuleParser.parse(input).cells.map(cell => input.substring(cell.start, cell.end));
+      return ModuleParser.parse(input, { ecmaVersion: "latest" }).cells.map(cell => input.substring(cell.start, cell.end));
+  }
+  function parseCell$2(input) {
+      return parseCell$1(input);
   }
 
   const FuncTypes = {
@@ -6664,10 +6665,20 @@
           .split("`").join("\\`");
   }
   function createParsedOJS(ojs, offset, inlineMD) {
+      let cell;
+      let error;
+      try {
+          cell = parseCell$2(ojs);
+      }
+      catch (e) {
+          error = e;
+      }
       return {
           ojs,
           offset,
-          inlineMD
+          inlineMD,
+          cell,
+          error
       };
   }
   function parseOmd(_) {
@@ -6698,7 +6709,7 @@
       return retVal;
   }
   function ojs2notebook(ojs) {
-      const cells = parseModule(ojs);
+      const cells = splitModule(ojs);
       return {
           files: [],
           nodes: cells.map((cell, idx) => {
@@ -6723,7 +6734,7 @@
           })
       };
   }
-  function fetchEx(url) {
+  function fetchEx(url, proxyPrefix = "https://observable-cors.glitch.me/", proxyPostfix = "") {
       return fetch(url)
           .then(response => {
           if (response.ok)
@@ -6731,7 +6742,7 @@
           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],
@@ -6862,7 +6873,7 @@
   }
   function parseCell(cellStr) {
       var _a, _b;
-      const cellAst = parseCell$1(cellStr);
+      const cellAst = parseCell$2(cellStr);
       if (((_a = (cellAst.body)) === null || _a === void 0 ? void 0 : _a.type) == "ImportDeclaration") {
           return parseImportExpression(cellAst);
       }
@@ -6948,8 +6959,10 @@ export default function define(runtime, observer) {
       }
   }
 
+  const isRelativePath = (path) => path[0] === ".";
+  const fullUrl = (path, basePath) => isRelativePath(path) ? util.join(basePath, path) : path;
   async function importFile(relativePath, baseUrl) {
-      const path = util.join(baseUrl, relativePath);
+      const path = fullUrl(relativePath, baseUrl);
       const content = await fetchEx(path).then(r => r.text());
       let notebook;
       if (util.endsWith(relativePath, ".ojsnb")) {
@@ -7042,7 +7055,7 @@ export default function define(runtime, observer) {
       return retVal;
   }
   async function createModule(parsed, text, baseUrl) {
-      const otherModule = [".", "/"].indexOf(parsed.src[0]) === 0 ?
+      const otherModule = isRelativePath(parsed.src) ?
           await importFile(parsed.src, baseUrl) :
           await importCompiledNotebook(parsed.src);
       const importVariables = [];
@@ -7086,31 +7099,36 @@ ${text}
       const variables = [];
       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, main, inspector) => {
           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 = () => {
@@ -7123,20 +7141,22 @@ ${text}
       };
       return retVal;
   }
-  function createFile(file) {
+  function createFile(file, baseUrl) {
       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 }];
   }
   async function compile(notebook, baseUrl = ".") {
-      const files = notebook.files.map(f => createFile(f));
+      const files = notebook.files.map(f => createFile(f, baseUrl));
       const fileAttachments = new Map(files);
-      let cells = await Promise.all(notebook.nodes.map(n => createCell(n, baseUrl)));
+      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(name), mimeType: null };
+              return (_a = fileAttachments.get(name)) !== null && _a !== void 0 ? _a : { url: new URL(fullUrl(name, baseUrl)), mimeType: null };
           }));
+          main.builtin("fetchEx", fetchEx);
           cells.forEach(cell => {
               cell(runtime, main, inspector);
           });
@@ -7144,18 +7164,22 @@ ${text}
       };
       retVal.fileAttachments = fileAttachments;
       retVal.cells = cells;
-      retVal.appendCell = async (n, baseUrl = ".") => {
+      retVal.appendCell = async (n, 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) => {
-          cells = cells.filter(c => c !== cell);
-          cell.dispose();
+      retVal.disposeCell = async (id) => {
+          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) => {
           w.files(notebook.files);
@@ -7168,11 +7192,11 @@ ${text}
       return retVal;
   }
 
-  exports.Writer = Writer;
   exports.compile = compile;
   exports.download = download;
   exports.ojs2notebook = ojs2notebook;
   exports.omd2notebook = omd2notebook;
+  exports.parseOmd = parseOmd;
 
   Object.defineProperty(exports, '__esModule', { value: true });