Complete correctHeadings, now trying to figure out why saveBook cause display problem.

Author: gnu4cn

src/app/book/markdown-elements/summary.ts

@@ -49,7 +49,9 @@ export class SummaryComponent implements OnInit {
 
         return Promise.all(promises).then(files => {
             const _html = (files.reduce((acc: string, f: VFile): string => {
-                return f && !f.notFound ? acc.concat(f.contents as string) : acc;
+                return f && !f.notFound 
+                    ? acc.concat(f.contents as string) 
+                    : acc;
             }, '') as string);
 
             this.html = this.sanitizer.bypassSecurityTrustHtml(_html);

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

@@ -119,7 +119,9 @@ export class TOCPaginationComponent implements OnInit, OnChanges {
                     link,
                 };
 
-                return _ && !_.data.gbr.notFound ? [...acc, fileIndexItem] : acc;
+                return _ && !_.data.gbr.notFound && _.contents 
+                    ? [...acc, fileIndexItem] 
+                    : acc;
 
             }, []) as Array<FileIndexItem>;
         });

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

@@ -23,7 +23,7 @@ import toString from 'mdast-util-to-string';
 import strip from 'remark-strip-html';
 import sectionize from 'remark-sectionize';
 
-import { getTitle } from '../../gbr-preset';
+import { getTitle, correctHeadings } from '../../gbr-preset';
 import { tocPlugin } from '../plugins/toc';
 import { removeNodesPlugin } from '../plugins/remove';
 import { sectionPlugin } from '../plugins/sections';
@@ -80,6 +80,7 @@ export class MarkdownService {
     private get tocProcessor() {
         return remark()
             .use(frontmatter)
+            .use(correctHeadings)
             .use(getTitle)
             .use(slug)
             .use(removeNodesPlugin)
@@ -95,6 +96,7 @@ export class MarkdownService {
     @lazyInitialize
     private get tocPaginationProcessor() {
         return remark()
+            .use(correctHeadings)
             .use(getTitle)
     }
 

src/app/gbr-preset/index.ts

@@ -10,7 +10,7 @@ import reporter from 'vfile-reporter';
 import sectionize from 'remark-sectionize';
 import externalLinks from 'remark-external-links';
 
-import { readMatter, getTitle } from './plugins/frontmatter';
+import { readMatter, getTitle, correctHeadings } from './plugins/frontmatter';
 import { infoString, infoStringToAttr } from './plugins/misc';
 import { prism } from './plugins/prism';
 import { mermaid } from './plugins/mermaid';
@@ -20,7 +20,7 @@ import { Root } from 'mdast';
 import { VFile } from 'vfile';
 import { Transformer } from 'unified';
 
-export { prism, mermaid, reporter, getTitle };
+export { prism, mermaid, reporter, getTitle, correctHeadings };
 
 export function moveIds(): Transformer {
     return (tree: Root, file: VFile) => {
@@ -41,6 +41,7 @@ export const plugins = [
     gfm,
     parseFrontmatter,
     readMatter,
+    correctHeadings,
     getTitle,
     infoString,
     slug,

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

@@ -29,7 +29,7 @@ export function getTitle(): Transformer {
         {
             const heading: Heading = {
                 type: 'heading',
-                depth: 1,
+                depth: 2,
                 children: [{type: 'text', value: '未知标题'}]
             };
 
@@ -49,8 +49,8 @@ export function getTitle(): Transformer {
 export function correctHeadings(): Transformer {
     return (tree: Root, file: VFile) => {
         return visit(tree, 'paragraph', (node: Paragraph, index: number, parent: any) => {
-
             const text: string = node.children[0].value as string;
+
             let re = new RegExp(/^(\#){1,3}/);
             if(re.test(text)){
                 const hashes = text.match(/(\#){1,3}/)[0];