mystmd 1.2.3__tar.gz → 1.2.5__tar.gz

{mystmd-1.2.3 → mystmd-1.2.5}/PKG-INFO

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

{mystmd-1.2.3 → mystmd-1.2.5}/_package.json

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

{mystmd-1.2.3 → mystmd-1.2.5}/src/mystmd_py/myst.cjs

@@ -193279,7 +193279,7 @@ var {
 } = import_index.default;
 
 // src/version.ts
-var version = "1.2.3";
+var version = "1.2.5";
 var version_default = version;
 
 // ../myst-cli/dist/build/build.js
@@ -193969,6 +193969,8 @@ function validateDate(input3, opts) {
 function validateObject(input3, opts) {
   if (typeof input3 !== "object")
     return validationError(`must be object`, opts);
+  if (Array.isArray(input3))
+    return validationError(`must be object, not array`, opts);
   return input3;
 }
 function validateKeys(input3, keys2, opts) {
@@ -195374,6 +195376,9 @@ var licenses = {
     name: "BSD Zero Clause License",
     osi: true
   },
+  "3D-Slicer-1.0": {
+    name: "3D Slicer License v1.0"
+  },
   AAL: {
     name: "Attribution Assurance License",
     osi: true
@@ -195446,6 +195451,9 @@ var licenses = {
   Aladdin: {
     name: "Aladdin Free Public License"
   },
+  "AMD-newlib": {
+    name: "AMD newlib License"
+  },
   AMDPLPA: {
     name: "AMD's plpa_map.c License"
   },
@@ -195464,6 +195472,9 @@ var licenses = {
   "ANTLR-PD-fallback": {
     name: "ANTLR Software Rights Notice with license fallback"
   },
+  "any-OSI": {
+    name: "Any OSI License"
+  },
   "Apache-1.0": {
     name: "Apache License 1.0",
     free: true
@@ -195590,6 +195601,9 @@ var licenses = {
   "BSD-2-Clause-Darwin": {
     name: "BSD 2-Clause - Ian Darwin variant"
   },
+  "BSD-2-Clause-first-lines": {
+    name: "BSD 2-Clause - first lines requirement"
+  },
   "BSD-2-Clause-Patent": {
     name: "BSD-2-Clause Plus Patent License",
     osi: true
@@ -195711,6 +195725,9 @@ var licenses = {
   "Caldera-no-preamble": {
     name: "Caldera License (without preamble)"
   },
+  Catharon: {
+    name: "Catharon License"
+  },
   "CATOSL-1.1": {
     name: "Computer Associates Trusted Open Source License 1.1",
     osi: true
@@ -196073,6 +196090,9 @@ var licenses = {
   curl: {
     name: "curl License"
   },
+  "cve-tou": {
+    name: "Common Vulnerability Enumeration ToU License"
+  },
   "D-FSL-1.0": {
     name: "Deutsche Freie Software Lizenz"
   },
@@ -196346,6 +196366,9 @@ var licenses = {
   gtkbook: {
     name: "gtkbook License"
   },
+  Gutmann: {
+    name: "Gutmann License"
+  },
   HaskellReport: {
     name: "Haskell Language Report License"
   },
@@ -196378,21 +196401,33 @@ var licenses = {
   "HPND-export-US": {
     name: "HPND with US Government export control warning"
   },
+  "HPND-export-US-acknowledgement": {
+    name: "HPND with US Government export control warning and acknowledgment"
+  },
   "HPND-export-US-modify": {
     name: "HPND with US Government export control warning and modification rqmt"
   },
+  "HPND-export2-US": {
+    name: "HPND with US Government export control and 2 disclaimers"
+  },
   "HPND-Fenneberg-Livingston": {
     name: "Historical Permission Notice and Disclaimer - Fenneberg-Livingston variant"
   },
   "HPND-INRIA-IMAG": {
     name: "Historical Permission Notice and Disclaimer    - INRIA-IMAG variant"
   },
+  "HPND-Intel": {
+    name: "Historical Permission Notice and Disclaimer - Intel variant"
+  },
   "HPND-Kevlin-Henney": {
     name: "Historical Permission Notice and Disclaimer - Kevlin Henney variant"
   },
   "HPND-Markus-Kuhn": {
     name: "Historical Permission Notice and Disclaimer - Markus Kuhn variant"
   },
+  "HPND-merchantability-variant": {
+    name: "Historical Permission Notice and Disclaimer - merchantability variant"
+  },
   "HPND-MIT-disclaimer": {
     name: "Historical Permission Notice and Disclaimer with MIT disclaimer"
   },
@@ -196411,9 +196446,15 @@ var licenses = {
   "HPND-sell-variant-MIT-disclaimer": {
     name: "HPND sell variant with MIT disclaimer"
   },
+  "HPND-sell-variant-MIT-disclaimer-rev": {
+    name: "HPND sell variant with MIT disclaimer - reverse"
+  },
   "HPND-UC": {
     name: "Historical Permission Notice and Disclaimer - University of California variant"
   },
+  "HPND-UC-export-US": {
+    name: "Historical Permission Notice and Disclaimer - University of California, US export warning"
+  },
   HTMLTIDY: {
     name: "HTML Tidy License"
   },
@@ -196693,6 +196734,9 @@ var licenses = {
   "MIT-Festival": {
     name: "MIT Festival Variant"
   },
+  "MIT-Khronos-old": {
+    name: "MIT Khronos - old variant"
+  },
   "MIT-Modern-Variant": {
     name: "MIT License Modern Variant",
     osi: true
@@ -196790,9 +196834,15 @@ var licenses = {
   "NBPL-1.0": {
     name: "Net Boolean Public License v1"
   },
+  "NCBI-PD": {
+    name: "NCBI Public Domain Notice"
+  },
   "NCGL-UK-2.0": {
     name: "Non-Commercial Government Licence"
   },
+  NCL: {
+    name: "NCL Source Code License"
+  },
   NCSA: {
     name: "University of Illinois/NCSA Open Source License",
     osi: true,
@@ -196869,6 +196919,9 @@ var licenses = {
   "O-UDA-1.0": {
     name: "Open Use of Data Agreement v1.0"
   },
+  OAR: {
+    name: "OAR License"
+  },
   "OCCT-PL": {
     name: "Open CASCADE Technology Public License"
   },
@@ -197063,6 +197116,9 @@ var licenses = {
   Pixar: {
     name: "Pixar License"
   },
+  pkgconf: {
+    name: "pkgconf License"
+  },
   Plexus: {
     name: "Plexus Classworlds License"
   },
@@ -197079,6 +197135,9 @@ var licenses = {
     name: "PostgreSQL License",
     osi: true
   },
+  PPL: {
+    name: "Peer Production License"
+  },
   "PSF-2.0": {
     name: "Python Software Foundation License 2.0"
   },
@@ -197260,6 +197319,9 @@ var licenses = {
   "Sun-PPP": {
     name: "Sun PPP License"
   },
+  "Sun-PPP-2000": {
+    name: "Sun PPP License (2000)"
+  },
   SunPro: {
     name: "SunPro License"
   },
@@ -197287,6 +197349,9 @@ var licenses = {
   "TGPPL-1.0": {
     name: "Transitive Grace Period Public Licence 1.0"
   },
+  threeparttable: {
+    name: "threeparttable License"
+  },
   TMate: {
     name: "TMate Open Source License"
   },
@@ -197436,6 +197501,9 @@ var licenses = {
   XSkat: {
     name: "XSkat License"
   },
+  xzoom: {
+    name: "xzoom License"
+  },
   "YPL-1.0": {
     name: "Yahoo! Public License v1.0"
   },
@@ -198145,6 +198213,39 @@ function validateProjectAndPageSettings(value, opts) {
   return output2;
 }
 
+// ../myst-frontmatter/dist/math/validators.js
+function validateMathMacro(input3, opts) {
+  if (typeof input3 === "string") {
+    input3 = { macro: input3 };
+  }
+  const value = validateObjectKeys(input3, { required: ["macro"], optional: ["title", "description"] }, opts);
+  if (!value)
+    return;
+  const macro2 = validateString(value.macro, incrementOptions("macro", opts));
+  if (!macro2)
+    return;
+  const output2 = { macro: macro2 };
+  if (defined(value.title)) {
+    output2.title = validateString(value.title, incrementOptions("title", opts));
+  }
+  if (defined(value.description)) {
+    output2.description = validateString(value.description, incrementOptions("description", opts));
+  }
+  return output2;
+}
+function validateMathMacroObject(input3, opts) {
+  const value = validateObject(input3, opts);
+  if (!value)
+    return;
+  const validMacros = Object.entries(value).map(([key2, val]) => {
+    const macro2 = validateMathMacro(val, incrementOptions(key2, opts));
+    if (!macro2)
+      return false;
+    return [key2, macro2];
+  }).filter((valid2) => !!valid2);
+  return Object.fromEntries(validMacros);
+}
+
 // ../myst-frontmatter/dist/project/validators.js
 function validateProjectAndPageFrontmatterKeys(value, opts) {
   const output2 = validateSiteFrontmatterKeys(value, opts);
@@ -198193,14 +198294,7 @@ function validateProjectAndPageFrontmatterKeys(value, opts) {
     output2.numbering = validateNumbering(value.numbering, incrementOptions("numbering", opts));
   }
   if (defined(value.math)) {
-    const mathOpts = incrementOptions("math", opts);
-    const math7 = validateObject(value.math, mathOpts);
-    if (math7) {
-      const stringKeys = Object.keys(math7).filter((key2) => {
-        return validateString(math7[key2], incrementOptions(key2, mathOpts));
-      });
-      output2.math = filterKeys(math7, stringKeys);
-    }
+    output2.math = validateMathMacroObject(value.math, incrementOptions("math", opts));
   }
   if (defined(value.abbreviations)) {
     const abbreviationsOpts = incrementOptions("abbreviations", opts);
@@ -198359,30 +198453,33 @@ function validatePageFrontmatter(input3, opts) {
 
 // ../myst-frontmatter/dist/utils/fillPageFrontmatter.js
 function fillPageFrontmatter(pageFrontmatter, projectFrontmatter, opts) {
+  return fillProjectFrontmatter(pageFrontmatter, projectFrontmatter, opts, USE_PROJECT_FALLBACK);
+}
+function fillProjectFrontmatter(base5, filler, opts, keys2) {
   var _a6, _b, _c, _d2, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x2;
-  const frontmatter = fillMissingKeys(pageFrontmatter, projectFrontmatter, USE_PROJECT_FALLBACK);
-  if (pageFrontmatter.numbering || projectFrontmatter.numbering) {
-    frontmatter.numbering = fillNumbering(pageFrontmatter.numbering, projectFrontmatter.numbering);
+  const frontmatter = fillMissingKeys(base5, filler, keys2 !== null && keys2 !== void 0 ? keys2 : Object.keys(filler));
+  if (filler.numbering || base5.numbering) {
+    frontmatter.numbering = fillNumbering(base5.numbering, filler.numbering);
   }
-  if (projectFrontmatter.math || pageFrontmatter.math) {
-    frontmatter.math = { ...(_a6 = projectFrontmatter.math) !== null && _a6 !== void 0 ? _a6 : {}, ...(_b = pageFrontmatter.math) !== null && _b !== void 0 ? _b : {} };
+  if (filler.math || base5.math) {
+    frontmatter.math = { ...(_a6 = filler.math) !== null && _a6 !== void 0 ? _a6 : {}, ...(_b = base5.math) !== null && _b !== void 0 ? _b : {} };
   }
-  if (projectFrontmatter.abbreviations || pageFrontmatter.abbreviations) {
+  if (filler.abbreviations || base5.abbreviations) {
     frontmatter.abbreviations = {
-      ...(_c = projectFrontmatter.abbreviations) !== null && _c !== void 0 ? _c : {},
-      ...(_d2 = pageFrontmatter.abbreviations) !== null && _d2 !== void 0 ? _d2 : {}
+      ...(_c = filler.abbreviations) !== null && _c !== void 0 ? _c : {},
+      ...(_d2 = base5.abbreviations) !== null && _d2 !== void 0 ? _d2 : {}
     };
   }
-  if (projectFrontmatter.options || pageFrontmatter.options) {
+  if (filler.options || base5.options) {
     frontmatter.options = {
-      ...(_e = projectFrontmatter.options) !== null && _e !== void 0 ? _e : {},
-      ...(_f = pageFrontmatter.options) !== null && _f !== void 0 ? _f : {}
+      ...(_e = filler.options) !== null && _e !== void 0 ? _e : {},
+      ...(_f = base5.options) !== null && _f !== void 0 ? _f : {}
     };
   }
-  if (projectFrontmatter.settings || pageFrontmatter.settings) {
+  if (filler.settings || base5.settings) {
     frontmatter.settings = {
-      ...(_g = projectFrontmatter.settings) !== null && _g !== void 0 ? _g : {},
-      ...(_h = pageFrontmatter.settings) !== null && _h !== void 0 ? _h : {}
+      ...(_g = filler.settings) !== null && _g !== void 0 ? _g : {},
+      ...(_h = base5.settings) !== null && _h !== void 0 ? _h : {}
     };
   }
   const contributorIds = /* @__PURE__ */ new Set();
@@ -198410,10 +198507,10 @@ function fillPageFrontmatter(pageFrontmatter, projectFrontmatter, opts) {
   });
   if (((_m = frontmatter.authors) === null || _m === void 0 ? void 0 : _m.length) || contributorIds.size) {
     const people = [
-      ...(_o = pageFrontmatter.authors) !== null && _o !== void 0 ? _o : [],
-      ...(_p = projectFrontmatter.authors) !== null && _p !== void 0 ? _p : [],
-      ...(_q = pageFrontmatter.contributors) !== null && _q !== void 0 ? _q : [],
-      ...(_r = projectFrontmatter.contributors) !== null && _r !== void 0 ? _r : []
+      ...(_o = base5.authors) !== null && _o !== void 0 ? _o : [],
+      ...(_p = filler.authors) !== null && _p !== void 0 ? _p : [],
+      ...(_q = base5.contributors) !== null && _q !== void 0 ? _q : [],
+      ...(_r = filler.contributors) !== null && _r !== void 0 ? _r : []
     ];
     const peopleLookup = {};
     people.forEach((auth) => {
@@ -198452,10 +198549,7 @@ function fillPageFrontmatter(pageFrontmatter, projectFrontmatter, opts) {
       affiliationIds.add(aff.id);
   });
   if (affiliationIds.size) {
-    const affiliations2 = [
-      ...(_w = pageFrontmatter.affiliations) !== null && _w !== void 0 ? _w : [],
-      ...(_x2 = projectFrontmatter.affiliations) !== null && _x2 !== void 0 ? _x2 : []
-    ];
+    const affiliations2 = [...(_w = base5.affiliations) !== null && _w !== void 0 ? _w : [], ...(_x2 = filler.affiliations) !== null && _x2 !== void 0 ? _x2 : []];
     const affiliationLookup = {};
     affiliations2.forEach((aff) => {
       if (!aff.id || isStashPlaceholder(aff))
@@ -235259,7 +235353,7 @@ var TRANSFORM_NAME = "myst-transforms:math";
 var replacements = {
   "\xA0": " "
 };
-var buildInMacros = {
+var builtInMacros = {
   "\\mbox": "\\text{#1}"
   // mbox is not supported in KaTeX, this is an OK fallback
 };
@@ -235361,11 +235455,15 @@ function removeWarnings(result, predicate) {
 function tryRender(file, node3, value, opts) {
   const displayMode = node3.type === "math";
   const warnings2 = [];
+  let simplifiedMacros = {};
+  if (opts === null || opts === void 0 ? void 0 : opts.macros) {
+    simplifiedMacros = Object.fromEntries(Object.entries(opts.macros).map(([k, v]) => [k, v.macro]));
+  }
   try {
     const html7 = katex.renderToString(value, {
       displayMode,
       output: (opts === null || opts === void 0 ? void 0 : opts.mathML) ? "mathml" : void 0,
-      macros: { ...buildInMacros, ...opts === null || opts === void 0 ? void 0 : opts.macros },
+      macros: { ...builtInMacros, ...simplifiedMacros },
       strict: (f3, m2) => {
         warnings2.push(`${f3}, ${m2}`);
       }
@@ -236443,19 +236541,36 @@ var GithubTransformer = class {
 };
 
 // ../myst-transforms/dist/links/check.js
-function checkLinkTextTransform(mdast2, vfile2) {
-  const linkNodes = selectAll("link,linkBlock,card,crossReference", mdast2);
-  if (linkNodes.length === 0)
-    return;
+function checkLinkTextTransform(mdast2, externalReferences, vfile2) {
+  const linkNodes = selectAll("link,linkBlock,card", mdast2);
+  const xrefNodes = selectAll("crossReference", mdast2);
   linkNodes.forEach((node3) => {
     var _a6;
-    if (!toText(node3.children) && !select("image", node3)) {
+    if (node3.url && (node3.url.startsWith("xref:") || node3.url.startsWith("myst:"))) {
+      const key2 = node3.url.slice(5).split("/")[0].split("#")[0];
+      if (externalReferences.map((ref) => ref.key).includes(key2)) {
+      } else {
+        fileError(vfile2, `Link did not resolve to valid cross-reference: ${node3.url}`, {
+          node: node3,
+          ruleId: RuleId.linkTextExists,
+          note: key2 ? `You need an entry in your project references with key "${key2}"` : void 0
+        });
+      }
+    } else if (!toText(node3.children) && !select("image", node3)) {
       fileWarn(vfile2, `Link text is empty for <${(_a6 = node3.urlSource) !== null && _a6 !== void 0 ? _a6 : node3.url}${node3.identifier ? `#${node3.identifier}` : ""}>`, {
         node: node3,
         ruleId: RuleId.linkTextExists
       });
     }
   });
+  xrefNodes.forEach((node3) => {
+    if (!toText(node3.children) && !select("image", node3)) {
+      fileWarn(vfile2, `Cross reference text is empty for <${node3.urlSource}>`, {
+        node: node3,
+        ruleId: RuleId.linkTextExists
+      });
+    }
+  });
 }
 
 // ../myst-transforms/dist/targets.js
@@ -237303,7 +237418,7 @@ var ReferenceState = class {
   }
 };
 function addChildrenFromTargetNode(node3, targetNode, numbering, vfile2) {
-  var _a6, _b, _c;
+  var _a6, _b, _c, _d2, _e;
   numbering = fillNumbering(numbering, DEFAULT_NUMBERING);
   const kind = kindFromNode2(targetNode);
   const noNodeChildren = !((_a6 = node3.children) === null || _a6 === void 0 ? void 0 : _a6.length);
@@ -237322,8 +237437,8 @@ function addChildrenFromTargetNode(node3, targetNode, numbering, vfile2) {
     fillReferenceEnumerators2(vfile2, node3, template, targetNode, title);
   }
   node3.resolved = true;
-  node3.identifier = targetNode.identifier;
-  node3.html_id = targetNode.html_id;
+  node3.identifier = (_d2 = targetNode.identifier) !== null && _d2 !== void 0 ? _d2 : node3.identifier;
+  node3.html_id = (_e = targetNode.html_id) !== null && _e !== void 0 ? _e : node3.html_id;
 }
 function warnNodeTargetNotFound(node3, vfile2) {
   if (!vfile2)
@@ -237661,6 +237776,7 @@ var selectors_exports = {};
 __export(selectors_exports, {
   selectAffiliation: () => selectAffiliation,
   selectAllDependencies: () => selectAllDependencies,
+  selectConfigExtensions: () => selectConfigExtensions,
   selectCurrentProjectConfig: () => selectCurrentProjectConfig,
   selectCurrentProjectFile: () => selectCurrentProjectFile,
   selectCurrentProjectPath: () => selectCurrentProjectPath,
@@ -237735,6 +237851,10 @@ function selectLocalConfigFile(state, path42) {
 function selectLocalRawConfig(state, path42) {
   return mutableCopy(state.local.config.rawConfigs[(0, import_node_path4.resolve)(path42)]);
 }
+function selectConfigExtensions(state) {
+  var _a6;
+  return [...(_a6 = state.local.config.configExtensions) !== null && _a6 !== void 0 ? _a6 : []];
+}
 function selectReloadingState(state) {
   const { reloading, reloadRequested } = state.local.watch;
   return { reloading, reloadRequested };
@@ -239927,6 +240047,11 @@ var config = createSlice({
     receiveProjectConfig(state, action) {
       const { path: path42, ...payload } = action.payload;
       state.projects[(0, import_node_path5.resolve)(path42)] = payload;
+    },
+    receiveConfigExtension(state, action) {
+      var _a6;
+      (_a6 = state.configExtensions) !== null && _a6 !== void 0 ? _a6 : state.configExtensions = [];
+      state.configExtensions.push(action.payload.file);
     }
   }
 });
@@ -240199,15 +240324,7 @@ function configFromPath(session, path42) {
     return void 0;
   return configs[0];
 }
-function loadConfig(session, path42) {
-  var _a6, _b, _c;
-  const file = configFromPath(session, path42);
-  if (!file) {
-    session.log.debug(`No config loaded from path: ${path42}`);
-    return;
-  }
-  const vfile2 = new VFile();
-  vfile2.path = file;
+function loadConfigYaml(file) {
   if (!import_node_fs2.default.existsSync(file))
     throw Error(`Cannot find config file: ${file}`);
   let rawConf;
@@ -240219,27 +240336,38 @@ function loadConfig(session, path42) {
 ${err.message}` : "";
     throw Error(`Unable to read config file ${file} as YAML${suffix}`);
   }
-  const existingConf = selectors_exports.selectLocalRawConfig(session.store.getState(), path42);
-  if (existingConf && JSON.stringify(rawConf) === JSON.stringify(existingConf.raw)) {
-    return existingConf.validated;
-  }
-  const opts = {
-    file,
-    property: "config",
+  return rawConf;
+}
+function configValidationOpts(vfile2, property, ruleId) {
+  return {
+    file: vfile2.path,
+    property,
     messages: {},
     errorLogFn: (message) => {
-      fileError(vfile2, message, { ruleId: RuleId.validConfigStructure });
+      fileError(vfile2, message, { ruleId });
     },
     warningLogFn: (message) => {
-      fileWarn(vfile2, message, { ruleId: RuleId.validConfigStructure });
+      fileWarn(vfile2, message, { ruleId });
     }
   };
-  const conf = validateObject(js_yaml_default.load(import_node_fs2.default.readFileSync(file, "utf-8")), opts);
-  if (conf) {
-    const filteredConf = validateKeys(conf, { required: ["version"], optional: ["site", "project"] }, opts);
-    if (filteredConf && filteredConf.version !== VERSION) {
-      validationError(`"${filteredConf.version}" does not match ${VERSION}`, incrementOptions("version", opts));
-    }
+}
+function fillSiteConfig(base5, filler) {
+  return fillMissingKeys(base5, filler, Object.keys(filler));
+}
+function getValidatedConfigsFromFile(session, file, vfile2, stack) {
+  var _a6, _b, _c;
+  if (!vfile2) {
+    vfile2 = new VFile();
+    vfile2.path = file;
+  }
+  const opts = configValidationOpts(vfile2, "config", RuleId.validConfigStructure);
+  const conf = validateObjectKeys(loadConfigYaml(file), {
+    required: ["version"],
+    optional: ["site", "project", "extend"],
+    alias: { extends: "extend" }
+  }, opts);
+  if (conf && conf.version !== VERSION) {
+    validationError(`"${conf.version}" does not match ${VERSION}`, incrementOptions("version", opts));
   }
   logMessagesFromVFile(session, vfile2);
   if (!conf || opts.messages.errors) {
@@ -240262,22 +240390,83 @@ ${err.message}` : "";
     const { logoText, ...rest } = conf.site;
     conf.site = { logo_text: logoText, ...rest };
   }
-  session.store.dispatch(config.actions.receiveRawConfig({ path: path42, file, raw: rawConf, validated: conf }));
-  const { site, project } = conf !== null && conf !== void 0 ? conf : {};
+  let site;
+  let project;
+  const projectOpts = configValidationOpts(vfile2, "config.project", RuleId.validProjectConfig);
+  let extend5;
+  if (conf.extend) {
+    extend5 = validateList(conf.extend, { coerce: true, ...incrementOptions("extend", opts) }, (item, index4) => {
+      const relativeFile = validateString(item, incrementOptions(`extend.${index4}`, opts));
+      if (!relativeFile)
+        return relativeFile;
+      return resolveToAbsolute(session, (0, import_node_path7.dirname)(file), relativeFile);
+    });
+    stack = [...stack !== null && stack !== void 0 ? stack : [], file];
+    extend5 === null || extend5 === void 0 ? void 0 : extend5.forEach((extFile) => {
+      if (stack === null || stack === void 0 ? void 0 : stack.includes(extFile)) {
+        fileError(vfile2, 'Circular dependency encountered during "config.extend" resolution', {
+          ruleId: RuleId.validConfigStructure,
+          note: [...stack, extFile].map((f3) => resolveToRelative(session, ".", f3)).join(" > ")
+        });
+        return;
+      }
+      const { site: extSite, project: extProject } = getValidatedConfigsFromFile(session, extFile, vfile2, stack);
+      session.store.dispatch(config.actions.receiveConfigExtension({ file: extFile }));
+      if (extSite) {
+        site = site ? fillSiteConfig(extSite, site) : extSite;
+      }
+      if (extProject) {
+        project = project ? fillProjectFrontmatter(extProject, project, projectOpts) : extProject;
+      }
+    });
+  }
+  const { site: rawSite, project: rawProject } = conf !== null && conf !== void 0 ? conf : {};
+  const path42 = (0, import_node_path7.dirname)(file);
+  if (rawSite) {
+    site = fillSiteConfig(validateSiteConfigAndThrow(session, path42, vfile2, rawSite), site !== null && site !== void 0 ? site : {});
+  }
   if (site) {
-    validateSiteConfigAndSave(session, path42, vfile2, site);
     session.log.debug(`Loaded site config from ${file}`);
   } else {
     session.log.debug(`No site config in ${file}`);
   }
+  if (rawProject) {
+    project = fillProjectFrontmatter(validateProjectConfigAndThrow(session, path42, vfile2, rawProject), project !== null && project !== void 0 ? project : {}, projectOpts);
+  }
   if (project) {
-    validateProjectConfigAndSave(session, path42, vfile2, project);
     session.log.debug(`Loaded project config from ${file}`);
   } else {
     session.log.debug(`No project config defined in ${file}`);
   }
   logMessagesFromVFile(session, vfile2);
-  return conf;
+  return { site, project, extend: extend5 };
+}
+function loadConfig(session, path42, opts) {
+  const file = configFromPath(session, path42);
+  if (!file) {
+    session.log.debug(`No config loaded from path: ${path42}`);
+    return;
+  }
+  const rawConf = loadConfigYaml(file);
+  if (!(opts === null || opts === void 0 ? void 0 : opts.reloadProject)) {
+    const existingConf = selectors_exports.selectLocalRawConfig(session.store.getState(), path42);
+    if (existingConf && JSON.stringify(rawConf) === JSON.stringify(existingConf.raw)) {
+      return existingConf.validated;
+    }
+  }
+  const { site, project, extend: extend5 } = getValidatedConfigsFromFile(session, file);
+  const validated = { ...rawConf, site, project, extend: extend5 };
+  session.store.dispatch(config.actions.receiveRawConfig({
+    path: path42,
+    file,
+    raw: rawConf,
+    validated
+  }));
+  if (site)
+    saveSiteConfig(session, path42, site);
+  if (project)
+    saveProjectConfig(session, path42, project);
+  return validated;
 }
 function resolveToAbsolute(session, basePath, relativePath, checkExists = true) {
   let message;
@@ -240346,45 +240535,29 @@ function resolveProjectConfigPaths(session, path42, projectConfig, resolutionFn)
   }
   return { ...projectConfig, ...resolvedFields };
 }
-function validateSiteConfigAndSave(session, path42, vfile2, rawSiteConfig) {
-  let siteConfig = validateSiteConfig(rawSiteConfig, {
-    file: vfile2.path,
-    property: "site",
-    messages: {},
-    errorLogFn: (message) => {
-      fileError(vfile2, message, { ruleId: RuleId.validSiteConfig });
-    },
-    warningLogFn: (message) => {
-      fileWarn(vfile2, message, { ruleId: RuleId.validSiteConfig });
-    }
-  });
+function validateSiteConfigAndThrow(session, path42, vfile2, rawSite) {
+  const site = validateSiteConfig(rawSite, configValidationOpts(vfile2, "config.site", RuleId.validSiteConfig));
   logMessagesFromVFile(session, vfile2);
-  if (!siteConfig) {
+  if (!site) {
     const errorSuffix = vfile2.path ? ` in ${vfile2.path}` : "";
     throw Error(`Please address invalid site config${errorSuffix}`);
   }
-  siteConfig = resolveSiteConfigPaths(session, path42, siteConfig, resolveToAbsolute);
-  session.store.dispatch(config.actions.receiveSiteConfig({ path: path42, ...siteConfig }));
+  return resolveSiteConfigPaths(session, path42, site, resolveToAbsolute);
 }
-function validateProjectConfigAndSave(session, path42, vfile2, rawProjectConfig) {
-  let projectConfig = validateProjectConfig(rawProjectConfig, {
-    file: vfile2.path,
-    property: "project",
-    messages: {},
-    errorLogFn: (message) => {
-      fileError(vfile2, message, { ruleId: RuleId.validProjectConfig });
-    },
-    warningLogFn: (message) => {
-      fileWarn(vfile2, message, { ruleId: RuleId.validProjectConfig });
-    }
-  });
+function saveSiteConfig(session, path42, site) {
+  session.store.dispatch(config.actions.receiveSiteConfig({ path: path42, ...site }));
+}
+function validateProjectConfigAndThrow(session, path42, vfile2, rawProject) {
+  const project = validateProjectConfig(rawProject, configValidationOpts(vfile2, "config.project", RuleId.validProjectConfig));
   logMessagesFromVFile(session, vfile2);
-  if (!projectConfig) {
+  if (!project) {
     const errorSuffix = vfile2.path ? ` in ${vfile2.path}` : "";
     throw Error(`Please address invalid project config${errorSuffix}`);
   }
-  projectConfig = resolveProjectConfigPaths(session, path42, projectConfig, resolveToAbsolute);
-  session.store.dispatch(config.actions.receiveProjectConfig({ path: path42, ...projectConfig }));
+  return resolveProjectConfigPaths(session, path42, project, resolveToAbsolute);
+}
+function saveProjectConfig(session, path42, project) {
+  session.store.dispatch(config.actions.receiveProjectConfig({ path: path42, ...project }));
 }
 function writeConfigs(session, path42, newConfigs) {
   var _a6;
@@ -240392,14 +240565,16 @@ function writeConfigs(session, path42, newConfigs) {
   const file = configFromPath(session, path42) || defaultConfigFile(session, path42);
   const vfile2 = new VFile();
   vfile2.path = file;
-  if (siteConfig)
-    validateSiteConfigAndSave(session, path42, vfile2, siteConfig);
+  if (siteConfig) {
+    saveSiteConfig(session, path42, validateSiteConfigAndThrow(session, path42, vfile2, siteConfig));
+  }
   siteConfig = selectors_exports.selectLocalSiteConfig(session.store.getState(), path42);
   if (siteConfig) {
     siteConfig = resolveSiteConfigPaths(session, path42, siteConfig, resolveToRelative);
   }
-  if (projectConfig)
-    validateProjectConfigAndSave(session, path42, vfile2, projectConfig);
+  if (projectConfig) {
+    saveProjectConfig(session, path42, validateProjectConfigAndThrow(session, path42, vfile2, projectConfig));
+  }
   projectConfig = selectors_exports.selectLocalProjectConfig(session.store.getState(), path42);
   if (projectConfig) {
     projectConfig = prepareToWrite(projectConfig);
@@ -240409,8 +240584,7 @@ function writeConfigs(session, path42, newConfigs) {
     session.log.debug(`No new config to write to ${file}`);
     return;
   }
-  const rawConfig = loadConfig(session, path42);
-  const validatedRawConfig = (_a6 = rawConfig === null || rawConfig === void 0 ? void 0 : rawConfig.validated) !== null && _a6 !== void 0 ? _a6 : emptyConfig();
+  const validatedRawConfig = (_a6 = loadConfig(session, path42)) !== null && _a6 !== void 0 ? _a6 : emptyConfig();
   let logContent;
   if (siteConfig && projectConfig) {
     logContent = "site and project configs";
@@ -287405,7 +287579,7 @@ var import_node_path17 = __toESM(require("path"), 1);
 var import_nbtx = __toESM(require_cjs2(), 1);
 
 // ../myst-cli/dist/version.js
-var version2 = "1.2.3";
+var version2 = "1.2.5";
 var version_default2 = version2;
 
 // ../myst-cli/dist/utils/headers.js
@@ -295338,6 +295512,7 @@ async function loadProjectFromDisk(session, path42, opts) {
     if (cachedProject)
       return cachedProject;
   }
+  loadConfig(session, path42, opts);
   const projectConfig = selectors_exports.selectLocalProjectConfig(session.store.getState(), path42);
   const file = (0, import_node_path22.join)(path42, session.configFiles[0]);
   if (!projectConfig && (opts === null || opts === void 0 ? void 0 : opts.warnOnNoConfig)) {
@@ -299437,7 +299612,7 @@ async function checkLinksTransform(session, file, mdast2) {
 }
 
 // ../myst-cli/dist/transforms/embed.js
-function mutateEmbedNode(node3, targetNode) {
+function mutateEmbedNode(node3, targetNode, opts) {
   if (targetNode && node3["remove-output"]) {
     targetNode = filter2(targetNode, (n) => {
       var _a6;
@@ -299457,6 +299632,13 @@ function mutateEmbedNode(node3, targetNode) {
     delete idNode.label;
     delete idNode.html_id;
   });
+  selectAll("crossReference", targetNode).forEach((targetXRef) => {
+    if (!targetXRef.remote) {
+      targetXRef.url = opts === null || opts === void 0 ? void 0 : opts.url;
+      targetXRef.dataUrl = opts === null || opts === void 0 ? void 0 : opts.dataUrl;
+      targetXRef.remote = true;
+    }
+  });
   if (!targetNode) {
     node3.children = [];
   } else if (targetNode.type === "block") {
@@ -299465,11 +299647,17 @@ function mutateEmbedNode(node3, targetNode) {
     node3.children = [targetNode];
   }
 }
+function targetsToTarget(targets) {
+  if (targets.length === 1)
+    return copyNode(targets[0]);
+  return { type: "block", children: copyNode(targets) };
+}
 async function embedTransform(session, mdast2, file, dependencies, state) {
-  const mystTransformer = new MystTransformer(Object.values(castSession(session).$externalReferences));
+  const references = Object.values(castSession(session).$externalReferences);
+  const mystTransformer = new MystTransformer(references);
   const embedNodes = selectAll("embed", mdast2);
   await Promise.all(embedNodes.map(async (node3) => {
-    var _a6, _b, _c, _d2, _e, _f, _g, _h;
+    var _a6, _b, _c, _d2, _e, _f, _g;
     const vfile2 = state.vfile;
     const label = (_a6 = node3.source) === null || _a6 === void 0 ? void 0 : _a6.label;
     if (!label) {
@@ -299478,10 +299666,14 @@ async function embedTransform(session, mdast2, file, dependencies, state) {
     }
     if (label.startsWith("xref:") || label.startsWith("myst:")) {
       if (!mystTransformer.test(label)) {
-        fileError(vfile2, `Cannot embed "${label}"`, {
-          node: node3,
-          note: "The target must be a MyST project and be included in your project references.\nEmbed does not work with intersphinx."
-        });
+        let note;
+        const sphinxTransformer = new SphinxTransformer(references);
+        if (sphinxTransformer.test(label)) {
+          note = "Embed target must be a MyST project, not intersphinx.";
+        } else {
+          note = "Embed target must be a MyST project and included in your project references.";
+        }
+        fileError(vfile2, `Cannot embed "${label}"`, { node: node3, note });
         return;
       }
       const referenceLink = {
@@ -299509,16 +299701,13 @@ async function embedTransform(session, mdast2, file, dependencies, state) {
             return;
           targetNodes2 = data.mdast.children;
         }
-        const targetNode = { type: "block", children: targetNodes2 };
+        if (!(targetNodes2 === null || targetNodes2 === void 0 ? void 0 : targetNodes2.length))
+          return;
+        const targetNode = targetsToTarget(targetNodes2);
         selectAll("crossReference", targetNode).forEach((targetXRef) => {
           if (targetXRef.remoteBaseUrl)
             return;
           targetXRef.remoteBaseUrl = referenceXRef.remoteBaseUrl;
-          if (!targetXRef.remote) {
-            targetXRef.url = referenceXRef.url;
-            targetXRef.dataUrl = referenceXRef.dataUrl;
-            targetXRef.remote = true;
-          }
         });
         selectAll("link", targetNode).forEach((targetLink) => {
           if (!targetLink.internal)
@@ -299534,7 +299723,7 @@ async function embedTransform(session, mdast2, file, dependencies, state) {
             return;
           target2.source.remoteBaseUrl = referenceXRef.remoteBaseUrl;
         });
-        mutateEmbedNode(node3, targetNode);
+        mutateEmbedNode(node3, targetNode, referenceXRef);
         const source3 = {
           url: referenceXRef.url,
           remoteBaseUrl: referenceXRef.remoteBaseUrl,
@@ -299585,12 +299774,13 @@ async function embedTransform(session, mdast2, file, dependencies, state) {
       fileError(vfile2, `Embed target for "${label}" not found`, { node: node3 });
       return;
     }
-    const target = { type: "block", children: copyNode(targetNodes) };
-    mutateEmbedNode(node3, target);
-    const multiState = state;
-    if (!multiState.states)
+    const target = targetsToTarget(targetNodes);
+    if (!state.states) {
+      mutateEmbedNode(node3, target);
       return;
-    const { url, filePath } = (_g = multiState.resolveStateProvider(identifier, linkFile)) !== null && _g !== void 0 ? _g : {};
+    }
+    const { url, dataUrl, filePath } = stateProvider;
+    mutateEmbedNode(node3, target, { url, dataUrl });
     if (!url)
       return;
     const source2 = { url, label };
@@ -299599,7 +299789,7 @@ async function embedTransform(session, mdast2, file, dependencies, state) {
         path: file,
         dependency: filePath
       }));
-      const { kind, slug, frontmatter, location: location4 } = (_h = selectFile(session, filePath)) !== null && _h !== void 0 ? _h : {};
+      const { kind, slug, frontmatter, location: location4 } = (_g = selectFile(session, filePath)) !== null && _g !== void 0 ? _g : {};
       if (kind)
         source2.kind = kind;
       if (slug)
@@ -300905,6 +301095,7 @@ async function postProcessMdast(session, { file, checkLinks, pageReferenceStates
   const { mdast: mdast2, dependencies, frontmatter } = mdastPost;
   const fileState = cache.$internalReferences[file];
   const state = pageReferenceStates ? new MultiPageReferenceResolver(pageReferenceStates, file, vfile2) : fileState;
+  const externalReferences = Object.values(cache.$externalReferences);
   const transformers = [
     ...extraLinkTransformers || [],
     new WikiTransformer(),
@@ -300913,8 +301104,8 @@ async function postProcessMdast(session, { file, checkLinks, pageReferenceStates
     new RORTransformer(),
     new DOITransformer(),
     // This also is picked up in the next transform
-    new MystTransformer(Object.values(cache.$externalReferences)),
-    new SphinxTransformer(Object.values(cache.$externalReferences)),
+    new MystTransformer(externalReferences),
+    new SphinxTransformer(externalReferences),
     new StaticFileTransformer(session, file)
     // Links static files and internally linked files
   ];
@@ -300935,7 +301126,7 @@ async function postProcessMdast(session, { file, checkLinks, pageReferenceStates
   });
   await pipe.run(mdast2, vfile2);
   keysTransform(mdast2);
-  checkLinkTextTransform(mdast2, vfile2);
+  checkLinkTextTransform(mdast2, externalReferences, vfile2);
   logMessagesFromVFile(session, fileState.vfile);
   logMessagesFromVFile(session, vfile2);
   log.debug(toc(`Transformed mdast cross references and links for "${file}" in %s`));
@@ -302163,7 +302354,7 @@ function addMacrosToState(value, state) {
     return;
   Object.entries(state.options.math).forEach(([k, v]) => {
     if (value.includes(k))
-      state.data.mathPlugins[k] = v;
+      state.data.mathPlugins[k] = v.macro;
   });
 }
 function withRecursiveCommands(state, plugins2 = state.data.mathPlugins) {
@@ -302176,7 +302367,7 @@ function withRecursiveCommands(state, plugins2 = state.data.mathPlugins) {
       return;
     pluginsList.forEach(([, value]) => {
       if (value.includes(k))
-        addedPlugins[k] = v;
+        addedPlugins[k] = v.macro;
     });
   });
   const newPlugins = { ...addedPlugins, ...plugins2 };
@@ -303967,28 +304158,39 @@ function addMacrosToState2(value, state) {
     return;
   Object.entries(state.options.math).forEach(([k, v]) => {
     const key2 = texToTypst(k);
-    if (value.includes(key2))
-      state.data.mathPlugins[key2] = texToTypst(v);
+    if (value.includes(key2)) {
+      state.data.mathPlugins[key2] = texToTypst(v.macro);
+    }
   });
 }
-function withRecursiveCommands2(state, plugins2 = state.data.mathPlugins) {
-  if (!state.options.math)
-    return plugins2;
-  const pluginsList = Object.entries(plugins2);
-  const addedPlugins = {};
-  Object.entries(state.options.math).forEach(([k, v]) => {
-    const key2 = texToTypst(k);
-    if (plugins2[key2])
-      return;
-    pluginsList.forEach(([, value]) => {
-      if (value.includes(key2))
-        addedPlugins[key2] = texToTypst(v);
+function findCommandInMacro(macro2, command) {
+  const escapedCommand = command.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const commandRe = new RegExp(`${escapedCommand}(?![a-zA-Z])`, "g");
+  return [...macro2.matchAll(commandRe)].length > 0;
+}
+function replaceCommandInMacro(macro2, command, replaceValue) {
+  const escapedCommand = command.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
+  const commandRe = new RegExp(`${escapedCommand}(?![a-zA-Z])`, "g");
+  return macro2.replaceAll(commandRe, replaceValue);
+}
+function resolveRecursiveCommands(plugins2) {
+  let pluginsUpdated = false;
+  const newPlugins = Object.fromEntries(Object.entries(plugins2).map(([command, value]) => {
+    let newMacro = value.macro;
+    Object.entries(plugins2).forEach(([c, { macro: m2 }]) => {
+      if (findCommandInMacro(newMacro, c)) {
+        if (command === c) {
+        } else {
+          newMacro = replaceCommandInMacro(newMacro, c, m2);
+          pluginsUpdated = true;
+        }
+      }
     });
-  });
-  const newPlugins = { ...addedPlugins, ...plugins2 };
-  if (Object.keys(addedPlugins).length === 0)
-    return newPlugins;
-  return withRecursiveCommands2(state, newPlugins);
+    return [command, { ...value, macro: newMacro }];
+  }));
+  if (pluginsUpdated)
+    return resolveRecursiveCommands(newPlugins);
+  return newPlugins;
 }
 var math5 = (node3, state) => {
   const value = texToTypst(node3.value);
@@ -304403,7 +304605,10 @@ var TypstSerializer = class {
     var _a6;
     file.result = "";
     this.file = file;
-    this.options = opts !== null && opts !== void 0 ? opts : {};
+    const { math: math7, ...otherOpts } = opts !== null && opts !== void 0 ? opts : {};
+    this.options = { ...otherOpts };
+    if (math7)
+      this.options.math = resolveRecursiveCommands(math7);
     this.data = { mathPlugins: {}, macros: /* @__PURE__ */ new Set() };
     this.handlers = (_a6 = opts === null || opts === void 0 ? void 0 : opts.handlers) !== null && _a6 !== void 0 ? _a6 : handlers4;
     this.footnotes = Object.fromEntries(selectAll("footnoteDefinition", tree).map((node3) => {
@@ -304481,7 +304686,7 @@ var plugin3 = function(opts) {
     const tex = file.result.trim();
     const result = {
       macros: [...state.data.macros],
-      commands: withRecursiveCommands2(state),
+      commands: state.data.mathPlugins,
       value: tex
     };
     file.result = result;
@@ -305557,7 +305762,7 @@ async function runWordExport(session, file, exportOptions, opts) {
   data.frontmatter = { ...data.frontmatter, ...exportFrontmatter };
   const { options, doc } = mystTemplate.prepare({
     frontmatter: data.frontmatter,
-    parts: [],
+    parts: {},
     options: { ...data.frontmatter.options, ...exportOptions },
     sourceFile: file
   });
@@ -313315,9 +313520,11 @@ var import_chokidar2 = __toESM(require_chokidar(), 1);
 var import_node_path53 = require("path");
 function watchConfigAndPublic(session, serverReload, opts) {
   const watchFiles = ["public"];
-  const siteConfigFile = selectors_exports.selectCurrentSiteFile(session.store.getState());
+  const state = session.store.getState();
+  const siteConfigFile = selectors_exports.selectCurrentSiteFile(state);
   if (siteConfigFile)
     watchFiles.push(siteConfigFile);
+  watchFiles.push(...selectors_exports.selectConfigExtensions(state));
   return import_chokidar2.default.watch(watchFiles, {
     ignoreInitial: true,
     awaitWriteFinish: { stabilityThreshold: 100, pollInterval: 50 }
@@ -313326,6 +313533,8 @@ function watchConfigAndPublic(session, serverReload, opts) {
 function triggerProjectReload(session, file, eventType, projectPath) {
   const state = session.store.getState();
   const projectConfigFile = projectPath ? selectors_exports.selectLocalConfigFile(state, projectPath) : selectors_exports.selectCurrentProjectFile(state);
+  if (selectors_exports.selectConfigExtensions(state).includes(file))
+    return true;
   if (file === projectConfigFile || (0, import_node_path53.basename)(file) === "_toc.yml")
     return true;
   if (["add", "unlink"].includes(eventType))
@@ -313333,6 +313542,7 @@ function triggerProjectReload(session, file, eventType, projectPath) {
   return false;
 }
 async function processorFn(session, file, eventType, siteProject, serverReload, opts) {
+  var _a6;
   if (file) {
     changeFile(session, file, eventType);
     if (KNOWN_FAST_BUILDS.has((0, import_node_path53.extname)(file)) && eventType === "unlink") {
@@ -313340,8 +313550,8 @@ async function processorFn(session, file, eventType, siteProject, serverReload,
     }
   }
   if (!siteProject || !file || !KNOWN_FAST_BUILDS.has((0, import_node_path53.extname)(file)) || ["add", "unlink"].includes(eventType)) {
-    let reloadProject = false;
-    if (file && triggerProjectReload(session, file, eventType, siteProject === null || siteProject === void 0 ? void 0 : siteProject.path)) {
+    let reloadProject = (_a6 = opts === null || opts === void 0 ? void 0 : opts.reloadProject) !== null && _a6 !== void 0 ? _a6 : false;
+    if (reloadProject || file && triggerProjectReload(session, file, eventType, siteProject === null || siteProject === void 0 ? void 0 : siteProject.path)) {
       session.log.info("\u{1F4A5} Triggered full project load and site rebuild");
       reloadProject = true;
     } else {