mystmd 1.3.9__tar.gz → 1.3.11__tar.gz

{mystmd-1.3.9 → mystmd-1.3.11}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mystmd
-Version: 1.3.9
+Version: 1.3.11
 Summary: Command line tools for MyST Markdown
 Project-URL: Homepage, https://github.com/jupyter-book/mystmd
 Project-URL: Bug Tracker, https://github.com/jupyter-book/mystmd/issues

{mystmd-1.3.9 → mystmd-1.3.11}/_package.json

@@ -1,6 +1,6 @@
 {
   "name": "mystmd",
-  "version": "1.3.9",
+  "version": "1.3.11",
   "description": "Command line tools for MyST Markdown",
   "author": "Rowan Cockett <rowan@curvenote.com>",
   "license": "MIT",
@@ -45,6 +45,6 @@
     "commander": "^10.0.1",
     "core-js": "^3.31.1",
     "js-yaml": "^4.1.0",
-    "myst-cli": "^1.3.9"
+    "myst-cli": "^1.3.11"
   }
 }

{mystmd-1.3.9 → mystmd-1.3.11}/src/mystmd_py/myst.cjs

@@ -193562,7 +193562,7 @@ var {
 } = import_index.default;
 
 // src/version.ts
-var version = "1.3.9";
+var version = "1.3.11";
 var version_default = version;
 
 // ../myst-cli/dist/build/build.js
@@ -241281,7 +241281,17 @@ function logMessagesFromVFile(session, file) {
   file.messages = [];
 }
 function writeJsonLogs(session, name3, logData) {
-  writeFileToFolder((0, import_node_path6.join)(session.buildPath(), "logs", name3), JSON.stringify(logData, null, 2));
+  const seen = /* @__PURE__ */ new WeakSet();
+  const data = JSON.stringify(logData, function(_3, value) {
+    if (typeof value === "object" && value !== null) {
+      if (seen.has(value)) {
+        return "[Circular]";
+      }
+      seen.add(value);
+    }
+    return value;
+  }, 2);
+  writeFileToFolder((0, import_node_path6.join)(session.buildPath(), "logs", name3), data);
 }
 
 // ../myst-cli/dist/session/cache.js
@@ -241881,11 +241891,12 @@ var InlineCite;
   InlineCite2["t"] = "t";
 })(InlineCite || (InlineCite = {}));
 function yearFromCitation(data) {
-  var _a6, _b, _c, _d2, _e, _f;
-  let year = (_c = (_b = (_a6 = data.issued) === null || _a6 === void 0 ? void 0 : _a6["date-parts"]) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c[0];
+  var _a6, _b, _c, _d2, _e;
+  const date = (_a6 = data.issued) !== null && _a6 !== void 0 ? _a6 : data.accessed;
+  let year = (_c = (_b = date === null || date === void 0 ? void 0 : date["date-parts"]) === null || _b === void 0 ? void 0 : _b[0]) === null || _c === void 0 ? void 0 : _c[0];
   if (year)
     return year;
-  year = (_f = (_e = (_d2 = data.issued) === null || _d2 === void 0 ? void 0 : _d2["literal"]) === null || _e === void 0 ? void 0 : _e.match(/\b[12][0-9]{3}\b/)) === null || _f === void 0 ? void 0 : _f[0];
+  year = (_e = (_d2 = date === null || date === void 0 ? void 0 : date["literal"]) === null || _d2 === void 0 ? void 0 : _d2.match(/\b[12][0-9]{3}\b/)) === null || _e === void 0 ? void 0 : _e[0];
   if (year)
     return year;
   return "n.d.";
@@ -289101,7 +289112,7 @@ var import_node_path15 = __toESM(require("path"), 1);
 var import_nbtx = __toESM(require_cjs2(), 1);
 
 // ../myst-cli/dist/version.js
-var version2 = "1.3.9";
+var version2 = "1.3.11";
 var version_default2 = version2;
 
 // ../myst-cli/dist/utils/headers.js
@@ -290199,7 +290210,7 @@ function replaceAttachmentsTransform(session, mdast2, attachments, file) {
   logMessagesFromVFile(session, vfile2);
 }
 async function processNotebookFull(session, file, content3) {
-  var _a6, _b;
+  var _a6, _b, _c;
   const { log } = session;
   const { metadata, cells: cells2 } = JSON.parse(content3);
   const language = (_b = (_a6 = metadata === null || metadata === void 0 ? void 0 : metadata.kernelspec) === null || _a6 === void 0 ? void 0 : _a6.language) !== null && _b !== void 0 ? _b : "python";
@@ -290212,6 +290223,7 @@ async function processNotebookFull(session, file, content3) {
     ...Object.entries(FRONTMATTER_ALIASES).filter(([_3, value]) => PAGE_FRONTMATTER_KEYS.includes(value)).map(([key2, _3]) => key2)
   ]);
   const frontmatter = validatePageFrontmatter(filteredMetadata !== null && filteredMetadata !== void 0 ? filteredMetadata : {}, frontmatterValidationOpts(vfile2));
+  const widgets = (_c = metadata === null || metadata === void 0 ? void 0 : metadata.widgets) !== null && _c !== void 0 ? _c : {};
   let end = cells2.length;
   if (cells2 && cells2.length > 1 && (cells2 === null || cells2 === void 0 ? void 0 : cells2[cells2.length - 1].source.length) === 0) {
     end = -1;
@@ -290269,7 +290281,7 @@ async function processNotebookFull(session, file, content3) {
   }, Promise.resolve([])));
   logMessagesFromVFile(session, vfile2);
   const mdast2 = { type: "root", children: items };
-  return { mdast: mdast2, frontmatter };
+  return { mdast: mdast2, frontmatter, widgets };
 }
 
 // ../myst-cli/dist/process/file.js
