Rollback on getTitle

Author: gnu4cn

electron/db.sqlite-journal

@@ -25,14 +25,9 @@ export function getTitle(): Transformer {
     return (tree: Root, file: VFile) => {
         file.data = file.data || {};
         return visit(tree, 'heading', (node: Heading) => {
-            let title: string;
-
-            for (let i=1; !title && node.depth === i; i++){
-                title = toString(node);
+            if (node.depth === 1 && !file.data.title) {
+                file.data.title = toString(node);
             }
-
-            file.data.title = title;
-
             return true;
         });
     };

src/app/book/gbr-preset/plugins/frontmatter.ts

@@ -99,12 +99,13 @@ export class TOCPaginationComponent implements OnInit, OnChanges {
 
         const p = paths.map(async path => {
             const _vfile = await this.fetch(path);
-            await this.markdownService.process(_vfile);
+            await this.markdownService.processTOCPagination(_vfile);
             return _vfile;
         });
 
         return Promise.all(p).then(files => {
             this.files = files.reduce((acc: Array<FileIndexItem>, _: VFile): Array<FileIndexItem> => {
+                console.log(_);
                 const path = getBasePath(_);
                 let link: string | string[] = this.locationService.prepareLink(path, this.routerService.root);
 

src/app/book/markdown-elements/toc-pagination.component.ts

@@ -91,6 +91,12 @@ export class MarkdownService {
             .use(rehypeStringify);
     }
 
+    @lazyInitialize
+    private get tocPaginationProcessor() {
+        return remark()
+            .use(getTitle)
+    }
+
     @lazyInitialize
     private get linksProcessor() {
         return remark()
@@ -219,6 +225,12 @@ export class MarkdownService {
         return err || file;
     }
 
+    async processTOCPagination(doc: VFileCompatible) {
+        const file = VFile(doc) as VFile;
+        const err = await this.tocPaginationProcessor.process(file) as VFile;
+        return err || file;
+    }
+
     /**
      * Get Sections
      */
@@ -258,7 +270,7 @@ export class MarkdownService {
                             /^\//.test(__.url.split('#')[0]) 
                             ? __.url.split('#')[0] 
                             : `/${__.url.split('#')[0]}`
-                        )) < 0) 
+                        )) < 0)
                         ? [...acc, decodeURI(/^\//.test(__.url.split('#')[0]) ? __.url.split('#')[0] : `/${__.url.split('#')[0]}`)] 
                         : acc;
                     }, []) as Array<string>;
@@ -269,7 +281,6 @@ export class MarkdownService {
 
     loadSummary = async (summary: string) => {
         const _vfile = this.locationService.pageToFile(summary);
-
         const fullPath = await this.fetchService.find(_vfile.cwd, _vfile.path);
 
         const pathsFromBackend: Array<string> = await this.loadSummaryFromBackend();

src/app/book/markdown/markdown.service.ts

@@ -72,7 +72,7 @@ export class SearchService {
                 ).toPromise();
         });
 
-        return Promise.all(promises).then(files => {
+        Promise.all(promises).then(files => {
             this.searchIndex = files.reduce((acc: Array<any>, f: VFile): Array<any> => {
                 // 这里这句代码要命，很容易写错..., 少写三个点就完全不一样了的 :)
                 //return f ? [...acc, f.data.tocSearch] : acc;