mystmd 1.5.1__tar.gz → 1.6.1__tar.gz

{mystmd-1.5.1 → mystmd-1.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mystmd
-Version: 1.5.1
+Version: 1.6.1
 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.5.1 → mystmd-1.6.1}/_package.json

@@ -1,6 +1,6 @@
 {
   "name": "mystmd",
-  "version": "1.5.1",
+  "version": "1.6.1",
   "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.5.1"
+    "myst-cli": "^1.6.1"
   }
 }

{mystmd-1.5.1 → mystmd-1.6.1}/src/mystmd_py/myst.cjs

@@ -193391,7 +193391,7 @@ var {
 } = import_index.default;
 
 // src/version.ts
-var version = "1.5.1";
+var version = "1.6.1";
 var version_default = version;
 
 // ../myst-cli/dist/build/build.js
@@ -195264,6 +195264,7 @@ var PROJECT_AND_PAGE_FRONTMATTER_KEYS = [
   "settings",
   // We maybe want to move this into site frontmatter in the future
   "edit_url",
+  "source_url",
   ...KNOWN_EXTERNAL_IDENTIFIERS,
   // Do not add any project specific keys here!
   ...SITE_FRONTMATTER_KEYS
@@ -199366,6 +199367,11 @@ function validateProjectAndPageFrontmatterKeys(value, opts) {
   } else if (defined(value.edit_url)) {
     output2.edit_url = validateUrl(value.edit_url, incrementOptions("edit_url", opts));
   }
+  if (value.source_url === null) {
+    output2.source_url = null;
+  } else if (defined(value.source_url)) {
+    output2.source_url = validateUrl(value.source_url, incrementOptions("source_url", opts));
+  }
   return output2;
 }
 function validateProjectFrontmatterKeys(value, opts) {
@@ -205195,10 +205201,19 @@ function buffer(value) {
 
 // ../myst-transforms/dist/admonitions.js
 var githubAdmonitionKinds = ["note", "tip", "important", "warning", "caution"];
+function getPossibleAdmonitionHeaderChildren(possibleHeading) {
+  var _a6;
+  if ((possibleHeading === null || possibleHeading === void 0 ? void 0 : possibleHeading.type) === "paragraph" && ((_a6 = possibleHeading.children) === null || _a6 === void 0 ? void 0 : _a6.length) === 1 && possibleHeading.children[0].type === "strong") {
+    return possibleHeading.children[0].children;
+  } else if ((possibleHeading === null || possibleHeading === void 0 ? void 0 : possibleHeading.type) === "heading") {
+    return possibleHeading.children;
+  }
+  return void 0;
+}
 function admonitionHeadersTransform(tree, opts) {
   const admonitions = selectAll("admonition", tree);
   admonitions.forEach((node3) => {
-    var _a6, _b, _c, _d2, _e;
+    var _a6, _b, _c, _d2;
     if (!node3.kind || node3.kind === AdmonitionKind.admonition || // This condition is legacy
     ((_b = (_a6 = node3.children) === null || _a6 === void 0 ? void 0 : _a6[0]) === null || _b === void 0 ? void 0 : _b.type) === "admonitionTitle") {
       return;
@@ -205212,12 +205227,9 @@ function admonitionHeadersTransform(tree, opts) {
     ];
     if ((_d2 = opts === null || opts === void 0 ? void 0 : opts.replaceAdmonitionTitles) !== null && _d2 !== void 0 ? _d2 : true) {
       const [admonitionHeader, possibleHeading, ...rest] = node3.children;
-      if ((possibleHeading === null || possibleHeading === void 0 ? void 0 : possibleHeading.type) === "paragraph" && ((_e = possibleHeading.children) === null || _e === void 0 ? void 0 : _e.length) === 1 && possibleHeading.children[0].type === "strong") {
-        const strongTextChildren = possibleHeading.children[0].children;
-        admonitionHeader.children = strongTextChildren;
-        node3.children = [admonitionHeader, ...rest];
-      } else if ((possibleHeading === null || possibleHeading === void 0 ? void 0 : possibleHeading.type) === "heading") {
-        admonitionHeader.children = possibleHeading.children;
+      const headerChildren = getPossibleAdmonitionHeaderChildren(possibleHeading);
+      if (headerChildren) {
+        admonitionHeader.children = headerChildren;
         node3.children = [admonitionHeader, ...rest];
       }
     }
@@ -238747,17 +238759,29 @@ function listFromPages(pages, projectSlug) {
 function listItemFromPages(pages, projectSlug) {
   if (pages.length === 0)
     return;
-  const { title, slug, enumerator, level } = pages[0];
+  const { title, slug, url, enumerator, level } = pages[0];
   const text7 = {
     type: "text",
     value: `${enumerator ? `${enumerator} ` : ""}${title}`
   };
-  const child = slug != null ? {
-    type: "link",
-    url: `${projectSlug ? `/${projectSlug}` : ""}/${slug}`,
-    internal: true,
-    children: [text7]
-  } : text7;
+  let child;
+  if (url != null) {
+    child = {
+      type: "link",
+      url,
+      internal: false,
+      children: [text7]
+    };
+  } else if (slug != null) {
+    child = {
+      type: "link",
+      url: `${projectSlug ? `/${projectSlug}` : ""}/${slug}`,
+      internal: true,
+      children: [text7]
+    };
+  } else {
+    child = text7;
+  }
   const item = {
     type: "listItem",
     children: [child]
@@ -288324,6 +288348,60 @@ function getTokenHandlers(specHandlers) {
   return handlers6;
 }
 
+// ../myst-parser/dist/transforms/listItemParagraphs.js
+function listItemParagraphsTransform(tree) {
+  selectAll("listItem", tree).forEach((node3) => {
+    if (!node3.children || node3.children.length === 0)
+      return;
+    const phrasingTypes2 = /* @__PURE__ */ new Set([
+      "text",
+      "emphasis",
+      "strong",
+      "delete",
+      "link",
+      "image",
+      "break",
+      "subscript",
+      "superscript",
+      "smallcaps",
+      "inlineCode",
+      "inlineMath",
+      "mystRole",
+      "footnoteReference",
+      "crossReference",
+      "cite",
+      "citeGroup",
+      "html"
+    ]);
+    const hasPhrasingContent = node3.children.some((child) => phrasingTypes2.has(child.type));
+    if (hasPhrasingContent) {
+      const newChildren = [];
+      let currentPhrasingGroup = [];
+      node3.children.forEach((child) => {
+        if (phrasingTypes2.has(child.type)) {
+          currentPhrasingGroup.push(child);
+        } else {
+          if (currentPhrasingGroup.length > 0) {
+            newChildren.push({
+              type: "paragraph",
+              children: currentPhrasingGroup
+            });
+            currentPhrasingGroup = [];
+          }
+          newChildren.push(child);
+        }
+      });
+      if (currentPhrasingGroup.length > 0) {
+        newChildren.push({
+          type: "paragraph",
+          children: currentPhrasingGroup
+        });
+      }
+      node3.children = newChildren;
+    }
+  });
+}
+
 // ../myst-parser/dist/tokensToMyst.js
 function computeAmsmathTightness(src, map14) {
   var _a6;
@@ -288823,6 +288901,7 @@ function nestSingleImagesIntoParagraphs(tree) {
 var defaultOptions2 = {
   handlers: defaultMdast,
   hoistSingleImagesOutofParagraphs: true,
+  listItemParagraphs: true,
   nestBlocks: true
 };
 function tokensToMyst(src, tokens, options = defaultOptions2) {
@@ -288852,6 +288931,9 @@ function tokensToMyst(src, tokens, options = defaultOptions2) {
       }
     }
   });
+  if (opts.listItemParagraphs) {
+    listItemParagraphsTransform(tree);
+  }
   visit(tree, "crossReference", (node3) => {
     delete node3.children;
     if (node3.value) {
@@ -289778,11 +289860,9 @@ var tabItemDirective = {
 var tabDirectives = [tabSetDirective, tabItemDirective];
 
 // ../myst-cli/dist/process/myst.js
-function parseMyst(session, content3, file, opts) {
+function getMystParserOptions(session, opts) {
   var _a6, _b, _c, _d2;
-  const vfile2 = new VFile();
-  vfile2.path = file;
-  const parsed = mystParse(content3, {
+  return {
     markdownit: { linkify: true },
     directives: [
       cardDirective,
@@ -289795,9 +289875,14 @@ function parseMyst(session, content3, file, opts) {
     extensions: {
       frontmatter: !(opts === null || opts === void 0 ? void 0 : opts.ignoreFrontmatter)
     },
-    roles: [buttonRole, ...(_d2 = (_c = session.plugins) === null || _c === void 0 ? void 0 : _c.roles) !== null && _d2 !== void 0 ? _d2 : []],
-    vfile: vfile2
-  });
+    roles: [buttonRole, ...(_d2 = (_c = session.plugins) === null || _c === void 0 ? void 0 : _c.roles) !== null && _d2 !== void 0 ? _d2 : []]
+  };
+}
+function parseMyst(session, content3, file, opts) {
+  const vfile2 = new VFile();
+  vfile2.path = file;
+  const parserOptions = getMystParserOptions(session, opts);
+  const parsed = mystParse(content3, { ...parserOptions, vfile: vfile2 });
   logMessagesFromVFile(session, vfile2);
   return parsed;
 }
@@ -289981,7 +290066,7 @@ var import_mime_types = __toESM(require_mime_types(), 1);
 var import_node_path16 = __toESM(require("path"), 1);
 
 // ../myst-cli/dist/version.js
-var version2 = "1.5.1";
+var version2 = "1.6.1";
 var version_default2 = version2;
 
 // ../myst-cli/dist/utils/headers.js
@@ -290296,6 +290381,10 @@ function npmPackageName() {
   var _a6;
   return (_a6 = process.env.MYSTMD_NPM_PACKAGE_NAME) !== null && _a6 !== void 0 ? _a6 : "mystmd";
 }
+function npmBinaryName() {
+  var _a6;
+  return (_a6 = process.env.MYSTMD_NPM_BINARY_NAME) !== null && _a6 !== void 0 ? _a6 : "myst";
+}
 function homeURL() {
   var _a6;
   return (_a6 = process.env.MYSTMD_HOME_URL) !== null && _a6 !== void 0 ? _a6 : "https://mystmd.org";
@@ -291782,14 +291871,6 @@ async function getValidatedConfigsFromFile(session, file, vfile2, stack) {
   }
   const { site: rawSite, project: rawProject } = conf !== null && conf !== void 0 ? conf : {};
   const path44 = (0, import_node_path18.dirname)(file);
-  if (rawSite) {
-    site = fillSiteConfig(await validateSiteConfigAndThrow(session, path44, vfile2, rawSite), site !== null && site !== void 0 ? site : {}, incrementOptions("extend", opts));
-  }
-  if (site) {
-    session.log.debug(`Loaded site config from ${file}`);
-  } else {
-    session.log.debug(`No site config in ${file}`);
-  }
   if (rawProject) {
     project = fillProjectFrontmatter(await validateProjectConfigAndThrow(session, path44, vfile2, rawProject), project !== null && project !== void 0 ? project : {}, projectOpts);
   }
@@ -291798,6 +291879,14 @@ async function getValidatedConfigsFromFile(session, file, vfile2, stack) {
   } else {
     session.log.debug(`No project config defined in ${file}`);
   }
+  if (rawSite) {
+    site = fillSiteConfig(await validateSiteConfigAndThrow(session, path44, vfile2, rawSite), site !== null && site !== void 0 ? site : {}, incrementOptions("extend", opts));
+  }
+  if (site) {
+    session.log.debug(`Loaded site config from ${file}`);
+  } else {
+    session.log.debug(`No site config in ${file}`);
+  }
   logMessagesFromVFile(session, vfile2);
   return { site, project, extend: extend5 };
 }
@@ -291948,13 +292037,6 @@ async function writeConfigs(session, path44, newConfigs) {
   const file = configFromPath(session, path44) || defaultConfigFile(session, path44);
   const vfile2 = new VFile();
   vfile2.path = file;
-  if (siteConfig) {
-    saveSiteConfig(session, path44, await validateSiteConfigAndThrow(session, path44, vfile2, siteConfig));
-  }
-  siteConfig = selectors_exports.selectLocalSiteConfig(session.store.getState(), path44);
-  if (siteConfig) {
-    siteConfig = await resolveSiteConfigPaths(session, path44, siteConfig, resolveToRelative, file);
-  }
   if (projectConfig) {
     saveProjectConfig(session, path44, await validateProjectConfigAndThrow(session, path44, vfile2, projectConfig));
   }
@@ -291963,6 +292045,13 @@ async function writeConfigs(session, path44, newConfigs) {
     projectConfig = prepareToWrite(projectConfig);
     projectConfig = await resolveProjectConfigPaths(session, path44, projectConfig, resolveToRelative, file);
   }
+  if (siteConfig) {
+    saveSiteConfig(session, path44, await validateSiteConfigAndThrow(session, path44, vfile2, siteConfig));
+  }
+  siteConfig = selectors_exports.selectLocalSiteConfig(session.store.getState(), path44);
+  if (siteConfig) {
+    siteConfig = await resolveSiteConfigPaths(session, path44, siteConfig, resolveToRelative, file);
+  }
   if (!siteConfig && !projectConfig) {
     session.log.debug(`No new config to write to ${file}`);
     return;
@@ -304704,7 +304793,8 @@ async function addEditUrl(session, frontmatter, file) {
     const getGitRoot = makeExecutable("git rev-parse --show-toplevel", gitLog);
     const gitRoot = (await getGitRoot()).trim();
     if (gitBranch && gitRoot && file.startsWith(gitRoot)) {
-      frontmatter.edit_url = `${frontmatter.github}/blob/${gitBranch}${file.replace(gitRoot, "")}`;
+      frontmatter.source_url = `${frontmatter.github}/blob/${gitBranch}${file.replace(gitRoot, "")}`;
+      frontmatter.edit_url = `${frontmatter.github}/edit/${gitBranch}${file.replace(gitRoot, "")}`;
       session.log.debug(`Added edit URL ${frontmatter.edit_url} to ${file}`);
     }
   } catch {
@@ -306891,8 +306981,13 @@ var handlers3 = {
     }
   },
   listItem(node3, state) {
+    var _a6, _b;
     state.write("\\item ");
-    state.renderChildren(node3, true);
+    if (((_b = (_a6 = node3.children) === null || _a6 === void 0 ? void 0 : _a6[0]) === null || _b === void 0 ? void 0 : _b.type) === "paragraph" && node3.children.length === 1) {
+      state.renderChildren(node3.children[0], true);
+    } else {
+      state.renderChildren(node3, true);
+    }
     state.write("\n");
   },
   thematicBreak(node3, state) {
@@ -313408,7 +313503,7 @@ To resolve this, run: myst build --all`, {
       });
     }
   });
-  const manuscriptExports = (await collectExportOptions(session, articleFile ? [articleFile] : [], [ExportFormats.docx, ExportFormats.pdf, ExportFormats.tex], {
+  const manuscriptExports = (await collectExportOptions(session, articleFile ? [articleFile] : [], [ExportFormats.docx, ExportFormats.pdf, ExportFormats.tex, ExportFormats.typst], {
     projectPath
   })).filter((exp) => {
     return exp.format !== ExportFormats.tex || import_node_path51.default.extname(exp.output) === ".zip";
@@ -318711,7 +318806,7 @@ async function currentSiteRoutes(session, host, baseurl, opts) {
         const pageSlug = slugToUrl(page.slug);
         return {
           url: `${host}${projSlug}/${pageSlug}`,
-          path: import_node_path57.default.join((_a8 = proj.slug) !== null && _a8 !== void 0 ? _a8 : "", `${pageSlug}.html`)
+          path: import_node_path57.default.join((_a8 = proj.slug) !== null && _a8 !== void 0 ? _a8 : "", `${pageSlug}/index.html`)
         };
       }),
       // Download all of the configured JSON
@@ -321579,7 +321674,7 @@ async function checkAtGitRoot() {
 
 // ../myst-cli/dist/init/gh-actions/index.js
 function createGithubPagesAction({ defaultBranch = "main", username = "username", isGithubIO }) {
-  return `# This file was created automatically with \`${binaryName()} init --gh-pages\` \u{1FA84} \u{1F49A}
+  return `# This file was created automatically with \`${npmBinaryName()} init --gh-pages\` \u{1FA84} \u{1F49A}
 # Ensure your GitHub Pages settings for this repository are set to deploy with **GitHub Actions**.
 
 name: ${readableName()} GitHub Pages Deploy
@@ -321619,7 +321714,7 @@ jobs:
       - name: Install ${readableName()}
         run: npm install -g ${npmPackageName()}
       - name: Build HTML Assets
-        run: ${binaryName()} build --html
+        run: ${npmBinaryName()} build --html
       - name: Upload artifact
         uses: actions/upload-pages-artifact@v3
         with:
@@ -321630,7 +321725,7 @@ jobs:
 `;
 }
 function createGithubCurvenoteAction({ defaultBranch = "main" }) {
-  return `# This file was created automatically with \`${binaryName()} init --gh-curvenote\` \u{1FA84} \u{1F49A}
+  return `# This file was created automatically with \`${npmBinaryName()} init --gh-curvenote\` \u{1FA84} \u{1F49A}
 
 name: Curvenote Deploy
 on:
@@ -321732,7 +321827,7 @@ ${filename}
 
     ${githubPagesUrl}
 ` : "on your https://{{ organization }}.github.io/{{ repo }} domain"}
-7. \u{1F389} Celebrate and tell us about your site on Twitter or Mastodon! \u{1F426} \u{1F418}
+7. \u{1F389} Celebrate and tell us about your site on BlueSky or Mastodon! \u{1F426} \u{1F418}
 `);
 }
 async function githubCurvenoteAction(session) {
@@ -321775,7 +321870,7 @@ ${filename}
     ${githubUrl}/actions
 ` : ""}
 7. Once the action completes, your site should be deployed
-8. \u{1F389} Celebrate and tell us about your site on Twitter or Mastodon! \u{1F426} \u{1F418}
+8. \u{1F389} Celebrate and tell us about your site on BlueSky or Mastodon! \u{1F426} \u{1F418}
 `);
 }