@@ -290290,10 +290302,10 @@ function loadMdFile(session, content3, file, opts) {
 async function loadNotebookFile(session, content3, file, opts) {
   const vfile2 = new VFile();
   vfile2.path = file;
-  const { mdast: mdast2, frontmatter: nbFrontmatter } = await processNotebookFull(session, file, content3);
+  const { mdast: mdast2, frontmatter: nbFrontmatter, widgets } = await processNotebookFull(session, file, content3);
   const { frontmatter: cellFrontmatter, identifiers } = getPageFrontmatter(session, mdast2, vfile2, opts === null || opts === void 0 ? void 0 : opts.preFrontmatter, opts === null || opts === void 0 ? void 0 : opts.keepTitleNode);
   const frontmatter = fillProjectFrontmatter(cellFrontmatter, nbFrontmatter, frontmatterValidationOpts(vfile2));
-  return { kind: SourceFileKind.Notebook, mdast: mdast2, frontmatter, identifiers };
+  return { kind: SourceFileKind.Notebook, mdast: mdast2, frontmatter, identifiers, widgets };
 }
 function loadTexFile(session, content3, file, opts) {
   var _a6;
@@ -303080,7 +303092,7 @@ async function transformMdast(session, opts) {
   const cache = castSession(session);
   if (!cache.$getMdast(file))
     return;
-  const { mdast: mdastPre, kind, frontmatter: preFrontmatter, location: location4, identifiers } = (_b = (_a6 = cache.$getMdast(file)) === null || _a6 === void 0 ? void 0 : _a6.pre) !== null && _b !== void 0 ? _b : {};
+  const { mdast: mdastPre, kind, frontmatter: preFrontmatter, location: location4, identifiers, widgets } = (_b = (_a6 = cache.$getMdast(file)) === null || _a6 === void 0 ? void 0 : _a6.pre) !== null && _b !== void 0 ? _b : {};
   if (!mdastPre || !kind || !location4)
     throw new Error(`Expected mdast to be parsed for ${file}`);
   log.debug(`Processing "${file}"`);
@@ -303164,7 +303176,8 @@ async function transformMdast(session, opts) {
     dependencies: [],
     frontmatter,
     mdast: mdast2,
-    references
+    references,
+    widgets
   };
   const cachedMdast = cache.$getMdast(file);
   if (cachedMdast)
@@ -303230,7 +303243,7 @@ async function postProcessMdast(session, { file, checkLinks, pageReferenceStates
     await checkLinksTransform(session, file, mdast2);
 }
 async function finalizeMdast(session, mdast2, frontmatter, file, { imageWriteFolder, useExistingImages, imageAltOutputFolder, imageExtensions, optimizeWebp, simplifyFigures, processThumbnail, maxSizeWebp }) {
-  var _a6;
+  var _a6, _b;
   const vfile2 = new VFile();
   vfile2.path = file;
   if (simplifyFigures) {
@@ -303276,11 +303289,108 @@ async function finalizeMdast(session, mdast2, frontmatter, file, { imageWriteFol
   if (postData) {
     postData.frontmatter = frontmatter;
     postData.mdast = mdast2;
+    postData.widgets = (_b = cache.$getMdast(file)) === null || _b === void 0 ? void 0 : _b.pre.widgets;
     updateFileInfoFromFrontmatter(session, file, frontmatter);
   }
   logMessagesFromVFile(session, vfile2);
 }
 
+// ../myst-cli/dist/process/search.js
+var IGNORED_TYPES = ["myst", "heading"];
+var INLINE_BLOCK_TYPES = [
+  "strong",
+  "emphasis",
+  "delete",
+  "superscript",
+  "underline",
+  "subscript",
+  "abbreviation",
+  "smallcaps",
+  "keyboard"
+];
+function toSectionedParts(content3) {
+  const sections = [];
+  const newSection = (heading6) => {
+    var _a6;
+    const info = heading6 ? {
+      text: toText(heading6),
+      depth: heading6.depth,
+      html_id: (_a6 = heading6.html_id) !== null && _a6 !== void 0 ? _a6 : heading6.identifier
+    } : void 0;
+    sections.push({ heading: info, parts: [] });
+  };
+  newSection();
+  visit(content3, (node3, index4, parent2) => {
+    if (node3.type === "heading") {
+      newSection(node3);
+    }
+    if (IGNORED_TYPES.includes(node3.type)) {
+      return SKIP;
+    }
+    const section = sections[sections.length - 1];
+    if ("value" in node3 && node3.value) {
+      section.parts.push(node3.value);
+    }
+    if (index4 != null && parent2 != null && // Skip literal nodes
+    "children" in node3 && // Skip inline-block nodes
+    !INLINE_BLOCK_TYPES.includes(node3.type)) {
+      let previousNode;
+      for (let i2 = index4 - 1; i2 >= 0; i2--) {
+        const maybePreviousNode = parent2.children[i2];
+        if (maybePreviousNode.type === "heading") {
+          break;
+        }
+        if (!IGNORED_TYPES.includes(maybePreviousNode.type)) {
+          previousNode = maybePreviousNode;
+          break;
+        }
+      }
+      if (previousNode !== void 0) {
+        section.parts.push("\n\n");
+      }
+    }
+  });
+  return sections;
+}
+function sectionToHeadingLevel(heading6) {
+  if (!heading6) {
+    return "lvl1";
+  }
+  switch (heading6.depth) {
+    case 1:
+      return "lvl1";
+    case 2:
+      return "lvl2";
+    case 3:
+      return "lvl3";
+    case 4:
+      return "lvl4";
+    case 5:
+      return "lvl5";
+    case 6:
+      return "lvl6";
+    default:
+      throw new Error(`unknown heading depth: ${heading6.depth}`);
+  }
+}
+function buildHierarchy(title, sections, index4) {
+  const result = { lvl1: title };
+  let currentDepth = 100;
+  for (let i2 = index4; i2 > 0; i2--) {
+    const { heading: heading6 } = sections[i2];
+    if (heading6 === void 0) {
+      throw new Error();
+    }
+    if (heading6.depth >= currentDepth) {
+      continue;
+    }
+    const lvl = sectionToHeadingLevel(heading6);
+    result[lvl] = heading6.text;
+    currentDepth = heading6.depth;
+  }
+  return result;
+}
+
 // ../myst-cli/dist/process/site.js
 var WEB_IMAGE_EXTENSIONS = [
   ImageExtensions.mp4,
@@ -303344,6 +303454,53 @@ async function writeMystXRefJson(session, states) {
   session.log.debug(`Writing myst.xref.json file: ${filename}`);
   writeFileToFolder(filename, JSON.stringify(mystXRefs));
 }
+async function writeMystSearchJson(session, pages) {
+  const records = [...pages].sort((left2, right2) => {
+    if (left2.file < right2.file) {
+      return -1;
+    } else if (left2.file > right2.file) {
+      return 1;
+    } else {
+      return 0;
+    }
+  }).map((page) => selectFile(session, page.file)).map((file) => {
+    var _a6;
+    const { mdast: mdast2, slug, frontmatter } = file !== null && file !== void 0 ? file : {};
+    if (!mdast2 || !frontmatter) {
+      return [];
+    }
+    const title = (_a6 = frontmatter.title) !== null && _a6 !== void 0 ? _a6 : "";
+    const sections = toSectionedParts(mdast2);
+    const pageURL = slug && DEFAULT_INDEX_FILENAMES.includes(slug) ? "/" : `/${slug}`;
+    return sections.map((section, index4) => {
+      var _a7;
+      const hierarchy = buildHierarchy(title, sections, index4);
+      const recordURL = ((_a7 = section.heading) === null || _a7 === void 0 ? void 0 : _a7.html_id) ? `${pageURL}#${section.heading.html_id}` : pageURL;
+      return [
+        {
+          hierarchy,
+          type: sectionToHeadingLevel(section.heading),
+          url: recordURL,
+          position: 2 * index4
+        },
+        {
+          hierarchy,
+          content: section.parts.join(""),
+          type: "content",
+          url: recordURL,
+          position: 2 * index4 + 1
+        }
+      ];
+    }).flat();
+  }).flat();
+  const data = {
+    version: "1",
+    records
+  };
+  const filename = (0, import_node_path37.join)(session.sitePath(), "myst.search.json");
+  session.log.debug(`Writing myst.search.json file: ${filename}`);
+  writeFileToFolder(filename, JSON.stringify(data));
+}
 async function writeObjectsInv(session, states, siteConfig) {
   const inv = new Inventory({
     project: siteConfig === null || siteConfig === void 0 ? void 0 : siteConfig.title,
@@ -303447,7 +303604,7 @@ async function writeFile(session, { file, pageSlug, projectSlug, projectPath })
   const selectedFile = selectFile(session, file);
   if (!selectedFile)
     return;
-  const { frontmatter, mdast: mdast2, kind, sha256, slug, references, dependencies, location: location4 } = selectedFile;
+  const { frontmatter, mdast: mdast2, kind, sha256, slug, references, dependencies, location: location4, widgets } = selectedFile;
   const exports2 = await Promise.all([
     resolvePageSource(session, file),
     ...await resolvePageExports(session, file)
@@ -303465,6 +303622,7 @@ async function writeFile(session, { file, pageSlug, projectSlug, projectPath })
     location: location4,
     dependencies,
     frontmatter: frontmatterWithExports,
+    widgets,
     mdast: mdast2,
     references
   }));
@@ -303638,16 +303796,19 @@ ${page.file}
   if ((_b = opts === null || opts === void 0 ? void 0 : opts.writeFiles) !== null && _b !== void 0 ? _b : true) {
     await writeSiteManifest(session, opts);
     const states = [];
+    const allPages = [];
     await Promise.all(siteConfig.projects.map(async (project) => {
       if (!project.path)
         return;
       const { pages } = await loadProject(session, project.path);
+      allPages.push(...pages);
       states.push(...selectPageReferenceStates(session, pages, {
         suppressWarnings: true
       }));
     }));
     await writeObjectsInv(session, states, siteConfig);
     await writeMystXRefJson(session, states);
+    await writeMystSearchJson(session, allPages);
   }
   return true;
 }
@@ -306450,8 +306611,9 @@ var tableHandler = (node3, state) => {
     });
     return;
   }
-  state.useMacro('#import "@preview/tablex:0.0.7": tablex, cellx');
-  state.write(`${command}(columns: ${columns}, header-rows: ${countHeaderRows(node3)}, repeat-header: true,
+  state.useMacro('#import "@preview/tablex:0.0.8": tablex, cellx, hlinex, vlinex');
+  state.useMacro("#let tableStyle = (:)");
+  state.write(`${command}(columns: ${columns}, header-rows: ${countHeaderRows(node3)}, repeat-header: true, ..tableStyle,
 `);
   state.renderChildren(node3, 1);
   state.write(")\n");
@@ -316122,6 +316284,7 @@ async function startContentServer(session, opts) {
   app.use("/config.json", import_express.default.static((0, import_node_path53.join)(session.sitePath(), "config.json")));
   app.use("/objects.inv", import_express.default.static((0, import_node_path53.join)(session.sitePath(), "objects.inv")));
   app.use("/myst.xref.json", import_express.default.static((0, import_node_path53.join)(session.sitePath(), "myst.xref.json")));
+  app.use("/myst.search.json", import_express.default.static((0, import_node_path53.join)(session.sitePath(), "myst.search.json")));
   const server = app.listen(port, () => {
     session.log.debug(`Content server listening on port ${port}`);
   });
@@ -316347,6 +316510,7 @@ async function buildHtml(session, opts) {
     ref.data = (_a7 = ref.data) === null || _a7 === void 0 ? void 0 : _a7.replace(/^\/content/, "");
   });
   import_fs_extra.default.writeFileSync(import_node_path54.default.join(htmlDir, "myst.xref.json"), JSON.stringify(xrefs));
+  import_fs_extra.default.copySync(import_node_path54.default.join(session.sitePath(), "myst.search.json"), import_node_path54.default.join(htmlDir, "myst.search.json"));
   rewriteAssetsFolder(htmlDir, baseurl);
   process.exit(0);
 }