mystmd 1.2.7__tar.gz → 1.2.8__tar.gz

{mystmd-1.2.7 → mystmd-1.2.8}/PKG-INFO

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

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

{mystmd-1.2.7 → mystmd-1.2.8}/src/mystmd_py/myst.cjs

@@ -193305,7 +193305,7 @@ var {
 } = import_index.default;
 
 // src/version.ts
-var version = "1.2.7";
+var version = "1.2.8";
 var version_default = version;
 
 // ../myst-cli/dist/build/build.js
@@ -198615,36 +198615,18 @@ function validatePageFrontmatter(input3, opts) {
 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;
+function fillSiteFrontmatter(base5, filler, opts, keys2) {
+  var _a6, _b, _c, _d2, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r;
   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 (filler.math || base5.math) {
-    frontmatter.math = { ...(_a6 = filler.math) !== null && _a6 !== void 0 ? _a6 : {}, ...(_b = base5.math) !== null && _b !== void 0 ? _b : {} };
-  }
-  if (filler.abbreviations || base5.abbreviations) {
-    frontmatter.abbreviations = {
-      ...(_c = filler.abbreviations) !== null && _c !== void 0 ? _c : {},
-      ...(_d2 = base5.abbreviations) !== null && _d2 !== void 0 ? _d2 : {}
-    };
-  }
   if (filler.options || base5.options) {
     frontmatter.options = {
-      ...(_e = filler.options) !== null && _e !== void 0 ? _e : {},
-      ...(_f = base5.options) !== null && _f !== void 0 ? _f : {}
-    };
-  }
-  if (filler.settings || base5.settings) {
-    frontmatter.settings = {
-      ...(_g = filler.settings) !== null && _g !== void 0 ? _g : {},
-      ...(_h = base5.settings) !== null && _h !== void 0 ? _h : {}
+      ...(_a6 = filler.options) !== null && _a6 !== void 0 ? _a6 : {},
+      ...(_b = base5.options) !== null && _b !== void 0 ? _b : {}
     };
   }
   const contributorIds = /* @__PURE__ */ new Set();
   const affiliationIds = /* @__PURE__ */ new Set();
-  (_j = frontmatter.funding) === null || _j === void 0 ? void 0 : _j.forEach((fund) => {
+  (_c = frontmatter.funding) === null || _c === void 0 ? void 0 : _c.forEach((fund) => {
     var _a7;
     (_a7 = fund.awards) === null || _a7 === void 0 ? void 0 : _a7.forEach((award) => {
       var _a8, _b2, _c2;
@@ -198659,18 +198641,18 @@ function fillProjectFrontmatter(base5, filler, opts, keys2) {
       });
     });
   });
-  (_k = frontmatter.reviewers) === null || _k === void 0 ? void 0 : _k.forEach((reviewer) => {
+  (_d2 = frontmatter.reviewers) === null || _d2 === void 0 ? void 0 : _d2.forEach((reviewer) => {
     contributorIds.add(reviewer);
   });
-  (_l = frontmatter.editors) === null || _l === void 0 ? void 0 : _l.forEach((editor) => {
+  (_e = frontmatter.editors) === null || _e === void 0 ? void 0 : _e.forEach((editor) => {
     contributorIds.add(editor);
   });
-  if (((_m = frontmatter.authors) === null || _m === void 0 ? void 0 : _m.length) || contributorIds.size) {
+  if (((_f = frontmatter.authors) === null || _f === void 0 ? void 0 : _f.length) || contributorIds.size) {
     const people = [
-      ...(_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 : []
+      ...(_g = base5.authors) !== null && _g !== void 0 ? _g : [],
+      ...(_h = filler.authors) !== null && _h !== void 0 ? _h : [],
+      ...(_j = base5.contributors) !== null && _j !== void 0 ? _j : [],
+      ...(_k = filler.contributors) !== null && _k !== void 0 ? _k : []
     ];
     const peopleLookup = {};
     people.forEach((auth) => {
@@ -198682,7 +198664,7 @@ function fillProjectFrontmatter(base5, filler, opts, keys2) {
         validationWarning(`Duplicate contributor id within project: ${auth.id}`, incrementOptions("authors", opts));
       }
     });
-    if ((_s = frontmatter.authors) === null || _s === void 0 ? void 0 : _s.length) {
+    if ((_l = frontmatter.authors) === null || _l === void 0 ? void 0 : _l.length) {
       frontmatter.authors = frontmatter.authors.map((auth) => {
         var _a7;
         if (!auth.id)
@@ -198698,18 +198680,18 @@ function fillProjectFrontmatter(base5, filler, opts, keys2) {
       });
     }
   }
-  [...(_t = frontmatter.authors) !== null && _t !== void 0 ? _t : [], ...(_u = frontmatter.contributors) !== null && _u !== void 0 ? _u : []].forEach((auth) => {
+  [...(_m = frontmatter.authors) !== null && _m !== void 0 ? _m : [], ...(_o = frontmatter.contributors) !== null && _o !== void 0 ? _o : []].forEach((auth) => {
     var _a7;
     (_a7 = auth.affiliations) === null || _a7 === void 0 ? void 0 : _a7.forEach((aff) => {
       affiliationIds.add(aff);
     });
   });
-  (_v = frontmatter.affiliations) === null || _v === void 0 ? void 0 : _v.forEach((aff) => {
+  (_p = frontmatter.affiliations) === null || _p === void 0 ? void 0 : _p.forEach((aff) => {
     if (aff.id)
       affiliationIds.add(aff.id);
   });
   if (affiliationIds.size) {
-    const affiliations2 = [...(_w = base5.affiliations) !== null && _w !== void 0 ? _w : [], ...(_x2 = filler.affiliations) !== null && _x2 !== void 0 ? _x2 : []];
+    const affiliations2 = [...(_q = base5.affiliations) !== null && _q !== void 0 ? _q : [], ...(_r = filler.affiliations) !== null && _r !== void 0 ? _r : []];
     const affiliationLookup = {};
     affiliations2.forEach((aff) => {
       if (!aff.id || isStashPlaceholder(aff))
@@ -198727,6 +198709,29 @@ function fillProjectFrontmatter(base5, filler, opts, keys2) {
   }
   return frontmatter;
 }
+function fillProjectFrontmatter(base5, filler, opts, keys2) {
+  var _a6, _b, _c, _d2, _e, _f;
+  const frontmatter = fillSiteFrontmatter(base5, filler, opts, keys2 !== null && keys2 !== void 0 ? keys2 : Object.keys(filler));
+  if (filler.numbering || base5.numbering) {
+    frontmatter.numbering = fillNumbering(base5.numbering, filler.numbering);
+  }
+  if (filler.math || base5.math) {
+    frontmatter.math = { ...(_a6 = filler.math) !== null && _a6 !== void 0 ? _a6 : {}, ...(_b = base5.math) !== null && _b !== void 0 ? _b : {} };
+  }
+  if (filler.abbreviations || base5.abbreviations) {
+    frontmatter.abbreviations = {
+      ...(_c = filler.abbreviations) !== null && _c !== void 0 ? _c : {},
+      ...(_d2 = base5.abbreviations) !== null && _d2 !== void 0 ? _d2 : {}
+    };
+  }
+  if (filler.settings || base5.settings) {
+    frontmatter.settings = {
+      ...(_e = filler.settings) !== null && _e !== void 0 ? _e : {},
+      ...(_f = base5.settings) !== null && _f !== void 0 ? _f : {}
+    };
+  }
+  return frontmatter;
+}
 
 // ../myst-frontmatter/dist/utils/unnestKernelSpec.js
 function unnestKernelSpec(pageFrontmatter) {
@@ -220934,6 +220939,15 @@ var defaultHtmlToMdastOptions = {
         attrs.alt = node3.properties.alt;
       return h4(node3, "image", attrs);
     },
+    video(h4, node3) {
+      const attrs = addClassAndIdentifier(node3);
+      attrs.url = String(node3.properties.src || "");
+      if (node3.properties.title)
+        attrs.title = node3.properties.title;
+      if (node3.properties.alt)
+        attrs.alt = node3.properties.alt;
+      return h4(node3, "image", attrs);
+    },
     figure(h4, node3) {
       const attrs = addClassAndIdentifier(node3);
       return h4(node3, "container", attrs, all5(h4, node3));
@@ -240572,8 +240586,8 @@ function configValidationOpts(vfile2, property, ruleId) {
     }
   };
 }
-function fillSiteConfig(base5, filler) {
-  return fillMissingKeys(base5, filler, Object.keys(filler));
+function fillSiteConfig(base5, filler, opts) {
+  return fillSiteFrontmatter(base5, filler, opts, Object.keys(filler));
 }
 async function getValidatedConfigsFromFile(session, file, vfile2, stack) {
   var _a6, _b, _c, _d2;
@@ -240636,7 +240650,7 @@ async function getValidatedConfigsFromFile(session, file, vfile2, stack) {
       const { site: extSite, project: extProject } = await getValidatedConfigsFromFile(session, extFile, vfile2, stack);
       session.store.dispatch(config.actions.receiveConfigExtension({ file: extFile }));
       if (extSite) {
-        site = site ? fillSiteConfig(extSite, site) : extSite;
+        site = site ? fillSiteConfig(extSite, site, incrementOptions("extend", opts)) : extSite;
       }
       if (extProject) {
         project = project ? fillProjectFrontmatter(extProject, project, projectOpts) : extProject;
@@ -240646,7 +240660,7 @@ async function getValidatedConfigsFromFile(session, file, vfile2, stack) {
   const { site: rawSite, project: rawProject } = conf !== null && conf !== void 0 ? conf : {};
   const path41 = (0, import_node_path8.dirname)(file);
   if (rawSite) {
-    site = fillSiteConfig(await validateSiteConfigAndThrow(session, path41, vfile2, rawSite), site !== null && site !== void 0 ? site : {});
+    site = fillSiteConfig(await validateSiteConfigAndThrow(session, path41, vfile2, rawSite), site !== null && site !== void 0 ? site : {}, incrementOptions("extend", opts));
   }
   if (site) {
     session.log.debug(`Loaded site config from ${file}`);
@@ -240694,12 +240708,12 @@ async function loadConfig(session, path41, opts) {
 async function resolveToAbsolute(session, basePath, relativePath, opts) {
   let message;
   if ((opts === null || opts === void 0 ? void 0 : opts.allowRemote) && isUrl(relativePath)) {
-    const cacheFilename = `config-item-${computeHash(relativePath)}${(0, import_node_path8.extname)(relativePath)}`;
+    const cacheFilename = `config-item-${computeHash(relativePath)}${(0, import_node_path8.extname)(new URL(relativePath).pathname)}`;
     if (!loadFromCache(session, cacheFilename, { maxAge: 30 })) {
       try {
         const resp = await session.fetch(relativePath);
         if (resp.ok) {
-          writeToCache(session, cacheFilename, await resp.text());
+          writeToCache(session, cacheFilename, Buffer.from(await resp.arrayBuffer()));
         } else {
           message = `Bad response from config URL: ${relativePath}`;
         }
@@ -287772,7 +287786,7 @@ var import_node_path16 = __toESM(require("path"), 1);
 var import_nbtx = __toESM(require_cjs2(), 1);
 
 // ../myst-cli/dist/version.js
-var version2 = "1.2.7";
+var version2 = "1.2.8";
 var version_default2 = version2;
 
 // ../myst-cli/dist/utils/headers.js
@@ -297841,6 +297855,8 @@ function validateFile(session, input3, opts) {
   const filename = validateString(input3, opts);
   if (!filename)
     return;
+  if (opts.allowRemote && isUrl(filename))
+    return filename;
   let resolvedFile;
   if (opts.file) {
     resolvedFile = import_node_path23.default.resolve(import_node_path23.default.dirname(opts.file), filename);
@@ -299021,7 +299037,7 @@ async function resolveTemplateFileOptions(session, mystTemplate, options) {
   await Promise.all(((_a6 = mystTemplate.getValidatedTemplateYml().options) !== null && _a6 !== void 0 ? _a6 : []).map(async (option3) => {
     if (option3.type === TemplateOptionType.file && options[option3.id]) {
       const configPath = selectors_exports.selectCurrentSitePath(session.store.getState());
-      const absPath = configPath ? await resolveToAbsolute(session, configPath, options[option3.id]) : options[option3.id];
+      const absPath = configPath ? await resolveToAbsolute(session, configPath, options[option3.id], { allowRemote: true }) : options[option3.id];
       const fileHash = hashAndCopyStaticFile(session, absPath, session.publicPath(), (m2) => {
         addWarningForFile(session, options[option3.id], m2, "error", {
           ruleId: RuleId.templateFileCopied
@@ -299117,7 +299133,7 @@ async function getSiteManifest(session, opts) {
   const actions = (_c = siteConfig.actions) === null || _c === void 0 ? void 0 : _c.map((action) => resolveSiteAction(session, action, siteConfigFile, "actions")).filter((action) => !!action);
   const siteFrontmatter = filterKeys(siteConfig, SITE_FRONTMATTER_KEYS);
   const mystTemplate = await getMystTemplate(session, opts);
-  const validatedOptions = mystTemplate.validateOptions((_d2 = siteFrontmatter.options) !== null && _d2 !== void 0 ? _d2 : {}, siteConfigFile);
+  const validatedOptions = mystTemplate.validateOptions((_d2 = siteFrontmatter.options) !== null && _d2 !== void 0 ? _d2 : {}, siteConfigFile, { allowRemote: true });
   const validatedFrontmatter = mystTemplate.validateDoc(siteFrontmatter, validatedOptions, void 0, siteConfigFile);
   const resolvedOptions = await resolveTemplateFileOptions(session, mystTemplate, validatedOptions);
   validatedFrontmatter.options = resolvedOptions;
@@ -314506,6 +314522,7 @@ function get_baseurl(session) {
   return baseurl;
 }
 async function buildHtml(session, opts) {
+  var _a6;
   const template = await getMystTemplate(session, opts);
   const baseurl = get_baseurl(session);
   const htmlDir = import_node_path54.default.join(session.buildPath(), "html");
@@ -314531,7 +314548,12 @@ async function buildHtml(session, opts) {
   import_fs_extra.default.copySync(session.publicPath(), import_node_path54.default.join(htmlDir, "build"));
   import_fs_extra.default.copySync(import_node_path54.default.join(session.sitePath(), "config.json"), import_node_path54.default.join(htmlDir, "config.json"));
   import_fs_extra.default.copySync(import_node_path54.default.join(session.sitePath(), "objects.inv"), import_node_path54.default.join(htmlDir, "objects.inv"));
-  import_fs_extra.default.copySync(import_node_path54.default.join(session.sitePath(), "myst.xref.json"), import_node_path54.default.join(htmlDir, "myst.xref.json"));
+  const xrefs = JSON.parse(import_fs_extra.default.readFileSync(import_node_path54.default.join(session.sitePath(), "myst.xref.json")).toString());
+  (_a6 = xrefs.references) === null || _a6 === void 0 ? void 0 : _a6.forEach((ref) => {
+    var _a7;
+    ref.data = (_a7 = ref.data) === null || _a7 === void 0 ? void 0 : _a7.replace(/^\/content/, "");
+  });
+  import_fs_extra.default.writeFileSync(import_node_path54.default.join(htmlDir, "myst.xref.json"), JSON.stringify(xrefs));
   rewriteAssetsFolder(htmlDir, baseurl);
   process.exit(0);
 }