mystmd 1.3.27__tar.gz → 1.4.0__tar.gz

{mystmd-1.3.27 → mystmd-1.4.0}/PKG-INFO

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

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

{mystmd-1.3.27 → mystmd-1.4.0}/src/mystmd_py/myst.cjs

@@ -193440,7 +193440,7 @@ var {
 } = import_index.default;
 
 // src/version.ts
-var version = "1.3.27";
+var version = "1.4.0";
 var version_default = version;
 
 // ../myst-cli/dist/build/build.js
@@ -194047,7 +194047,7 @@ function validateUrl(input3, opts) {
   }
   return value;
 }
-function validateSubdomain(input3, opts) {
+function validateDomain(input3, opts) {
   let value = validateString(input3, { ...opts, maxLength: 2048 });
   if (value === void 0)
     return value;
@@ -194058,7 +194058,7 @@ function validateSubdomain(input3, opts) {
   try {
     url = new URL(value);
   } catch {
-    return validationError(`must be valid domain: ${input3}`, opts);
+    return validationError(`domain must be valid when used as a URL: ${input3}`, opts);
   }
   const { hash, host, pathname, protocol, search: search4 } = url;
   if (protocol !== "http:" && protocol !== "https:") {
@@ -194067,11 +194067,16 @@ function validateSubdomain(input3, opts) {
   if (pathname && pathname !== "/" || hash || search4) {
     return validationError(`must not specify path, query, or fragment: ${input3}`, opts);
   }
-  if (!host.match(/^.+\..+\..+$/)) {
-    return validationError(`must be a subdomain: ${input3}`, opts);
-  }
+  const numParts = host.split(".").length;
+  if (opts.minParts !== void 0 && opts.minParts > numParts)
+    return validationError(`must have at least ${opts.minParts} parts: ${input3}`, opts);
+  if (opts.maxParts !== void 0 && opts.maxParts < numParts)
+    return validationError(`must have at most ${opts.minParts} parts: ${input3}`, opts);
   return host.toLowerCase();
 }
+function validateSubdomain(input3, opts) {
+  return validateDomain(input3, { ...opts, minParts: 3 });
+}
 function validateEmail(input3, opts) {
   const value = validateString(input3, opts);
   if (value === void 0)
@@ -194455,7 +194460,7 @@ function validateStringOrNumber(input3, opts) {
   return validationError("must be string or number", opts);
 }
 
-// ../myst-frontmatter/dist/utils/socialLinks.js
+// ../myst-frontmatter/dist/socials/types.js
 var SOCIAL_LINKS_KEYS = [
   "url",
   "github",
@@ -194463,8 +194468,14 @@ var SOCIAL_LINKS_KEYS = [
   "mastodon",
   "linkedin",
   "threads",
-  "twitter"
+  "twitter",
   // Change to 'x' in future
+  "youtube",
+  "discourse",
+  "discord",
+  "slack",
+  "facebook",
+  "telegram"
 ];
 var SOCIAL_LINKS_ALIASES = {
   website: "url",
@@ -194474,30 +194485,171 @@ var SOCIAL_LINKS_ALIASES = {
   instagram: "threads"
   // This is the same username
 };
-function validateSocialLinks(input3, opts, output2 = {}) {
+
+// ../myst-frontmatter/dist/socials/validators.js
+var MASTODON_REGEX = /^@?([a-zA-Z0-9_]+)@([^@]+\.[^@]*[^.])$/;
+var BLUESKY_REGEX = /^@?([^/:]+\..*[^.])$/;
+var BLUESKY_URL_REGEX = /^https:\/\/bsky\.app\/profile\/@?(.+\..*[^.])$/;
+var YOUTUBE_REGEX = /^@?([a-zA-Z0-9.]+)$/;
+var THREADS_REGEX = /^[a-zA-Z0-9_.]+$/;
+var TWITTER_REGEX = /^@?([a-zA-Z0-9_]{4,15})$/;
+var TWITTER_URL_REGEX = /^https:\/\/(?:twitter\.com|x\.com)\/@?([a-zA-Z0-9_]{4,15})$/;
+var GITHUB_USERNAME_REGEX = /^@?([a-zA-Z0-9_.-]+)$/;
+var GITHUB_ORG_URL_REGEX = /^https:\/\/github\.com\/orgs\/[a-zA-Z0-9_.-]+$/;
+var TELEGRAM_REGEX = /^@?([a-zA-Z0-9_]{5,})$/;
+var TELEGRAM_URL_REGEX = /^https:\/\/(?:t\.me|telegram\.me)\/?([a-zA-Z0-9_]{5,})$/;
+function validateMastodon(input3, opts) {
+  const value = validateString(input3, opts);
+  if (value === void 0)
+    return void 0;
+  const match3 = value.match(MASTODON_REGEX);
+  if (match3 === null)
+    return validationError(`must be a user ID of the form @username@server e.g. @mystmarkdown@fosstodon.org`, opts);
+  const username = match3[1];
+  const host = validateDomain(match3[2], opts);
+  if (host === void 0)
+    return void 0;
+  return `@${username}@${host}`;
+}
+function validateBluesky(input3, opts) {
+  const value = validateString(input3, opts);
+  if (value === void 0)
+    return void 0;
+  let match3;
+  if (match3 = value.match(BLUESKY_REGEX)) {
+    const domain = validateDomain(match3[1], opts);
+    if (domain === void 0)
+      return void 0;
+    return `@${domain}`;
+  } else {
+    const result = validateUrl(value, opts);
+    if (result === void 0)
+      return void 0;
+    match3 = result.match(BLUESKY_URL_REGEX);
+    if (match3 === null) {
+      return validationError(`Bluesky profile URL must be a valid URL starting with https://bsky.app/profile/: ${value}`, opts);
+    }
+    const domain = validateDomain(match3[1], opts);
+    if (domain === void 0)
+      return void 0;
+    return `@${domain}`;
+  }
+}
+function validateTwitter(input3, opts) {
+  const value = validateString(input3, opts);
+  if (value === void 0)
+    return void 0;
+  let match3;
+  if (match3 = value.match(TWITTER_URL_REGEX)) {
+    return match3[1];
+  } else if (match3 = value.match(TWITTER_REGEX)) {
+    return match3[1];
+  } else {
+    return validationError(`Twitter social identity must be a valid URL starting with https://twitter.com/, https://x.com/, or a valid username: ${value}`, opts);
+  }
+}
+function validateTelegram(input3, opts) {
+  const value = validateString(input3, opts);
+  if (value === void 0)
+    return void 0;
+  let match3;
+  if (match3 = value.match(TELEGRAM_URL_REGEX)) {
+    return match3[1];
+  } else if (match3 = value.match(TELEGRAM_REGEX)) {
+    return match3[1];
+  } else {
+    return validationError(`Telegram social identity must be a valid URL starting with either https://t.me/ or https://telegram.me/, or a valid username: ${value}`, opts);
+  }
+}
+function validateYouTube(input3, opts) {
+  const value = validateString(input3, opts);
+  if (value === void 0)
+    return void 0;
+  if (/^https?:\/\//.test(value)) {
+    return validateUrl(input3, { ...opts, includes: "youtube.com" });
+  }
+  let match3;
+  if (match3 = value.match(YOUTUBE_REGEX)) {
+    return match3[1];
+  } else {
+    return validationError(`YouTube social identity must be a valid URL starting with https://youtube.com/ or a valid handle: ${value}`, opts);
+  }
+}
+function validateGitHub(input3, opts) {
+  const value = validateString(input3, opts);
+  if (value === void 0)
+    return void 0;
+  let match3;
+  if (match3 = value.match(GITHUB_USERNAME_REGEX)) {
+    return match3[1];
+  } else if (match3 = value.match(GITHUB_USERNAME_REPO_REGEX)) {
+    return match3[0];
+  } else if (match3 = value.match(GITHUB_ORG_URL_REGEX)) {
+    return match3[0];
+  } else {
+    return validationError(`GitHub social identity must be a valid username, org/repo, or org URL: ${value}`, opts);
+  }
+}
+function validateSocialLinks(input3, opts, output2) {
   const value = output2 ? input3 : validateObjectKeys(input3, { optional: SOCIAL_LINKS_KEYS, alias: SOCIAL_LINKS_ALIASES }, opts);
+  if (value === void 0)
+    return void 0;
+  const result = output2 !== null && output2 !== void 0 ? output2 : {};
   if (defined(value.url)) {
-    output2.url = validateUrl(value.url, incrementOptions("url", opts));
+    result.url = validateUrl(value.url, incrementOptions("url", opts));
   }
   if (defined(value.github)) {
-    output2.github = validateString(value.github, incrementOptions("github", opts));
+    result.github = validateGitHub(value.github, incrementOptions("github", opts));
   }
   if (defined(value.bluesky)) {
-    output2.bluesky = validateString(value.bluesky, incrementOptions("bluesky", opts));
+    result.bluesky = validateBluesky(value.bluesky, incrementOptions("bluesky", opts));
   }
   if (defined(value.mastodon)) {
-    output2.mastodon = validateString(value.mastodon, incrementOptions("mastodon", opts));
+    result.mastodon = validateMastodon(value.mastodon, incrementOptions("mastodon", opts));
   }
   if (defined(value.linkedin)) {
-    output2.linkedin = validateUrl(value.linkedin, incrementOptions("linkedin", opts));
+    result.linkedin = validateUrl(value.linkedin, {
+      ...incrementOptions("linkedin", opts),
+      includes: "linkedin.com"
+    });
   }
   if (defined(value.threads)) {
-    output2.threads = validateString(value.threads, incrementOptions("threads", opts));
+    result.threads = validateString(value.threads, {
+      ...incrementOptions("threads", opts),
+      regex: THREADS_REGEX
+    });
   }
   if (defined(value.twitter)) {
-    output2.twitter = validateString(value.twitter, incrementOptions("twitter", opts));
+    result.twitter = validateTwitter(value.twitter, incrementOptions("twitter", opts));
   }
-  return output2;
+  if (defined(value.telegram)) {
+    result.telegram = validateTelegram(value.telegram, incrementOptions("telegram", opts));
+  }
+  if (defined(value.youtube)) {
+    result.youtube = validateYouTube(value.youtube, incrementOptions("youtube", opts));
+  }
+  if (defined(value.discourse)) {
+    result.discourse = validateUrl(value.discourse, incrementOptions("discourse", opts));
+  }
+  if (defined(value.discord)) {
+    result.discord = validateUrl(value.discord, {
+      ...incrementOptions("discord", opts),
+      includes: "discord"
+    });
+  }
+  if (defined(value.slack)) {
+    result.slack = validateUrl(value.slack, {
+      ...incrementOptions("slack", opts),
+      includes: "slack.com"
+    });
+  }
+  if (defined(value.facebook)) {
+    result.facebook = validateUrl(value.facebook, {
+      ...incrementOptions("facebook", opts),
+      includes: "facebook.com"
+    });
+  }
+  return result;
 }
 
 // ../myst-frontmatter/dist/affiliations/validators.js
@@ -195102,6 +195254,7 @@ var SITE_FRONTMATTER_KEYS = [
   "copyright",
   "options",
   "parts",
+  "social",
   ...PAGE_KNOWN_PARTS
 ];
 var FRONTMATTER_ALIASES = {
@@ -195131,7 +195284,8 @@ var FRONTMATTER_ALIASES = {
   key_points: "keypoints",
   "key-points": "keypoints",
   image: "thumbnail",
-  identifier: "identifiers"
+  identifier: "identifiers",
+  socials: "social"
 };
 
 // ../myst-frontmatter/dist/project/types.js
@@ -199222,6 +199376,9 @@ function validateProjectFrontmatterKeys(value, opts) {
   if (defined(value.toc)) {
     output2.toc = validateTOC(value.toc, incrementOptions("toc", opts));
   }
+  if (defined(value.social)) {
+    output2.social = validateSocialLinks(value.social, incrementOptions("social", opts));
+  }
   if (defined(value.requirements)) {
     output2.requirements = validateList(value.requirements, incrementOptions("requirements", opts), (req, index4) => {
       return validateString(req, incrementOptions(`requirements.${index4}`, opts));
@@ -237461,7 +237618,7 @@ function formatLinkText(link4) {
   if (((_a6 = link4.children) === null || _a6 === void 0 ? void 0 : _a6.length) !== 1 || link4.children[0].type !== "text")
     return;
   const url = link4.children[0].value;
-  if (url.length < 20 || url.match(/\s/) || url.startsWith("wiki:"))
+  if (url.length < 20 || url.match(/\s/))
     return;
   if (url.includes("\u200B"))
     return;
@@ -237477,7 +237634,9 @@ function linksTransform(mdast2, file, opts) {
       link4.urlSource = link4.url;
     const transform3 = opts.transformers.find((t2) => t2.test(link4.urlSource));
     const result = transform3 === null || transform3 === void 0 ? void 0 : transform3.transform(link4, file);
-    formatLinkText(link4);
+    if (!(transform3 === null || transform3 === void 0 ? void 0 : transform3.formatsText)) {
+      formatLinkText(link4);
+    }
     if (!transform3 || result === void 0)
       return;
     if (result) {
@@ -237692,6 +237851,7 @@ var WikiTransformer = class {
   constructor(opts) {
     var _a6, _b;
     this.protocol = "wiki";
+    this.formatsText = true;
     this.wikiUrl = removeWiki((_a6 = opts === null || opts === void 0 ? void 0 : opts.url) !== null && _a6 !== void 0 ? _a6 : `https://${(opts === null || opts === void 0 ? void 0 : opts.lang) || DEFAULT_LANGUAGE}.wikipedia.org/`, "/");
     this.lang = (opts === null || opts === void 0 ? void 0 : opts.lang) || ((_b = `${this.wikiUrl}wiki/x`.match(ANY_WIKIPEDIA_ORG)) === null || _b === void 0 ? void 0 : _b[1]) || void 0;
   }
@@ -237700,10 +237860,9 @@ var WikiTransformer = class {
       return false;
     if (uri.startsWith("wiki:"))
       return true;
-    if (uri.match(ANY_WIKIPEDIA_ORG))
-      return true;
-    if (withoutHttp(uri).startsWith(withoutHttp(this.wikiUrl)))
-      return true;
+    if (uri.match(ANY_WIKIPEDIA_ORG) || withoutHttp(uri).startsWith(withoutHttp(this.wikiUrl))) {
+      return !uri.match(/\/w\/index\.php(\?[^/]*)?$/);
+    }
     return false;
   }
   pageName(uri) {
@@ -281732,11 +281891,44 @@ var bibliographyDirective = {
 };
 
 // ../myst-directives/dist/code.js
-function parseEmphasizeLines(emphasizeLinesString) {
+function parseEmphasizeLines(data, vfile2, emphasizeLinesString) {
+  const { node: node3 } = data;
   if (!emphasizeLinesString)
     return void 0;
-  const emphasizeLines = emphasizeLinesString === null || emphasizeLinesString === void 0 ? void 0 : emphasizeLinesString.split(",").map((val) => Number(val.trim())).filter((val) => Number.isInteger(val));
-  return emphasizeLines;
+  const result = /* @__PURE__ */ new Set();
+  for (const part of emphasizeLinesString.split(",")) {
+    const trimmed = part.trim();
+    const rangeMatch = trimmed.match(/^(\d+)\s*-\s*(\d+)$/);
+    if (rangeMatch) {
+      const start = Number(rangeMatch[1]);
+      const end = Number(rangeMatch[2]);
+      if (start <= end) {
+        for (let i2 = start; i2 <= end; i2++) {
+          result.add(i2);
+        }
+        continue;
+      } else {
+        fileWarn(vfile2, `Invalid emphasize-lines range "${trimmed}" (start > end)`, {
+          node: node3,
+          source: "code-block:options",
+          ruleId: RuleId.directiveOptionsCorrect
+        });
+        continue;
+      }
+    }
+    if (/^\d+$/.test(trimmed)) {
+      result.add(Number(trimmed));
+    } else if (trimmed !== "") {
+      fileWarn(vfile2, `Invalid emphasize-lines value "${trimmed}"`, {
+        node: node3,
+        source: "code-block:options",
+        ruleId: RuleId.directiveOptionsCorrect
+      });
+    }
+  }
+  if (result.size === 0)
+    return void 0;
+  return Array.from(result).sort((a2, b) => a2 - b);
 }
 function getCodeBlockOptions(data, vfile2, defaultFilename) {
   var _a6;
@@ -281748,7 +281940,7 @@ function getCodeBlockOptions(data, vfile2, defaultFilename) {
       ruleId: RuleId.directiveOptionsCorrect
     });
   }
-  const emphasizeLines = parseEmphasizeLines(options === null || options === void 0 ? void 0 : options["emphasize-lines"]);
+  const emphasizeLines = parseEmphasizeLines(data, vfile2, options === null || options === void 0 ? void 0 : options["emphasize-lines"]);
   const numberLines = options === null || options === void 0 ? void 0 : options["number-lines"];
   const showLineNumbers = (options === null || options === void 0 ? void 0 : options.linenos) || (options === null || options === void 0 ? void 0 : options["lineno-start"]) || (options === null || options === void 0 ? void 0 : options["lineno-match"]) || numberLines ? true : void 0;
   let startingLineNumber = numberLines != null && numberLines > 1 ? numberLines : options === null || options === void 0 ? void 0 : options["lineno-start"];
@@ -281789,7 +281981,7 @@ var CODE_DIRECTIVE_OPTIONS = {
   },
   "emphasize-lines": {
     type: String,
-    doc: 'Emphasize particular lines (comma-separated numbers), e.g. "3,5"'
+    doc: 'Emphasize particular lines (comma-separated numbers which can include ranges), e.g. "3,5,7-9"'
   },
   filename: {
     type: String,
@@ -289736,7 +289928,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.3.27";
+var version2 = "1.4.0";
 var version_default2 = version2;
 
 // ../myst-cli/dist/utils/headers.js
@@ -291200,7 +291392,6 @@ function getLocation(file, projectPath) {
 }
 async function loadFile(session, file, projectPath, extension, opts) {
   var _a6;
-  await session.loadPlugins();
   const toc = tic();
   session.store.dispatch(warnings.actions.clearWarnings({ file }));
   const cache = castSession(session);
@@ -291660,6 +291851,7 @@ async function resolveProjectConfigPaths(session, path44, projectConfig, resolut
         return info;
       }
     }));
+    await session.loadPlugins(resolvedFields.plugins);
   }
   if (projectConfig.parts) {
     resolvedFields.parts = await loadFrontmatterParts(session, file, "project.parts", { parts: projectConfig.parts }, path44);
@@ -298320,7 +298512,8 @@ function projectFromTOC(session, path44, toc, level = 1, file, opts) {
   }
   if ((opts === null || opts === void 0 ? void 0 : opts.urlFolders) && !opts.projectPath)
     opts.projectPath = path44;
-  const { slug } = fileInfo2(indexFile, pageSlugs, { ...opts, session });
+  const slug = "index";
+  pageSlugs[slug] = 1;
   const pages = [];
   pagesFromEntries(session, path44, entries2, pages, level, pageSlugs, opts);
   return { path: path44 || ".", file: indexFile, index: slug, pages };
@@ -300244,7 +300437,7 @@ var KIND_TO_EXT = {
   site: void 0
 };
 var DEFAULT_TEMPLATES = {
-  tex: "tex/myst/curvenote",
+  tex: "tex/myst/plain_latex",
   typst: "typst/myst/lapreprint-typst",
   docx: "docx/myst/default",
   site: "site/myst/book-theme"
@@ -302012,8 +302205,8 @@ function makeNamedExportOption(description) {
 function makeStrictOption() {
   return new Option("--strict", "Summarize build warnings and stop on any errors.").default(false);
 }
-function makeForceOption() {
-  return new Option("--force", "Build outputs for the given format, even if corresponding exports are not defined in file frontmatter").default(false);
+function makeForceOption(description) {
+  return new Option("--force", description).default(false);
 }
 function makeCheckLinksOption() {
   return new Option("--check-links", "Check all links to websites resolve.").default(false);
@@ -321198,7 +321391,7 @@ async function clean2(session, files, opts) {
 
 // ../myst-cli/dist/cli/build.js
 function makeBuildCommand() {
-  const command = new Command("build").description("Build PDF, LaTeX, Word and website exports from MyST files").argument("[files...]", "list of files to export").addOption(makeExecuteOption("Execute Notebooks")).addOption(makePdfOption("Build PDF output")).addOption(makeTexOption("Build LaTeX outputs")).addOption(makeTypstOption("Build Typst outputs")).addOption(makeDocxOption("Build Docx output")).addOption(makeMdOption("Build MD output")).addOption(makeJatsOption("Build JATS xml output")).addOption(makeMecaOptions("Build MECA zip output")).addOption(makeCffOption("Build CFF output")).addOption(makeSiteOption(`Build ${readableName()} site content`)).addOption(makeHtmlOption("Build static HTML site content")).addOption(makeAllOption("Build all exports")).addOption(makeDOIBibOption()).addOption(makeWatchOption()).addOption(makeNamedExportOption("Output file for the export")).addOption(makeForceOption()).addOption(makeCheckLinksOption()).addOption(makeStrictOption()).addOption(makeCIOption()).addOption(makeMaxSizeWebpOption());
+  const command = new Command("build").description("Build PDF, LaTeX, Word and website exports from MyST files").argument("[files...]", "list of files to export").addOption(makeExecuteOption("Execute Notebooks")).addOption(makePdfOption("Build PDF output")).addOption(makeTexOption("Build LaTeX outputs")).addOption(makeTypstOption("Build Typst outputs")).addOption(makeDocxOption("Build Docx output")).addOption(makeMdOption("Build MD output")).addOption(makeJatsOption("Build JATS xml output")).addOption(makeMecaOptions("Build MECA zip output")).addOption(makeCffOption("Build CFF output")).addOption(makeSiteOption(`Build ${readableName()} site content`)).addOption(makeHtmlOption("Build static HTML site content")).addOption(makeAllOption("Build all exports")).addOption(makeDOIBibOption()).addOption(makeWatchOption()).addOption(makeNamedExportOption("Output file for the export")).addOption(makeForceOption("Build outputs for the given format, even if corresponding exports are not defined in file frontmatter")).addOption(makeCheckLinksOption()).addOption(makeStrictOption()).addOption(makeCIOption()).addOption(makeMaxSizeWebpOption());
   return command;
 }
 
@@ -326381,36 +326574,28 @@ ${stderr}
 }
 
 // ../myst-cli/dist/plugins.js
-async function loadPlugins(session) {
-  let configPlugins = [];
-  const state = session.store.getState();
-  const projConfig = selectors_exports.selectCurrentProjectConfig(state);
-  if (projConfig === null || projConfig === void 0 ? void 0 : projConfig.plugins)
-    configPlugins.push(...projConfig.plugins);
-  const siteConfig = selectors_exports.selectCurrentSiteConfig(state);
-  if (siteConfig === null || siteConfig === void 0 ? void 0 : siteConfig.projects) {
-    siteConfig.projects.filter((project) => !!project.path).forEach((project) => {
-      const siteProjConfig = selectors_exports.selectLocalProjectConfig(state, project.path);
-      if (siteProjConfig === null || siteProjConfig === void 0 ? void 0 : siteProjConfig.plugins)
-        configPlugins.push(...siteProjConfig.plugins);
-    });
-  }
-  configPlugins = [...new Map(configPlugins.map((info) => [info.path, info])).values()];
-  const plugins3 = {
+async function loadPlugins(session, plugins3) {
+  var _a6;
+  const loadedPlugins = (_a6 = session.plugins) !== null && _a6 !== void 0 ? _a6 : {
     directives: [],
     roles: [],
-    transforms: []
+    transforms: [],
+    paths: []
   };
-  if (configPlugins.length === 0) {
-    return plugins3;
+  const newPlugins = [...new Map(plugins3.map((info) => [info.path, info])).values()].filter(
+    // ...and filter out already loaded plugins
+    ({ path: path44 }) => !loadedPlugins.paths.includes(path44)
+  );
+  if (newPlugins.length === 0) {
+    return loadedPlugins;
   }
-  session.log.debug(`Loading plugins: "${configPlugins.map((info) => `${info.path} (${info.type})`).join('", "')}"`);
-  const modules = await Promise.all(configPlugins.map(async (info) => {
-    var _a6, _b;
+  session.log.debug(`Loading plugins: "${newPlugins.map((info) => `${info.path} (${info.type})`).join('", "')}"`);
+  const modules = await Promise.all(newPlugins.map(async (info) => {
+    var _a7, _b;
     const { type: type2, path: path44 } = info;
     switch (type2) {
       case "executable": {
-        if (!((_a6 = import_node_fs44.default.statSync(path44, { throwIfNoEntry: false })) === null || _a6 === void 0 ? void 0 : _a6.isFile())) {
+        if (!((_a7 = import_node_fs44.default.statSync(path44, { throwIfNoEntry: false })) === null || _a7 === void 0 ? void 0 : _a7.isFile())) {
           addWarningForFile(session, path44, `Unknown plugin "${path44}", it must be an executable file`, "error", {
             ruleId: RuleId.pluginLoads
           });
@@ -326460,26 +326645,28 @@ ${error === null || error === void 0 ? void 0 : error.stack}
     }
   }));
   modules.forEach((pluginLoader) => {
-    var _a6;
+    var _a7;
     if (!pluginLoader)
       return;
     const plugin5 = pluginLoader.module.default || pluginLoader.module.plugin;
     const directives = plugin5.directives || pluginLoader.module.directives;
     const roles = plugin5.roles || pluginLoader.module.roles;
     const transforms = plugin5.transforms || pluginLoader.module.transforms;
-    session.log.info(`\u{1F50C} ${(_a6 = plugin5 === null || plugin5 === void 0 ? void 0 : plugin5.name) !== null && _a6 !== void 0 ? _a6 : "Unnamed Plugin"} (${pluginLoader.path}) loaded: ${plural("%s directive(s)", directives)}, ${plural("%s role(s)", roles)}, ${plural("%s transform(s)", transforms)}`);
+    session.log.info(`\u{1F50C} ${(_a7 = plugin5 === null || plugin5 === void 0 ? void 0 : plugin5.name) !== null && _a7 !== void 0 ? _a7 : "Unnamed Plugin"} (${pluginLoader.path}) loaded: ${plural("%s directive(s)", directives)}, ${plural("%s role(s)", roles)}, ${plural("%s transform(s)", transforms)}`);
     if (directives) {
-      plugins3.directives.push(...directives);
+      loadedPlugins.directives.push(...directives);
     }
     if (roles) {
-      plugins3.roles.push(...roles);
+      loadedPlugins.roles.push(...roles);
     }
     if (transforms) {
-      plugins3.transforms.push(...transforms);
+      loadedPlugins.transforms.push(...transforms);
     }
+    loadedPlugins.paths.push(pluginLoader.path);
   });
+  session.plugins = loadedPlugins;
   session.log.debug("Plugins loaded");
-  return plugins3;
+  return loadedPlugins;
 }
 
 // ../myst-cli/dist/session/session.js
@@ -333145,11 +333332,8 @@ var Session = class {
     logData.done = true;
     return resp;
   }
-  async loadPlugins() {
-    if (this._pluginPromise)
-      return this._pluginPromise;
-    this._pluginPromise = loadPlugins(this);
-    this.plugins = await this._pluginPromise;
+  async loadPlugins(plugins3) {
+    this.plugins = await loadPlugins(this, plugins3);
     return this.plugins;
   }
   sourcePath() {
@@ -333845,7 +334029,7 @@ function getKind(session, kinds) {
     return void 0;
   const { pdf, tex, typst, docx, site } = kinds;
   if (pdf)
-    session.log.warn('PDF templates may use either "tex" or "typst"');
+    session.log.warn('PDF templates may be either "tex" or "typst", including both.');
   const flags = {
     [TemplateKind.tex]: (tex || pdf) ?? false,
     [TemplateKind.typst]: (typst || pdf) ?? false,
@@ -333860,8 +334044,11 @@ function getKind(session, kinds) {
 async function downloadTemplateCLI(session, template, path44, opts) {
   const templateKind = getKindFromName(template);
   const kinds = templateKind ? [templateKind] : getKind(session, opts);
-  if (!kinds || kinds.length > 1) {
-    throw new Error("Cannot lookup a template with more than one kind.");
+  if (!(kinds == null ? void 0 : kinds.length)) {
+    throw new Error("Cannot lookup a template without specifying a kind (e.g. typst).");
+  }
+  if (kinds.length > 1) {
+    throw new Error("Cannot lookup a template when more than one kind is specified.");
   }
   const kind = kinds[0];
   const { templatePath: defaultTemplatePath, templateUrl } = resolveInputs(session, {
@@ -333968,7 +334155,7 @@ Tags: ${source_default8.dim(
   });
 }
 function makeDownloadCLI(program3) {
-  const command = new Command("download").description("Download a public template to a path").argument("<template>", "The template URL or name").argument("[path]", "A folder to download and unzip the template to").addOption(makePdfOption("Download PDF template")).addOption(makeTexOption("Download LaTeX template")).addOption(makeTypstOption("Download Typst template")).addOption(makeDocxOption("Download Docx template")).addOption(makeSiteOption("Download Site template")).addOption(makeForceOption()).action(clirun2(Session, downloadTemplateCLI, program3));
+  const command = new Command("download").description("Download a public template to a path").argument("<template>", "The template URL or name").argument("[path]", "A folder to download and unzip the template to").addOption(makePdfOption("Download PDF template")).addOption(makeTexOption("Download LaTeX template")).addOption(makeTypstOption("Download Typst template")).addOption(makeDocxOption("Download Docx template")).addOption(makeSiteOption("Download Site template")).addOption(makeForceOption("Overwrite existing downloaded templates")).action(clirun2(Session, downloadTemplateCLI, program3));
   return command;
 }
 function makeListCLI(program3) {