mystmd 1.2.4__tar.gz → 1.2.5__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: mystmd
-Version: 1.2.4
+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.4 → mystmd-1.2.5}/_package.json

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

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

@@ -193279,7 +193279,7 @@ var {
 } = import_index.default;
 
 // src/version.ts
-var version = "1.2.4";
+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);
@@ -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}`);
       }
@@ -236448,7 +236546,7 @@ function checkLinkTextTransform(mdast2, externalReferences, vfile2) {
   const xrefNodes = selectAll("crossReference", mdast2);
   linkNodes.forEach((node3) => {
     var _a6;
-    if (node3.url.startsWith("xref:") || node3.url.startsWith("myst:")) {
+    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 {
@@ -287481,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.4";
+var version2 = "1.2.5";
 var version_default2 = version2;
 
 // ../myst-cli/dist/utils/headers.js
@@ -302256,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) {
@@ -302269,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 };
@@ -304060,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);
@@ -304496,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) => {
@@ -304574,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;
@@ -305650,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
   });