@hpcc-js/observablehq-compiler 1.2.0 → 1.2.2

package/dist/index.js

@@ -1,8 +1,8 @@
 (function (global, factory) {
-  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('@hpcc-js/util')) :
-  typeof define === 'function' && define.amd ? define(['exports', '@hpcc-js/util'], factory) :
-  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@hpcc-js/observablehq-compiler"] = {}, global["@hpcc-js/util"]));
-})(this, (function (exports, util) { 'use strict';
+  typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports) :
+  typeof define === 'function' && define.amd ? define(['exports'], factory) :
+  (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory(global["@hpcc-js/observablehq-compiler"] = {}));
+})(this, (function (exports) { 'use strict';
 
   // 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];
@@ -6661,6 +6661,18 @@
           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);
@@ -6803,7 +6815,7 @@
       }
       return retVal;
   }
-  function parseImportExpression(cellAst) {
+  function parseImportDeclaration(cellAst) {
       var _a, _b, _c, _d;
       return {
           type: "import",
@@ -6880,14 +6892,17 @@
           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);
@@ -6968,20 +6983,17 @@ export default function define(runtime, observer) {
       }
   }
 
-  //  Module  ---
-  const isRelativePath = (path) => path[0] === ".";
-  const fullUrl = (path, basePath) => isRelativePath(path) ? util.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 (util.endsWith(relativePath, ".ojsnb")) {
+      if (relativePath.endsWith(".ojsnb")) {
           notebook = JSON.parse(content);
       }
-      else if (util.endsWith(relativePath, ".ojs")) {
+      else if (relativePath.endsWith(".ojs")) {
           notebook = ojs2notebook(content);
       }
-      else if (util.endsWith(relativePath, ".omd")) {
+      else if (relativePath.endsWith(".omd")) {
           notebook = omd2notebook(content);
       }
       const retVal = compile(notebook, { baseUrl });
@@ -7140,7 +7152,7 @@ ${node.value}
           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);
+              const parsed = parseCell(cell.text, options.baseUrl);
               switch (parsed.type) {
                   case "import":
                       modules.push(await createModule(node, parsed, cell.text, options));
@@ -7183,7 +7195,7 @@ ${node.value}
   //  File  ---
   function createFile(file, options) {
       function toString() { return globalThis.url; }
-      return [file.name, { url: new URL(fullUrl(file.url, options.baseUrl)), mimeType: file.mime_type, toString }];
+      return [file.name, { url: new URL(fixRelativeUrl(file.url, options.baseUrl)), mimeType: file.mime_type, toString }];
   }
   function notebook(_files = [], _cells = [], { baseUrl = ".", importMode = "precompiled" } = {}) {
       const files = _files.map(f => createFile(f, { baseUrl, importMode }));
@@ -7193,7 +7205,7 @@ ${node.value}
           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 => {