fix: 修复嵌套逻辑时的根路径问题

MicroAppJS · Oct 29, 2021 · cb62f8e · cb62f8e
1 parent 5617c7f
commit cb62f8e
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 6 deletions.
diff --git a/theme/plugins/markdown/markdown-it-include.js b/theme/plugins/markdown/markdown-it-include.js
@@ -29,13 +29,15 @@ const include_plugin = (md, options) => {
     };
   }
 
-  const _replaceIncludeByContent = (src, rootdir, parentFilePath, filesProcessed) => {
+  const _replaceIncludeByContent = (src, rootdir, state, parentFilePath, filesProcessed) => {
     filesProcessed = filesProcessed ? filesProcessed.slice() : []; // making a copy
     let cap, filePath, mdSrc, errorMessage, regionName;
 
     // store parent file path to check circular references
     if (parentFilePath) {
       filesProcessed.push(parentFilePath);
+      // fixed 嵌套引用记录
+      state.env.parentRootFilePaths = filesProcessed;
     }
     while ((cap = options.includeRe.exec(src))) {
       let includePath = cap[1].trim();
@@ -81,7 +83,7 @@ const include_plugin = (md, options) => {
         // get content of child file
         mdSrc = fs.readFileSync(filePath, 'utf8');
         // check if child file also has includes
-        mdSrc = _replaceIncludeByContent(mdSrc, path.dirname(filePath), filePath, filesProcessed);
+        mdSrc = _replaceIncludeByContent(mdSrc, path.dirname(filePath), state, filePath, filesProcessed);
 
         if (regionName) {
           const lines = mdSrc.split(/\r?\n/)
@@ -117,7 +119,7 @@ const include_plugin = (md, options) => {
 
   const _includeFileParts = (state, startLine, endLine/*, silent*/) => {
     const root = options.getRootDir(options, state, startLine, endLine);
-    state.src = _replaceIncludeByContent(state.src, root);
+    state.src = _replaceIncludeByContent(state.src, root, state);
   };
 
   md.core.ruler.before('normalize', 'include', _includeFileParts);

diff --git a/theme/plugins/markdown/snippet/index.js b/theme/plugins/markdown/snippet/index.js
@@ -91,9 +91,28 @@ module.exports = function snippet (md, options = {}) {
 
     const token = state.push('fence', 'code', 0)
     token.info = extension + meta
-    token.src = ($relativePath 
-      ? path.resolve(root, path.dirname($relativePath), _filename)  // 相对路径
-      : path.resolve(root, _filename)) + region
+
+    if ($relativePath) {
+      const _parentRootFilePaths = [].concat(state.env.parentRootFilePaths);
+      let _p;
+      let _currParentRootFilePath = _parentRootFilePaths.shift();
+      while(_currParentRootFilePath) {
+        _p = path.resolve(root, path.dirname(_currParentRootFilePath), _filename);
+        if (fs.existsSync(_p)) {
+          break;
+        }
+        _p = null;
+        _currParentRootFilePath = _parentRootFilePaths.shift();
+      }
+      if (!_p) {
+        _p = path.resolve(root, path.dirname($relativePath), _filename);
+      }
+      token.src = _p + region;
+    } else {
+      token.src = path.resolve(root, _filename) + region;
+    }
+
+
     // token.src = path.resolve(root, filename) + region
     token.markup = '```'
     token.map = [startLine, startLine + 1]