fix: #147

Author: MuYunyun

docs/更新日志.md

@@ -2,9 +2,17 @@
 
 `create-react-doc` 严格遵循 [Semantic Versioning 2.0.0](http://semver.org/lang/zh-CN/) 语义化版本规范。
 
+### 1.3.3
+
+`2021-06-24`
+
+- **Fix**
+
+  - 🐞 修复编译预渲染时, 缺少多层级目录文件生成的问题。[issue](https://github.com/MuYunyun/create-react-doc/issues/147)。
+
 ### 1.3.0
 
-`2020-06-09`
+`2021-06-09`
 
 - **Feature**
 

packages/scripts/src/conf/getPrerenderRoutes.js

@@ -1,12 +1,9 @@
-const fs = require('fs')
-const { getDocsConfig } = require('crd-utils')
 const DirectoryTree = require('./node-directory-tree')
 
 // eg: ['docs/quick_start.md', 'a']
 // output: ['/quick_start', '/a/b', '/a/b/c']
 const getPrerenderRoutes = (cmd) => {
   const dir = cmd.markdownPaths
-  console.log('dir123', dir)
   const dirs = Array.isArray(dir) ? dir : [dir]
   const otherProps = {
     mdconf: true,
@@ -17,41 +14,32 @@ const getPrerenderRoutes = (cmd) => {
     path,
     options: otherProps,
   }))
-  console.log('dirTree123', dirTree)
-  const docsConfig = getDocsConfig()
-  const menu = docsConfig && Array.isArray(docsConfig.menu)
-    ? docsConfig.menu
-    : []
-  const result = ['/README', '/404']
-  dfs(menu, result, '', true)
-  // console.log('✅ result', result)
+  const result = getPrerenderRoute(dirTree)
+  result.push('/404')
+  // console.log('✅ prerender', result)
   return result
 }
 
-const dfs = (arr, result, prefix, isRoot) => {
-  for (let i = 0; i < arr.length; i++) {
-    const source = `${prefix}${arr[i]}`
-    // console.log('source', source)
-    const stats = fs.statSync(source)
-    const isFile = stats.isFile()
-    const isDirectory = stats.isDirectory()
-
-    if (isDirectory) {
-      const dirArr = fs.readdirSync(source)
-      dfs(dirArr, result, `${source}/`, false)
-    }
+function getPrerenderRoute(data) {
+  const arr = []
+  return recursive(data, '', arr)
+}
 
-    if (isFile && arr[i].indexOf('.md') > -1) {
-      if (isRoot) {
-        // eg: 'a/b.md'
-        const splitArr = arr[i].split('/')
-        const lastSplitValue = splitArr[splitArr.length - 1]
-        result.push(`/${lastSplitValue.split('.md')[0]}`)
+function recursive(data, routePath, arr) {
+  data.forEach((item) => {
+    const routePropsCurrent = `${routePath}/${item.name}`.replace(/.md$/, '')
+    if (item.type === 'directory') {
+      if (item.children && item.children.length > 0) {
+        // eslint-disable-next-line no-unused-vars
+        item.children = recursive(item.children, routePropsCurrent, arr)
       } else {
-        result.push(`/${prefix}${arr[i].split('.md')[0]}`)
+        item.children = []
       }
+    } else if (item.type === 'file') {
+      arr.push(routePropsCurrent)
     }
-  }
+  })
+  return arr
 }
 
 module.exports = getPrerenderRoutes

packages/scripts/src/conf/node-directory-tree.js

@@ -52,7 +52,10 @@ function directoryTree({
   options,
 }) {
   const name = PATH.basename(path)
-  const item = { path, name }
+  const item = { name }
+  if (!options.prerender) {
+    item.path = path
+  }
   let stats
   try {
     stats = fs.statSync(path)
@@ -69,9 +72,10 @@ function directoryTree({
     // Skip if it does not match the extension regex
     if (options && options.extensions && !options.extensions.test(ext)) { return null }
 
-    if (options && options.mdconf && !options.prerender) {
+    if (options && options.mdconf) {
+      item.type = constants.FILE
       const contentStr = fs.readFileSync(path).toString()
-      if (contentStr) {
+      if (contentStr && !options.prerender) {
         const contentMatch = contentStr.match(/^<!--(\s?[^>]*)-->/)
         item.relative = item.path.replace(process.cwd(), '')
         item.mdconf = contentMatch ? YAML.parse(contentMatch[1]) : {}
@@ -97,11 +101,9 @@ function directoryTree({
           // eslint-disable-next-line no-console
           console.log(`error: ${error.message}`)
         }
+        item.size = stats.size // File size in bytes
+        item.extension = ext
       }
-
-      item.size = stats.size // File size in bytes
-      item.extension = ext
-      item.type = constants.FILE
     }
   } else if (stats.isDirectory()) {
     const dirData = safeReadDirSync(path)
@@ -115,9 +117,9 @@ function directoryTree({
         }),
       )
       .filter(e => !!e)
+    item.type = constants.DIRECTORY
     if (!options.prerender) {
       item.size = item.children.reduce((prev, cur) => prev + cur.size, 0)
-      item.type = constants.DIRECTORY
     }
   } else {
     return null // Or set item.size = 0 for devices, FIFO and sockets ?

packages/scripts/src/conf/rawTreeReplaceLoader.js

@@ -56,29 +56,23 @@ module.exports = function (source) {
   let content = typeof source === 'string' ? JSON.parse(source) : source
   // It's said loader resuls are flagged as cacheable. See https://webpack.js.org/api/loaders/#thiscacheable.
   // if (this.cacheable) this.cacheable()
-  // Todo: https://webpack.js.org/api/loaders/#pitching-loader
   if (directoryTrees && (!include || include.test(this.resourcePath))) {
     const dirs = Array.isArray(dir) ? dir : [dir]
-    // todo: white some logic about route relative in getRelativePath
     const dirTree = dirs.map(path => DirectoryTree({
       path,
       options: otherProps,
     }))
-    // if (Array.isArray(dirTree)) {
-    //   console.log('dirTree', dirTree[3] && dirTree[3].children)
-    // }
-    // content = dirTree
 
     const filemd = getAllWatchPath(dirTree)
     filemd.forEach((fileItem) => {
       this.addDependency(fileItem)
     })
+    // replace full file path with relative path
     content = getRelativePath(
       dirTree,
       relativePath,
       dirs,
     )
-    // console.log('content', content)
   }
   content = JSON.stringify(content)
     .replace(/\u2028/g, '\\u2028')