main

Author: sharpchen

docs/services/DocumentService.ts

@@ -47,27 +47,21 @@ class DocumentService implements IDocumentService {
   readonly readingDocInfo: DocumentInfo = readingDocMap;
 
   get skillDocParent(): FileSystem.DirectoryInfo {
-    const doc = FileSystem.projectRoot()
-      .getDirectories()
-      .find(x => x.name === 'document');
+    const doc = FileSystem.documentRoot();
     const ret = doc.getDirectories().find(x => x.name === 'Skill');
     if (!ret) throw new Error('Skill Document source not found.');
     return ret;
   }
 
   get readingDocParent(): FileSystem.DirectoryInfo {
-    const doc = FileSystem.projectRoot()
-      .getDirectories()
-      .find(x => x.name === 'document');
+    const doc = FileSystem.documentRoot();
     const ret = doc.getDirectories().find(x => x.name === 'Reading');
     if (!ret) throw new Error('Reading Document source not found.');
     return ret;
   }
 
   get articleDocParent(): FileSystem.DirectoryInfo {
-    const doc = FileSystem.projectRoot()
-      .getDirectories()
-      .find(x => x.name === 'document');
+    const doc = FileSystem.documentRoot();
     const ret = doc.getDirectories().find(x => x.name === 'Articles');
     if (!ret) throw new Error('Articles Document source not found.');
     return ret;
@@ -93,9 +87,9 @@ class DocumentService implements IDocumentService {
 
     let src: FileSystem.DirectoryInfo;
 
-    if (Object.keys(skillDocMap).includes(name)) {
+    if (Object.prototype.hasOwnProperty.call(skillDocMap, name)) {
       src = this.skillDocParent;
-    } else if (Object.keys(readingDocMap).includes(name)) {
+    } else if (Object.prototype.hasOwnProperty.call(readingDocMap, name)) {
       src = this.readingDocParent;
     }
 
@@ -132,14 +126,18 @@ class DocumentService implements IDocumentService {
     const shouldSolveSharpSign = (name: DocumentName) => name.includes('#');
 
     let src: FileSystem.DirectoryInfo;
-    if (Object.keys(skillDocMap).includes(name)) {
+    if (name === 'Articles') src = this.articleDocParent;
+    else if (Object.prototype.hasOwnProperty.call(skillDocMap, name)) {
       src = this.skillDocParent;
-    } else if (Object.keys(readingDocMap).includes(name)) {
+    } else if (Object.prototype.hasOwnProperty.call(readingDocMap, name)) {
       src = this.readingDocParent;
     }
+
     const markdownEntry = this.getMarkdownEntryFolder(name);
-    let linkContext = `document/${src.name}/${name}/`;
+    let linkContext =
+      name === 'Articles' ? `document/${src.name}` : `document/${src.name}/${name}/`;
 
+    // any md presented at first level
     if (markdownEntry.getFiles().length) {
       const file = Enumerable.from(markdownEntry.getFiles())
         .orderBy(x => x.name)

docs/services/SidebarService.ts

@@ -12,15 +12,25 @@ const solveSharpSign = (text: string) => {
 };
 
 class SidebarService implements ISidebarService {
-  private readonly base: string = `/${documentRoot().name}`;
+  private getBase(name: DocumentName): string {
+    if (documentService.skillDocInfo.hasOwnProperty(name) && name !== 'Articles') {
+      return `/${documentRoot().name}/Skill`;
+    }
+    if (documentService.readingDocInfo.hasOwnProperty(name)) {
+      return `/${documentRoot().name}/Reading`;
+    }
+    return `/${documentRoot().name}`;
+  }
   readonly documentService: IDocumentService = documentService;
   getMultipleSidebar(): DefaultTheme.SidebarMulti {
     const sidebar: DefaultTheme.SidebarMulti = {};
     for (const name of Object.keys(documentService.skillDocInfo)) {
-      sidebar[`${this.base}/Skill/${name}/docs/`] = this.getSidebarOfDocument(name as DocumentName);
+      sidebar[`${this.getBase(name as DocumentName)}/${name}/docs/`] = this.getSidebarOfDocument(
+        name as DocumentName,
+      );
     }
     for (const name of Object.keys(documentService.readingDocInfo)) {
-      sidebar[`${this.base}/Reading/${name}/docs/`] = this.getSidebarOfDocument(
+      sidebar[`${this.getBase(name as DocumentName)}/${name}/docs/`] = this.getSidebarOfDocument(
         name as DocumentName,
       );
     }
@@ -33,10 +43,11 @@ class SidebarService implements ISidebarService {
         text: solveSharpSign(name),
         items:
           name === 'Articles'
-            ? this.transformFolderToSidebarItem(markdownEntry, `${this.base}/${name}`).sort(
-                (a, b) => gitTrackedDate(a.link!) - gitTrackedDate(b.link!),
-              )
-            : this.transformFolderToSidebarItem(markdownEntry, `${this.base}/${name}`),
+            ? this.transformFolderToSidebarItem(
+                markdownEntry,
+                `${this.getBase(name)}/${name}`,
+              ).sort((a, b) => gitTrackedDate(a.link!) - gitTrackedDate(b.link!))
+            : this.transformFolderToSidebarItem(markdownEntry, `${this.getBase(name)}/${name}`),
       },
     ];
     function gitTrackedDate(file: string): number {

docs/shared/FileSystem.ts

@@ -124,5 +124,5 @@ export function projectRoot(): DirectoryInfo {
 export function documentRoot(): DirectoryInfo {
   return projectRoot()
     .getDirectories()
-    .filter(x => x.name === 'document')[0];
+    .find(x => x.name === 'document');
 }