mystmd 1.1.24__tar.gz → 1.1.26__tar.gz

{mystmd-1.1.24/mystmd.egg-info → mystmd-1.1.26}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mystmd
-Version: 1.1.24
+Version: 1.1.26
 Summary: Command line tools for MyST Markdown
 Home-page: https://github.com/executablebooks/mystmd
 Author: Franklin Koch

{mystmd-1.1.24 → mystmd-1.1.26/mystmd.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: mystmd
-Version: 1.1.24
+Version: 1.1.26
 Summary: Command line tools for MyST Markdown
 Home-page: https://github.com/executablebooks/mystmd
 Author: Franklin Koch

{mystmd-1.1.24 → mystmd-1.1.26}/mystmd_py/myst.cjs

@@ -18136,7 +18136,7 @@ var require_set_difference = __commonJS({
     var iterateSet = require_set_iterate();
     var iterateSimple = require_iterate_simple();
     var has2 = SetHelpers.has;
-    var remove2 = SetHelpers.remove;
+    var remove3 = SetHelpers.remove;
     module2.exports = function difference(other) {
       var O = aSet(this);
       var otherRec = getSetRecord(other);
@@ -18144,12 +18144,12 @@ var require_set_difference = __commonJS({
       if (size(O) <= otherRec.size)
         iterateSet(O, function(e2) {
           if (otherRec.includes(e2))
-            remove2(result, e2);
+            remove3(result, e2);
         });
       else
         iterateSimple(otherRec.getIterator(), function(e2) {
           if (has2(O, e2))
-            remove2(result, e2);
+            remove3(result, e2);
         });
       return result;
     };
@@ -18401,14 +18401,14 @@ var require_set_symmetric_difference = __commonJS({
     var iterateSimple = require_iterate_simple();
     var add2 = SetHelpers.add;
     var has2 = SetHelpers.has;
-    var remove2 = SetHelpers.remove;
+    var remove3 = SetHelpers.remove;
     module2.exports = function symmetricDifference(other) {
       var O = aSet(this);
       var keysIter = getSetRecord(other).getIterator();
       var result = clone3(O);
       iterateSimple(keysIter, function(e2) {
         if (has2(O, e2))
-          remove2(result, e2);
+          remove3(result, e2);
         else
           add2(result, e2);
       });
@@ -59036,7 +59036,7 @@ var require_register2 = __commonJS({
     exports.get = get;
     exports.has = has2;
     exports.list = list6;
-    exports.remove = remove2;
+    exports.remove = remove3;
     var _parser = require_parser2();
     var _type3 = require_type();
     var _data = require_data();
@@ -59064,7 +59064,7 @@ var require_register2 = __commonJS({
     function get(format) {
       return formats[format];
     }
-    function remove2(format) {
+    function remove3(format) {
       const index4 = formats[format];
       if (!index4) {
         return;
@@ -59444,7 +59444,7 @@ var require_output2 = __commonJS({
     exports.has = has2;
     exports.list = list6;
     exports.register = void 0;
-    exports.remove = remove2;
+    exports.remove = remove3;
     var _register = _interopRequireDefault(require_register());
     function _interopRequireDefault(obj) {
       return obj && obj.__esModule ? obj : { default: obj };
@@ -59462,7 +59462,7 @@ var require_output2 = __commonJS({
       validate4(name2, formatter);
       register.set(name2, formatter);
     }
-    function remove2(name2) {
+    function remove3(name2) {
       register.remove(name2);
     }
     function has2(name2) {
@@ -59641,7 +59641,7 @@ var require_dict = __commonJS({
     exports.htmlDict = void 0;
     exports.list = list6;
     exports.register = void 0;
-    exports.remove = remove2;
+    exports.remove = remove3;
     exports.textDict = void 0;
     var _register = _interopRequireDefault(require_register());
     function _interopRequireDefault(obj) {
@@ -59679,7 +59679,7 @@ var require_dict = __commonJS({
       validate4(name2, dict);
       register.set(name2, dict);
     }
-    function remove2(name2) {
+    function remove3(name2) {
       register.remove(name2);
     }
     function has2(name2) {
@@ -59730,7 +59730,7 @@ var require_config = __commonJS({
     exports.get = get;
     exports.has = has2;
     exports.list = list6;
-    exports.remove = remove2;
+    exports.remove = remove3;
     var configs = {};
     function add2(ref, config2) {
       configs[ref] = config2;
@@ -59741,7 +59741,7 @@ var require_config = __commonJS({
     function has2(ref) {
       return Object.prototype.hasOwnProperty.call(configs, ref);
     }
-    function remove2(ref) {
+    function remove3(ref) {
       delete configs[ref];
     }
     function list6() {
@@ -59763,7 +59763,7 @@ var require_plugins = __commonJS({
     exports.input = void 0;
     exports.list = list6;
     exports.output = void 0;
-    exports.remove = remove2;
+    exports.remove = remove3;
     var input3 = _interopRequireWildcard(require_input2());
     exports.input = input3;
     var output2 = _interopRequireWildcard(require_output2());
@@ -59836,7 +59836,7 @@ var require_plugins = __commonJS({
         }
       }
     }
-    function remove2(ref) {
+    function remove3(ref) {
       const mainIndex = indices[ref];
       for (const type2 in mainIndex) {
         const typeIndex = mainIndex[type2];
@@ -134062,7 +134062,7 @@ var require_jinja_compat = __commonJS({
         append: function append(element5) {
           return this.push(element5);
         },
-        remove: function remove2(element5) {
+        remove: function remove3(element5) {
           for (var i2 = 0; i2 < this.length; i2++) {
             if (this[i2] === element5) {
               return this.splice(i2, 1);
@@ -147289,14 +147289,14 @@ var require_remove = __commonJS({
     "use strict";
     var fs43 = require_graceful_fs2();
     var u3 = require_universalify().fromCallback;
-    function remove2(path36, callback) {
+    function remove3(path36, callback) {
       fs43.rm(path36, { recursive: true, force: true }, callback);
     }
     function removeSync(path36) {
       fs43.rmSync(path36, { recursive: true, force: true });
     }
     module2.exports = {
-      remove: u3(remove2),
+      remove: u3(remove3),
       removeSync
     };
   }
@@ -147310,7 +147310,7 @@ var require_empty2 = __commonJS({
     var fs43 = require_fs();
     var path36 = require("path");
     var mkdir = require_mkdirs();
-    var remove2 = require_remove();
+    var remove3 = require_remove();
     var emptyDir = u3(async function emptyDir2(dir) {
       let items;
       try {
@@ -147318,7 +147318,7 @@ var require_empty2 = __commonJS({
       } catch {
         return mkdir.mkdirs(dir);
       }
-      return Promise.all(items.map((item) => remove2.remove(path36.join(dir, item))));
+      return Promise.all(items.map((item) => remove3.remove(path36.join(dir, item))));
     });
     function emptyDirSync(dir) {
       let items;
@@ -147329,7 +147329,7 @@ var require_empty2 = __commonJS({
       }
       items.forEach((item) => {
         item = path36.join(dir, item);
-        remove2.removeSync(item);
+        remove3.removeSync(item);
       });
     }
     module2.exports = {
@@ -147911,7 +147911,7 @@ var require_move = __commonJS({
     var fs43 = require_graceful_fs2();
     var path36 = require("path");
     var copy = require_copy2().copy;
-    var remove2 = require_remove().remove;
+    var remove3 = require_remove().remove;
     var mkdirp = require_mkdirs().mkdirp;
     var pathExists = require_path_exists().pathExists;
     var stat2 = require_stat();
@@ -147948,7 +147948,7 @@ var require_move = __commonJS({
       if (isChangingCase)
         return rename(src, dest, overwrite, cb);
       if (overwrite) {
-        return remove2(dest, (err) => {
+        return remove3(dest, (err) => {
           if (err)
             return cb(err);
           return rename(src, dest, overwrite, cb);
@@ -147980,7 +147980,7 @@ var require_move = __commonJS({
       copy(src, dest, opts, (err) => {
         if (err)
           return cb(err);
-        return remove2(src, cb);
+        return remove3(src, cb);
       });
     }
     module2.exports = move;
@@ -155799,7 +155799,7 @@ var require_fromEvent = __commonJS({
         return function(handler) {
           return target[methodName](eventName, handler, options);
         };
-      }) : isNodeStyleEventEmitter(target) ? nodeEventEmitterMethods.map(toCommonHandlerRegistry(target, eventName)) : isJQueryStyleEventEmitter(target) ? jqueryMethods.map(toCommonHandlerRegistry(target, eventName)) : [], 2), add2 = _a6[0], remove2 = _a6[1];
+      }) : isNodeStyleEventEmitter(target) ? nodeEventEmitterMethods.map(toCommonHandlerRegistry(target, eventName)) : isJQueryStyleEventEmitter(target) ? jqueryMethods.map(toCommonHandlerRegistry(target, eventName)) : [], 2), add2 = _a6[0], remove3 = _a6[1];
       if (!add2) {
         if (isArrayLike_1.isArrayLike(target)) {
           return mergeMap_1.mergeMap(function(subTarget) {
@@ -155820,7 +155820,7 @@ var require_fromEvent = __commonJS({
         };
         add2(handler);
         return function() {
-          return remove2(handler);
+          return remove3(handler);
         };
       });
     }
@@ -161767,14 +161767,14 @@ var require_signal_exit = __commonJS({
         if (opts && opts.alwaysLast) {
           ev = "afterexit";
         }
-        var remove2 = function() {
+        var remove3 = function() {
           emitter.removeListener(ev, cb);
           if (emitter.listeners("exit").length === 0 && emitter.listeners("afterexit").length === 0) {
             unload();
           }
         };
         emitter.on(ev, cb);
-        return remove2;
+        return remove3;
       };
       unload = function unload2() {
         if (!loaded || !processOk(global.process)) {
@@ -199098,7 +199098,7 @@ var {
 } = import_index.default;
 
 // src/version.ts
-var version = "1.1.24";
+var version = "1.1.26";
 var version_default = version;
 
 // ../myst-cli/dist/build/build.js
@@ -205426,7 +205426,7 @@ function addWarningForFile(session, file, message, kind = "warn", opts) {
 var import_check_node_version = __toESM(require_check_node_version(), 1);
 
 // ../myst-cli/dist/version.js
-var version2 = "1.1.24";
+var version2 = "1.1.26";
 var version_default2 = version2;
 
 // ../myst-cli/dist/docs.js
@@ -242386,6 +242386,15 @@ var resolveReferencesTransform = (tree, file, opts) => {
   unnestCrossReferencesTransform(tree);
 };
 
+// ../myst-transforms/dist/removeUnicode.js
+var remove2 = ["\x07", "\b", ""];
+function removeUnicodeTransform(tree) {
+  const textNodes = selectAll("text", tree);
+  textNodes.forEach((text7) => {
+    text7.value = remove2.reduce((p5, r2) => p5.replaceAll(r2, ""), text7.value);
+  });
+}
+
 // ../myst-transforms/dist/basic.js
 function basicTransformations(tree, file) {
   liftMystDirectivesAndRolesTransform(tree);
@@ -242403,6 +242412,7 @@ function basicTransformations(tree, file) {
   htmlIdsTransform(tree);
   imageAltTextTransform(tree);
   blockquoteTransform(tree);
+  removeUnicodeTransform(tree);
 }
 var basicTransformationsPlugin = () => (tree, file) => {
   basicTransformations(tree, file);
@@ -288736,7 +288746,7 @@ ${content3}</pre></aside>
 var citationsPlugin = (md) => {
   const regexes = {
     citation: /^([^^-]|[^^].+?)?(-)?@([\w][\w:.#$%&\-+?<>~/]*)(.+)?$/,
-    inText: /^@([\w][\w:.#$%&\-+?<>~/]*)(\s*)(\[)?/,
+    inText: /^@((?:[\w|{][\w:.#$%&\-+?<>~/]*[\w|}])|\w)(\s*)(\[)?/,
     allowedBefore: /^[^a-zA-Z.0-9]$/
   };
   md.inline.ruler.after("emphasis", "citation", (state, silent) => {
@@ -288745,7 +288755,7 @@ var citationsPlugin = (md) => {
       const match3 = state.src.slice(state.pos).match(regexes.inText);
       if (match3) {
         const citation = {
-          label: match3[1],
+          label: trimBraces(match3[1]),
           kind: "narrative"
         };
         let token;
@@ -288762,8 +288772,10 @@ var citationsPlugin = (md) => {
             const suffix = state.src.slice(suffixStart, suffixEnd);
             citation.suffix = state.md.parseInline(suffix, state.env);
             state.pos += match3[0].length + suffixEnd - suffixStart + 1;
-            if (token)
+            if (token) {
               token.content = match3[0] + suffix + "]";
+              token.col.push(state.pos);
+            }
           } else {
             state.pos += match3[0].length - match3[2].length - match3[3].length;
             if (token) {
@@ -288794,7 +288806,7 @@ var citationsPlugin = (md) => {
           const suffix = x2[4] ? x2[4].trim().replace(/^,[\s]*/, "") : void 0;
           const colEnd = curCol + x2[0].length;
           const meta2 = {
-            label: x2[3],
+            label: trimBraces(x2[3]),
             kind: "parenthetical",
             prefix: ((_a6 = x2[1]) === null || _a6 === void 0 ? void 0 : _a6.trim()) ? state.md.parseInline((_b = x2[1]) === null || _b === void 0 ? void 0 : _b.trim(), state.env) : void 0,
             suffix: suffix ? state.md.parseInline(suffix, state.env) : void 0,
@@ -288827,6 +288839,9 @@ var citationsPlugin = (md) => {
     return false;
   });
 };
+function trimBraces(label) {
+  return label.replace(/^\{(.*)\}$/, "$1");
+}
 
 // ../markdown-it-myst/dist/index.js
 function mystPlugin(md) {
@@ -290464,9 +290479,11 @@ var citeRole = {
     const content3 = data.body;
     const labels = content3.split(/[,;]/).map((s5) => s5.trim());
     const kind = data.name.startsWith("cite:p") || data.name.includes("par") ? "parenthetical" : "narrative";
-    const children = labels.map((l) => {
-      var _a6;
-      const { label, identifier } = (_a6 = normalizeLabel(l)) !== null && _a6 !== void 0 ? _a6 : {};
+    const children = labels.map((c) => {
+      var _a6, _b;
+      const groups = /^(?:\{([^{]*)\})?([^{]*)(?:\{([^{]*)\})?$/;
+      const [, prefix2, l, suffix] = (_a6 = c.match(groups)) !== null && _a6 !== void 0 ? _a6 : ["", "", c];
+      const { label, identifier } = (_b = normalizeLabel(l)) !== null && _b !== void 0 ? _b : {};
       const cite3 = {
         type: "cite",
         kind,
@@ -290479,6 +290496,10 @@ var citeRole = {
       if (data.name.startsWith("cite:author") || data.name.startsWith("cite:cauthor")) {
         cite3.partial = "author";
       }
+      if (prefix2)
+        cite3.prefix = prefix2.trim();
+      if (suffix)
+        cite3.suffix = suffix.trim();
       return cite3;
     });
     if (data.name === "cite" && children.length === 1) {
@@ -292526,10 +292547,10 @@ async function saveImageInStaticFolder(session, urlSource, sourceFile, writeFold
   const url = resolveOutputPath(file, writeFolder, opts === null || opts === void 0 ? void 0 : opts.altOutputFolder);
   return { urlSource, url };
 }
-async function transformImages(session, mdast2, file, writeFolder, opts) {
+function transformImagesToEmbed(mdast2) {
   const images = selectAll("image", mdast2);
-  return Promise.all(images.map(async (image6) => {
-    var _a6, _b;
+  images.forEach((image6) => {
+    var _a6;
     if (image6.url.startsWith("#")) {
       image6.type = "embed";
       image6.source = { label: image6.url.substring(1) };
@@ -292537,12 +292558,18 @@ async function transformImages(session, mdast2, file, writeFolder, opts) {
       delete image6.url;
       return;
     }
+  });
+}
+function transformImagesWithoutExt(session, mdast2, file, opts) {
+  const images = selectAll("image", mdast2);
+  images.forEach((image6) => {
+    var _a6;
     const wildcardRegex = /\.\*$/;
     const imagePath = import_node_path18.default.join(import_node_path18.default.dirname(file), image6.url).replace(wildcardRegex, "");
     if (!import_node_fs13.default.existsSync(imagePath)) {
       const sortedExtensions = [
         // Valid extensions
-        ...(_b = opts === null || opts === void 0 ? void 0 : opts.imageExtensions) !== null && _b !== void 0 ? _b : [],
+        ...(_a6 = opts === null || opts === void 0 ? void 0 : opts.imageExtensions) !== null && _a6 !== void 0 ? _a6 : [],
         // Convertable extensions
         ...Object.keys(conversionFnLookup),
         // All known extensions
@@ -292556,6 +292583,11 @@ async function transformImages(session, mdast2, file, writeFolder, opts) {
         image6.urlSource = image6.url;
       }
     }
+  });
+}
+async function transformImagesToDisk(session, mdast2, file, writeFolder, opts) {
+  const images = selectAll("image", mdast2);
+  await Promise.all(images.map(async (image6) => {
     const result = await saveImageInStaticFolder(session, image6.urlSource || image6.url, file, writeFolder, {
       altOutputFolder: opts === null || opts === void 0 ? void 0 : opts.altOutputFolder,
       position: image6.position
@@ -292769,9 +292801,10 @@ async function transformBanner(session, file, frontmatter, writeFolder, opts) {
   return { url };
 }
 async function transformWebp(session, opts) {
+  var _a6;
   const { file, imageWriteFolder } = opts;
   const cache = castSession(session);
-  const postData = cache.$getMdast(opts.file).post;
+  const postData = (_a6 = cache.$getMdast(opts.file)) === null || _a6 === void 0 ? void 0 : _a6.post;
   if (!postData)
     throw new Error(`Expected mdast to be processed and transformed for ${file}`);
   if (!import_node_fs13.default.existsSync(imageWriteFolder))
@@ -292798,18 +292831,18 @@ ${error === null || error === void 0 ? void 0 : error.stack}
     }
   }));
   await Promise.all(["thumbnail", "banner"].map(async (attr) => {
-    var _a6;
+    var _a7;
     const attrOptimized = `${attr}Optimized`;
     if (frontmatter[attr]) {
       const fileMatch = writeFolderContents.find((item) => {
-        var _a7;
-        return (_a7 = frontmatter[attr]) === null || _a7 === void 0 ? void 0 : _a7.endsWith(item);
+        var _a8;
+        return (_a8 = frontmatter[attr]) === null || _a8 === void 0 ? void 0 : _a8.endsWith(item);
       });
       if (fileMatch) {
         try {
           const result = await imagemagick_exports.convertImageToWebp(session, import_node_path18.default.join(imageWriteFolder, fileMatch));
           if (result) {
-            frontmatter[attrOptimized] = (_a6 = frontmatter[attr]) === null || _a6 === void 0 ? void 0 : _a6.replace(fileMatch, result);
+            frontmatter[attrOptimized] = (_a7 = frontmatter[attr]) === null || _a7 === void 0 ? void 0 : _a7.replace(fileMatch, result);
             session.store.dispatch(watch.actions.updateFileInfo({
               path: file,
               [attrOptimized]: frontmatter[attrOptimized]
@@ -292825,7 +292858,9 @@ ${error === null || error === void 0 ? void 0 : error.stack}
       }
     }
   }));
-  cache.$getMdast(file).post = { ...postData, mdast: mdast2, frontmatter };
+  const cachedMdast = cache.$getMdast(file);
+  if (cachedMdast)
+    cachedMdast.post = { ...postData, mdast: mdast2, frontmatter };
 }
 function isValidImageNode(node3, validExts) {
   return node3.type === "image" && node3.url && validExts.includes(import_node_path18.default.extname(node3.url));
@@ -293082,6 +293117,7 @@ async function bibFilesInDir(session, dir, load2 = true) {
   return bibFiles.filter((f3) => Boolean(f3));
 }
 function selectFile(session, file) {
+  var _a6;
   const cache = castSession(session);
   if (!cache.$getMdast(file)) {
     addWarningForFile(session, file, `Expected mdast to be processed`, "error", {
@@ -293089,7 +293125,7 @@ function selectFile(session, file) {
     });
     return void 0;
   }
-  const mdastPost = cache.$getMdast(file).post;
+  const mdastPost = (_a6 = cache.$getMdast(file)) === null || _a6 === void 0 ? void 0 : _a6.post;
   if (!mdastPost) {
     addWarningForFile(session, file, `Expected mdast to be processed and transformed`, "error", {
       ruleId: RuleId.selectedFileIsProcessed
@@ -293460,8 +293496,8 @@ function checkMetaTags(vfile2, node3, tags, filter3) {
   });
   for (const target of ["cell", "input", "output"]) {
     const hide = metaTagsCounter.get(`hide-${target}`) > 0;
-    const remove2 = metaTagsCounter.get(`remove-${target}`) > 0;
-    if (hide && remove2) {
+    const remove3 = metaTagsCounter.get(`remove-${target}`) > 0;
+    if (hide && remove3) {
       fileWarn(vfile2, `'hide-${target}' and 'remove-${target}' both exist`, {
         node: node3,
         ruleId: RuleId.codeMetatagsValid
@@ -293469,7 +293505,7 @@ function checkMetaTags(vfile2, node3, tags, filter3) {
       validMetatags.push(`remove-${target}`);
     } else if (hide) {
       validMetatags.push(`hide-${target}`);
-    } else if (remove2) {
+    } else if (remove3) {
       validMetatags.push(`remove-${target}`);
     }
   }
@@ -294124,15 +294160,15 @@ var htmlHandlers = {
   }
 };
 async function transformMdast(session, opts) {
-  var _a6, _b;
-  const { file, imageWriteFolder, projectPath, pageSlug, projectSlug, useExistingImages, imageAltOutputFolder, imageExtensions, extraTransforms, watchMode = false, minifyMaxCharacters, index: index4, simplifyFigures, processThumbnail } = opts;
+  var _a6, _b, _c, _d2;
+  const { file, projectPath, pageSlug, projectSlug, imageExtensions, extraTransforms, watchMode = false, minifyMaxCharacters, index: index4 } = opts;
   const toc = tic();
   const { store, log } = session;
   const cache = castSession(session);
   if (!cache.$getMdast(file))
     return;
-  const { mdast: mdastPre, kind, frontmatter: preFrontmatter, location: location4 } = cache.$getMdast(file).pre;
-  if (!mdastPre)
+  const { mdast: mdastPre, kind, frontmatter: preFrontmatter, location: location4 } = (_b = (_a6 = cache.$getMdast(file)) === null || _a6 === void 0 ? void 0 : _a6.pre) !== null && _b !== void 0 ? _b : {};
+  if (!mdastPre || !kind || !location4)
     throw new Error(`Expected mdast to be parsed for ${file}`);
   log.debug(`Processing "${file}"`);
   const vfile2 = new VFile();
@@ -294158,7 +294194,7 @@ async function transformMdast(session, opts) {
   await includeFilesTransform(session, file, mdast2, vfile2);
   liftCodeMetadataToBlock(session, vfile2, mdast2);
   const pipe = unified().use(reconstructHtmlPlugin).use(htmlPlugin, { htmlHandlers }).use(basicTransformationsPlugin).use(inlineExpressionsPlugin).use(mathPlugin, { macros: frontmatter.math }).use(glossaryPlugin, { state }).use(abbreviationPlugin, { abbreviations: frontmatter.abbreviations }).use(enumerateTargetsPlugin, { state }).use(joinGatesPlugin);
-  (_a6 = session.plugins) === null || _a6 === void 0 ? void 0 : _a6.transforms.forEach((t2) => {
+  (_c = session.plugins) === null || _c === void 0 ? void 0 : _c.transforms.forEach((t2) => {
     if (t2.stage !== "document")
       return;
     pipe.use(t2.plugin, void 0, pluginUtils);
@@ -294185,37 +294221,9 @@ async function transformMdast(session, opts) {
   const fileCitationRenderer = combineCitationRenderers(cache, ...rendererFiles);
   await transformOutputsToCache(session, mdast2, kind, { minifyMaxCharacters });
   transformCitations(mdast2, fileCitationRenderer, references);
-  await unified().use(codePlugin, { lang: (_b = frontmatter === null || frontmatter === void 0 ? void 0 : frontmatter.kernelspec) === null || _b === void 0 ? void 0 : _b.language }).use(footnotesPlugin).run(mdast2, vfile2);
-  if (simplifyFigures) {
-    reduceOutputs(session, mdast2, file, imageWriteFolder, {
-      altOutputFolder: simplifyFigures ? void 0 : imageAltOutputFolder
-    });
-  }
-  transformOutputsToFile(session, mdast2, imageWriteFolder, {
-    altOutputFolder: simplifyFigures ? void 0 : imageAltOutputFolder,
-    vfile: vfile2
-  });
-  if (!useExistingImages) {
-    await transformImages(session, mdast2, file, imageWriteFolder, {
-      altOutputFolder: imageAltOutputFolder,
-      imageExtensions
-    });
-    await transformImageFormats(session, mdast2, file, imageWriteFolder, {
-      altOutputFolder: imageAltOutputFolder,
-      imageExtensions
-    });
-    if (processThumbnail) {
-      await transformThumbnail(session, mdast2, file, frontmatter, imageWriteFolder, {
-        altOutputFolder: imageAltOutputFolder,
-        webp: extraTransforms === null || extraTransforms === void 0 ? void 0 : extraTransforms.includes(transformWebp)
-      });
-      await transformBanner(session, file, frontmatter, imageWriteFolder, {
-        altOutputFolder: imageAltOutputFolder,
-        webp: extraTransforms === null || extraTransforms === void 0 ? void 0 : extraTransforms.includes(transformWebp)
-      });
-    }
-  }
-  await transformDeleteBase64UrlSource(mdast2);
+  await unified().use(codePlugin, { lang: (_d2 = frontmatter === null || frontmatter === void 0 ? void 0 : frontmatter.kernelspec) === null || _d2 === void 0 ? void 0 : _d2.language }).use(footnotesPlugin).run(mdast2, vfile2);
+  transformImagesToEmbed(mdast2);
+  transformImagesWithoutExt(session, mdast2, file, { imageExtensions });
   const sha256 = selectors_exports.selectFileInfo(store.getState(), file).sha256;
   const useSlug = pageSlug !== index4;
   const url = projectSlug ? `/${projectSlug}/${useSlug ? pageSlug : ""}` : `/${useSlug ? pageSlug : ""}`;
@@ -294245,7 +294253,9 @@ async function transformMdast(session, opts) {
     mdast: mdast2,
     references
   };
-  cache.$getMdast(file).post = data;
+  const cachedMdast = cache.$getMdast(file);
+  if (cachedMdast)
+    cachedMdast.post = data;
   if (extraTransforms) {
     await Promise.all(extraTransforms.map(async (transform2) => {
       await transform2(session, opts);
@@ -294255,7 +294265,7 @@ async function transformMdast(session, opts) {
   if (!watchMode)
     log.info(toc(`\u{1F4D6} Built ${file} in %s.`));
 }
-async function postProcessMdast(session, { file, checkLinks, pageReferenceStates, extraLinkTransformers, simplifyFigures, imageExtensions }) {
+async function postProcessMdast(session, { file, checkLinks, pageReferenceStates, extraLinkTransformers }) {
   var _a6;
   const toc = tic();
   const { log } = session;
@@ -294279,9 +294289,6 @@ async function postProcessMdast(session, { file, checkLinks, pageReferenceStates
   });
   resolveReferencesTransform(mdast2, state.file, { state });
   embedTransform(session, mdast2, dependencies, state);
-  if (simplifyFigures) {
-    transformPlaceholderImages(mdast2, { imageExtensions });
-  }
   const pipe = unified();
   (_a6 = session.plugins) === null || _a6 === void 0 ? void 0 : _a6.transforms.forEach((t2) => {
     if (t2.stage !== "project")
@@ -294291,10 +294298,59 @@ async function postProcessMdast(session, { file, checkLinks, pageReferenceStates
   await pipe.run(mdast2, vfile2);
   keysTransform(mdast2);
   logMessagesFromVFile(session, fileState.file);
+  logMessagesFromVFile(session, vfile2);
   log.debug(toc(`Transformed mdast cross references and links for "${file}" in %s`));
   if (checkLinks)
     await checkLinksTransform(session, file, mdastPost.mdast);
 }
+async function finalizeMdast(session, mdast2, frontmatter, file, { imageWriteFolder, useExistingImages, imageAltOutputFolder, imageExtensions, optimizeWebp, simplifyFigures, processThumbnail }) {
+  var _a6;
+  const vfile2 = new VFile();
+  vfile2.path = file;
+  if (simplifyFigures) {
+    reduceOutputs(session, mdast2, file, imageWriteFolder, {
+      altOutputFolder: simplifyFigures ? void 0 : imageAltOutputFolder
+    });
+  }
+  transformOutputsToFile(session, mdast2, imageWriteFolder, {
+    altOutputFolder: simplifyFigures ? void 0 : imageAltOutputFolder,
+    vfile: vfile2
+  });
+  if (!useExistingImages) {
+    await transformImagesToDisk(session, mdast2, file, imageWriteFolder, {
+      altOutputFolder: imageAltOutputFolder,
+      imageExtensions
+    });
+    await transformImageFormats(session, mdast2, file, imageWriteFolder, {
+      altOutputFolder: imageAltOutputFolder,
+      imageExtensions
+    });
+    if (optimizeWebp) {
+      await transformWebp(session, { file, imageWriteFolder });
+    }
+    if (processThumbnail) {
+      await transformThumbnail(session, mdast2, file, frontmatter, imageWriteFolder, {
+        altOutputFolder: imageAltOutputFolder,
+        webp: optimizeWebp
+      });
+      await transformBanner(session, file, frontmatter, imageWriteFolder, {
+        altOutputFolder: imageAltOutputFolder,
+        webp: optimizeWebp
+      });
+    }
+  }
+  await transformDeleteBase64UrlSource(mdast2);
+  if (simplifyFigures) {
+    transformPlaceholderImages(mdast2, { imageExtensions });
+  }
+  const cache = castSession(session);
+  const postData = (_a6 = cache.$getMdast(file)) === null || _a6 === void 0 ? void 0 : _a6.post;
+  if (postData) {
+    postData.frontmatter = frontmatter;
+    postData.mdast = mdast2;
+  }
+  logMessagesFromVFile(session, vfile2);
+}
 
 // ../myst-cli/dist/process/site.js
 var import_node_fs19 = __toESM(require("fs"), 1);
@@ -294440,29 +294496,36 @@ async function writeFile(session, { file, pageSlug, projectSlug }) {
   session.log.debug(toc(`Wrote "${file}" in %s`));
 }
 async function fastProcessFile(session, { file, pageSlug, projectPath, projectSlug, extraLinkTransformers, extraTransforms, defaultTemplate }) {
+  var _a6, _b;
   const toc = tic();
   await loadFile(session, file, projectPath);
   const { project, pages } = await loadProject(session, projectPath);
   await transformMdast(session, {
     file,
-    imageWriteFolder: session.publicPath(),
-    imageAltOutputFolder: "/",
     imageExtensions: WEB_IMAGE_EXTENSIONS,
     projectPath,
     projectSlug,
     pageSlug,
     watchMode: true,
-    extraTransforms: [transformWebp, ...extraTransforms !== null && extraTransforms !== void 0 ? extraTransforms : []],
-    index: project.index,
-    processThumbnail: true
+    extraTransforms,
+    index: project.index
   });
   const pageReferenceStates = selectPageReferenceStates(session, pages);
   await postProcessMdast(session, {
     file,
     pageReferenceStates,
-    extraLinkTransformers,
-    imageExtensions: WEB_IMAGE_EXTENSIONS
+    extraLinkTransformers
   });
+  const { mdast: mdast2, frontmatter } = (_b = (_a6 = castSession(session).$getMdast(file)) === null || _a6 === void 0 ? void 0 : _a6.post) !== null && _b !== void 0 ? _b : {};
+  if (mdast2 && frontmatter) {
+    await finalizeMdast(session, mdast2, frontmatter, file, {
+      imageWriteFolder: session.publicPath(),
+      imageAltOutputFolder: "/",
+      imageExtensions: WEB_IMAGE_EXTENSIONS,
+      optimizeWebp: true,
+      processThumbnail: true
+    });
+  }
   await writeFile(session, { file, pageSlug, projectSlug });
   session.log.info(toc(`\u{1F4D6} Built ${file} in %s.`));
   await writeSiteManifest(session, { defaultTemplate });
@@ -294495,40 +294558,42 @@ async function processProject(session, siteProject, opts) {
   }
   combineProjectCitationRenderers(session, siteProject.path);
   const usedImageExtensions = imageExtensions !== null && imageExtensions !== void 0 ? imageExtensions : WEB_IMAGE_EXTENSIONS;
-  const extraTransforms = [];
-  if (usedImageExtensions.includes(ImageExtensions.webp)) {
-    extraTransforms.push(transformWebp);
-  }
-  if (opts === null || opts === void 0 ? void 0 : opts.extraTransforms) {
-    extraTransforms.push(...opts.extraTransforms);
-  }
   await Promise.all(pages.map((page) => transformMdast(session, {
     file: page.file,
-    imageWriteFolder: imageWriteFolder !== null && imageWriteFolder !== void 0 ? imageWriteFolder : session.publicPath(),
-    imageAltOutputFolder,
     imageExtensions: usedImageExtensions,
     projectPath: project.path,
     projectSlug: siteProject.slug,
     pageSlug: page.slug,
     watchMode,
-    extraTransforms,
-    index: project.index,
-    processThumbnail: true
+    extraTransforms: opts === null || opts === void 0 ? void 0 : opts.extraTransforms,
+    index: project.index
   })));
   const pageReferenceStates = selectPageReferenceStates(session, pages);
   await Promise.all(pages.map((page) => postProcessMdast(session, {
     file: page.file,
     checkLinks: (opts === null || opts === void 0 ? void 0 : opts.checkLinks) || (opts === null || opts === void 0 ? void 0 : opts.strict),
     pageReferenceStates,
-    extraLinkTransformers,
-    imageExtensions: usedImageExtensions
+    extraLinkTransformers
   })));
   if (writeFiles) {
-    await Promise.all(pages.map((page) => writeFile(session, {
-      file: page.file,
-      projectSlug: siteProject.slug,
-      pageSlug: page.slug
-    })));
+    await Promise.all(pages.map(async (page) => {
+      var _a7, _b;
+      const { mdast: mdast2, frontmatter } = (_b = (_a7 = castSession(session).$getMdast(page.file)) === null || _a7 === void 0 ? void 0 : _a7.post) !== null && _b !== void 0 ? _b : {};
+      if (mdast2 && frontmatter) {
+        await finalizeMdast(session, mdast2, frontmatter, page.file, {
+          imageWriteFolder: imageWriteFolder !== null && imageWriteFolder !== void 0 ? imageWriteFolder : session.publicPath(),
+          imageAltOutputFolder,
+          imageExtensions: usedImageExtensions,
+          optimizeWebp: true,
+          processThumbnail: true
+        });
+      }
+      return writeFile(session, {
+        file: page.file,
+        projectSlug: siteProject.slug,
+        pageSlug: page.slug
+      });
+    }));
   }
   log.info(toc(`\u{1F4DA} Built ${plural("%s page(s)", pages)} for ${(_a6 = siteProject.slug) !== null && _a6 !== void 0 ? _a6 : "project"} in %s.`));
   return project;
@@ -295382,7 +295447,7 @@ async function collectExportOptions(session, files, formats, opts) {
 
 // ../myst-cli/dist/build/utils/getFileContent.js
 var import_node_path31 = require("path");
-async function getFileContent(session, files, imageWriteFolder, { projectPath, useExistingImages, imageAltOutputFolder, imageExtensions, extraLinkTransformers, simplifyFigures }) {
+async function getFileContent(session, files, { projectPath, imageExtensions, extraLinkTransformers }) {
   const toc = tic();
   files = files.map((file) => (0, import_node_path31.resolve)(file));
   projectPath = projectPath !== null && projectPath !== void 0 ? projectPath : (0, import_node_path31.resolve)(".");
@@ -295403,15 +295468,11 @@ async function getFileContent(session, files, imageWriteFolder, { projectPath, u
     const pageSlug = (_a6 = pages.find((page) => page.file === file)) === null || _a6 === void 0 ? void 0 : _a6.slug;
     await transformMdast(session, {
       file,
-      useExistingImages,
-      imageWriteFolder,
-      imageAltOutputFolder,
       imageExtensions,
       projectPath,
       pageSlug,
       minifyMaxCharacters: 0,
-      index: project.index,
-      simplifyFigures
+      index: project.index
     });
   }));
   const pageReferenceStates = selectPageReferenceStates(session, allFiles.map((file) => {
@@ -295421,9 +295482,7 @@ async function getFileContent(session, files, imageWriteFolder, { projectPath, u
     await postProcessMdast(session, {
       file,
       extraLinkTransformers,
-      pageReferenceStates,
-      simplifyFigures,
-      imageExtensions
+      pageReferenceStates
     });
     const selectedFile = selectFile(session, file);
     if (!selectedFile)
@@ -304112,11 +304171,15 @@ function extractTexPart(session, mdast2, references, partDefinition, frontmatter
 }
 async function localArticleToTexRaw(session, templateOptions, projectPath, extraLinkTransformers) {
   const { article, output: output2 } = templateOptions;
-  const [{ mdast: mdast2, frontmatter, references }] = await getFileContent(session, [article], import_node_path37.default.join(import_node_path37.default.dirname(output2), "files"), {
+  const [{ mdast: mdast2, frontmatter, references }] = await getFileContent(session, [article], {
     projectPath,
+    imageExtensions: TEX_IMAGE_EXTENSIONS,
+    extraLinkTransformers
+  });
+  await finalizeMdast(session, mdast2, frontmatter, article, {
+    imageWriteFolder: import_node_path37.default.join(import_node_path37.default.dirname(output2), "files"),
     imageAltOutputFolder: "files/",
     imageExtensions: TEX_IMAGE_EXTENSIONS,
-    extraLinkTransformers,
     simplifyFigures: true
   });
   const toc = tic();
@@ -304141,18 +304204,17 @@ function writeBibtexFromCitationRenderers(session, output2) {
   import_node_fs29.default.writeFileSync(output2, bibtexContent);
 }
 async function localArticleToTexTemplated(session, file, templateOptions, projectPath, force, extraLinkTransformers) {
-  const filesPath = import_node_path37.default.join(import_node_path37.default.dirname(templateOptions.output), "files");
-  const [{ frontmatter, mdast: mdast2, references }] = await getFileContent(session, [templateOptions.article], filesPath, {
+  const { output: output2, article, template } = templateOptions;
+  const filesPath = import_node_path37.default.join(import_node_path37.default.dirname(output2), "files");
+  const [{ frontmatter, mdast: mdast2, references }] = await getFileContent(session, [article], {
     projectPath,
-    imageAltOutputFolder: "files/",
     imageExtensions: TEX_IMAGE_EXTENSIONS,
-    extraLinkTransformers,
-    simplifyFigures: true
+    extraLinkTransformers
   });
-  writeBibtexFromCitationRenderers(session, import_node_path37.default.join(import_node_path37.default.dirname(templateOptions.output), DEFAULT_BIB_FILENAME));
+  writeBibtexFromCitationRenderers(session, import_node_path37.default.join(import_node_path37.default.dirname(output2), DEFAULT_BIB_FILENAME));
   const mystTemplate = new dist_default4(session, {
     kind: TemplateKind.tex,
-    template: templateOptions.template || void 0,
+    template: template || void 0,
     buildDir: session.buildPath(),
     errorLogFn: (message) => {
       addWarningForFile(session, file, message, "error", {
@@ -304168,6 +304230,12 @@ async function localArticleToTexTemplated(session, file, templateOptions, projec
   await mystTemplate.ensureTemplateExistsOnPath();
   const toc = tic();
   const templateYml = mystTemplate.getValidatedTemplateYml();
+  await finalizeMdast(session, mdast2, frontmatter, article, {
+    imageWriteFolder: filesPath,
+    imageAltOutputFolder: "files/",
+    imageExtensions: TEX_IMAGE_EXTENSIONS,
+    simplifyFigures: true
+  });
   const partDefinitions = (templateYml === null || templateYml === void 0 ? void 0 : templateYml.parts) || [];
   const parts = {};
   let collectedImports = { imports: [], commands: {} };
@@ -304180,10 +304248,10 @@ async function localArticleToTexTemplated(session, file, templateOptions, projec
     }
   });
   const result = mdastToTex(session, mdast2, references, frontmatter, templateYml, true);
-  session.log.info(toc(`\u{1F4D1} Exported TeX in %s, copying to ${templateOptions.output}`));
+  session.log.info(toc(`\u{1F4D1} Exported TeX in %s, copying to ${output2}`));
   renderTex(mystTemplate, {
     contentOrPath: result.value,
-    outputPath: templateOptions.output,
+    outputPath: output2,
     frontmatter,
     parts,
     options: templateOptions,
@@ -304955,11 +305023,10 @@ async function runWordExport(session, file, exportOptions, projectPath, clean3,
   const vfile2 = new VFile();
   vfile2.path = output2;
   const imageWriteFolder = createTempFolder(session);
-  const [data] = await getFileContent(session, [article], imageWriteFolder, {
+  const [data] = await getFileContent(session, [article], {
     projectPath,
     imageExtensions: DOCX_IMAGE_EXTENSIONS,
-    extraLinkTransformers,
-    simplifyFigures: true
+    extraLinkTransformers
   });
   const mystTemplate = new dist_default4(session, {
     kind: TemplateKind.docx,
@@ -304981,6 +305048,11 @@ async function runWordExport(session, file, exportOptions, projectPath, clean3,
     sourceFile: file
   });
   const renderer = (_a6 = exportOptions.renderer) !== null && _a6 !== void 0 ? _a6 : defaultWordRenderer;
+  await finalizeMdast(session, data.mdast, data.frontmatter, article, {
+    imageWriteFolder,
+    imageExtensions: DOCX_IMAGE_EXTENSIONS,
+    simplifyFigures: true
+  });
   const docx = renderer(session, data, doc, options, mystTemplate.templatePath, vfile2);
   logMessagesFromVFile(session, vfile2);
   await writeDocx(docx, (buffer2) => writeFileToFolder(output2, buffer2));
@@ -307384,18 +307456,24 @@ async function runJatsExport(session, exportOptions, projectPath, clean3, extraL
   const { output: output2, article, sub_articles } = exportOptions;
   if (clean3)
     cleanOutput(session, output2);
-  const processedContents = (await getFileContent(session, [article, ...sub_articles !== null && sub_articles !== void 0 ? sub_articles : []], import_node_path39.default.join(import_node_path39.default.dirname(output2), "files"), {
+  const processedContents = (await getFileContent(session, [article, ...sub_articles !== null && sub_articles !== void 0 ? sub_articles : []], {
     projectPath,
-    imageAltOutputFolder: "files/",
     imageExtensions: KNOWN_IMAGE_EXTENSIONS,
-    extraLinkTransformers,
-    simplifyFigures: false
+    extraLinkTransformers
   })).map((content3) => {
     const { kind, file, mdast: mdast2, frontmatter, slug } = content3;
     const rendererFiles = projectPath ? [projectPath, file] : [file];
     const citations = combineCitationRenderers(castSession(session), ...rendererFiles);
-    return { mdast: mdast2, kind, frontmatter, citations, slug };
+    return { mdast: mdast2, kind, frontmatter, citations, slug, file };
   });
+  await Promise.all(processedContents.map(({ mdast: mdast2, frontmatter, file }) => {
+    return finalizeMdast(session, mdast2, frontmatter, file, {
+      imageWriteFolder: import_node_path39.default.join(import_node_path39.default.dirname(output2), "files"),
+      imageAltOutputFolder: "files/",
+      imageExtensions: KNOWN_IMAGE_EXTENSIONS,
+      simplifyFigures: false
+    });
+  }));
   const [processedArticle, ...processedSubArticles] = processedContents;
   const vfile2 = new VFile();
   vfile2.path = output2;
@@ -312305,13 +312383,17 @@ async function runMdExport(session, exportOptions, projectPath, clean3, extraLin
   const { output: output2, article } = exportOptions;
   if (clean3)
     cleanOutput(session, output2);
-  const [{ mdast: mdast2, frontmatter }] = await getFileContent(session, [article], import_node_path43.default.join(import_node_path43.default.dirname(output2), "files"), {
+  const [{ mdast: mdast2, frontmatter }] = await getFileContent(session, [article], {
     projectPath,
-    useExistingImages: true,
+    imageExtensions: KNOWN_IMAGE_EXTENSIONS,
+    extraLinkTransformers
+  });
+  await finalizeMdast(session, mdast2, frontmatter, article, {
+    imageWriteFolder: import_node_path43.default.join(import_node_path43.default.dirname(output2), "files"),
     imageAltOutputFolder: "files/",
     imageExtensions: KNOWN_IMAGE_EXTENSIONS,
-    extraLinkTransformers,
-    simplifyFigures: false
+    simplifyFigures: false,
+    useExistingImages: true
   });
   const vfile2 = new VFile();
   vfile2.path = output2;

{mystmd-1.1.24 → mystmd-1.1.26}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = mystmd
-version = 1.1.24
+version = 1.1.26
 description = Command line tools for MyST Markdown
 long_description = file: README.md
 long_description_content_type = text/markdown