working on correctHeadings

Author: gnu4cn

src/app/book/book.module.ts

@@ -28,7 +28,7 @@ import { ElementInputDirective } from './directives/element-input.directive';
 
 import { createCustomElement } from '@angular/elements';
 
-import { preset } from './gbr-preset/index';
+import { preset } from '../gbr-preset';
 // import { DocspaStackblitzModule } from '@swimlane/docspa-stackblitz';
 // import * as squeezeParagraphs from 'remark-squeeze-paragraphs';
 

src/app/book/markdown-elements/md-link.ts

@@ -24,23 +24,17 @@ import { RouterService } from '../services/router.service';
 export class MdLinkComponent implements OnChanges, AfterContentInit {
     static readonly is = 'md-link';
 
-    @Input()
-    link: string;
+    @Input() link: string;
 
-    @Input('aria-hidden')
-    ariaHidden: any;
+    @Input('aria-hidden') ariaHidden: any;
 
-    @Input()
-    download: boolean;
+    @Input() download: boolean;
 
-    @Input()
-    klass: boolean;
+    @Input() klass: boolean;
 
-    @Input()
-    routerLink: string | string[];
+    @Input() routerLink: string | string[];
 
-    @Input()
-    fragment: string;
+    @Input() fragment: string;
 
     @ViewChild(TemplateRef, { static: true }) private template: TemplateRef<void>;
 
@@ -53,6 +47,7 @@ export class MdLinkComponent implements OnChanges, AfterContentInit {
     get rootPath () {
         return this.routerService.root;
     }
+
     ngAfterContentInit() {
         // Moving link outside of component
         this.vcRef.createEmbeddedView(this.template);

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

@@ -14,6 +14,7 @@ import unified from 'unified';
 import remark from 'remark';
 import remark2rehype from 'remark-rehype';
 import rehypeStringify from 'rehype-stringify';
+import gfm from 'remark-gfm';
 import raw from 'rehype-raw';
 import frontmatter from 'remark-frontmatter';
 import slug from 'remark-slug';
@@ -22,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/index';
+import { getTitle } from '../../gbr-preset';
 import { tocPlugin } from '../plugins/toc';
 import { removeNodesPlugin } from '../plugins/remove';
 import { sectionPlugin } from '../plugins/sections';

src/app/book/services/search.service.ts

@@ -12,7 +12,7 @@ import slug from 'remark-slug';
 import { links, images } from '../shared/links';
 import frontmatter from 'remark-frontmatter';
 
-import { getTitle } from '../gbr-preset/index';
+import { getTitle } from '../../gbr-preset';
 import { FetchService } from './fetch.service';
 import { LocationService } from './location.service';
 import { MarkdownService } from '../markdown/markdown.service';

src/app/book/shared/links.ts

@@ -47,7 +47,7 @@ export const links = (settings: { locationService: LocationService }): Transform
                 let [routerLink = '', fragment] = node.url.split('#');
                 fragment = fragment ? fragment.replace(/^#/, '') : undefined;
 
-                node.data.hProperties.link = routerLink;
+                node.data.hProperties.link = routerLink.replace(/\/$/, '');
                 node.data.hProperties.fragment = fragment;
                 node.data.hProperties.source = vfile.history[0];
                 node.data.hProperties.klass = node.data.hProperties.class;

src/app/book/gbr-preset/index.ts src/app/gbr-preset/index.tssrc/app/book/gbr-preset/index.ts renamed to src/app/gbr-preset/index.ts

@@ -1,6 +1,6 @@
 import visit from 'unist-util-visit';
 import toString from 'mdast-util-to-string';
-import { Root, Heading } from 'mdast';
+import { Root, Heading, Paragraph } from 'mdast';
 import { VFile as _VFile } from 'vfile';
 import { Transformer, Attacher, Settings } from 'unified';
 
@@ -23,7 +23,10 @@ export function readMatter(): Transformer {
 
 export function getTitle(): Transformer {
     return (tree: Root, file: VFile) => {
-        if(tree.children.findIndex(_ => _.type === 'heading') < 0 && !(/^\_/.test(file.basename))){
+        if(tree.children.findIndex(_ => _.type === 'heading') < 0 
+            && !(/^\_/.test(file.basename)) 
+            && tree.children.length > 0)
+        {
             const heading: Heading = {
                 type: 'heading',
                 depth: 1,
@@ -42,3 +45,26 @@ 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];
+                const _text = text.replace(hashes, '');
+
+                const heading: Heading = {
+                    type: 'heading',
+                    depth: hashes.length as 2 | 1 | 3 | 4 | 5 | 6,
+                    children: [{type: 'text', value: _text}]
+                };
+
+                parent.children.splice(index, 1, heading);
+            }
+
+        });
+    };
+}