fix(docs): async md load

angular.json

@@ -195,6 +195,7 @@
             "tsConfig": "docs/tsconfig.app.json",
             "polyfills": "docs/polyfills.ts",
             "assets": [
+              "docs/articles",
               "docs/assets",
               "docs/404.html",
               "docs/favicon.png",

docs/app/@theme/components/page-toc/page-toc.component.ts

@@ -13,7 +13,7 @@ import {
 } from '@angular/core';
 import { takeWhile,  map } from 'rxjs/operators';
 import { ActivatedRoute } from '@angular/router';
-import { of as observableOf,  combineLatest } from 'rxjs';
+import { combineLatest, Observable } from 'rxjs';
 
 @Component({
   selector: 'ngx-page-toc',
@@ -35,11 +35,11 @@ export class NgxPageTocComponent implements OnDestroy {
   items: any[];
 
   @Input()
-  set toc(value) {
+  set toc(value: Observable<any[]>) {
-    combineLatest(
+    combineLatest([
-      observableOf(value || []),
+      value,
       this.activatedRoute.fragment,
-    )
+    ])
       .pipe(
         takeWhile(() => this.alive),
         map(([toc, fragment]) => {

docs/app/@theme/services/article.service.ts

@@ -0,0 +1,13 @@
+import { Injectable } from '@angular/core';
+import { HttpClient } from '@angular/common/http';
+import { Observable } from 'rxjs';
+
+@Injectable()
+export class NgxArticleService {
+
+  constructor(private http: HttpClient) { }
+
+  getArticle(source: string): Observable<string> {
+    return this.http.get(`articles/${source}`, { responseType: 'text' });
+  }
+}

docs/app/@theme/services/index.ts

@@ -18,6 +18,7 @@ import { NgxCodeLoaderService } from './code-loader.service';
 import { NgxStylesService } from './styles.service';
 import { NgxIframeCommunicatorService } from './iframe-communicator.service';
 import { NgxVisibilityService } from './visibility.service';
+import { NgxArticleService } from './article.service';
 
 
 export const ngxLandingServices = [
@@ -35,4 +36,5 @@ export const ngxLandingServices = [
   NgxStylesService,
   NgxIframeCommunicatorService,
   NgxVisibilityService,
+  NgxArticleService,
 ];

docs/app/@theme/services/structure.service.ts

@@ -5,10 +5,13 @@
  */
 
 import { Inject, Injectable } from '@angular/core';
+import { map } from 'rxjs/operators';
+import { combineLatest, Observable, of } from 'rxjs';
 
 import { NgxTabbedService } from './tabbed.service';
 import { NgxTextService } from './text.service';
 import { DOCS, STRUCTURE } from '../../app.options';
+import { NgxArticleService } from './article.service';
 
 @Injectable()
 export class NgxStructureService {
@@ -17,6 +20,7 @@ export class NgxStructureService {
 
   constructor(private textService: NgxTextService,
               private tabbedService: NgxTabbedService,
+              private articleService: NgxArticleService,
               @Inject(STRUCTURE) structure,
               @Inject(DOCS) docs) {
     this.prepared = this.prepareStructure(structure, docs);
@@ -56,8 +60,9 @@ export class NgxStructureService {
       }
 
       if (item.block === 'markdown') {
-        item.children = this.textService.mdToSectionsHTML(
+        item.sections = this.articleService.getArticle(item.source).pipe(
-          require(`raw-loader!../../../articles/${item.source}`).default);
+          map((article) => this.textService.mdToSectionsHTML(article)),
+        );
       }
 
       if (item.children) {
@@ -113,39 +118,43 @@ export class NgxStructureService {
     };
   }
 
-  protected prepareToc(item: any) {
+  protected prepareToc(item: any): Observable<any[]> {
-    return item.children.reduce((acc: any[], child: any) => {
+    const tocList = item.children.reduce((acc: Observable<any>[], child: any) => {
       if (child.block === 'markdown') {
-        return acc.concat(this.getTocForMd(child));
+        return [...acc, this.getTocForMd(child)];
-      } else if (child.block === 'tabbed') {
+      }
-        return acc.concat(this.getTocForTabbed(child));
+      if (child.block === 'tabbed') {
-      } else if (child.block === 'component') {
+        return [...acc, this.getTocForTabbed(child)];
-        acc.push(this.getTocForComponent(child));
+      }
+      if (child.block === 'component') {
+        return [...acc, this.getTocForComponent(child)];
       }
       return acc;
     }, []);
+
+    return combineLatest([...tocList]).pipe(map((toc) => [].concat(...toc)));
   }
 
-  protected getTocForMd(block: any) {
+  protected getTocForMd(block: any): Observable<any[]> {
-    return block.children.map((section: any) => ({
+    return (block.sections as Observable<any[]>).pipe(
-        title: section.title,
+      map((item) => item.map((val) => ({
-        fragment: section.fragment,
+        title: val.title,
-      }
+        fragment: val.fragment,
-    ));
+      }))),
+    );
   }
 
-  protected getTocForComponent(block: any) {
+  protected getTocForComponent(block: any): Observable<any[]> {
-    return {
+    return of([{
       title: block.source.name,
       fragment: block.source.slag,
-    };
+    }]);
   }
 
-  protected getTocForTabbed(block: any) {
+  protected getTocForTabbed(block: any): Observable<any[]> {
-    return block.children.map((component: any) => ({
+    return of(block.children.map((component: any) => ({
       title: component.name,
       fragment: this.textService.createSlag(component.name),
-      }
+    })));
-    ));
   }
 }

docs/app/blocks/components/md-block/md-block.component.ts

@@ -5,19 +5,34 @@
  */
 
 import { ChangeDetectionStrategy, Component, Input } from '@angular/core';
+import { DomSanitizer, SafeHtml } from '@angular/platform-browser';
 
 @Component({
   selector: 'ngx-md-block',
   template: `
-    <nb-card *ngFor="let section of source;" [ngxFragment]="section.fragment">
+    <nb-card *ngFor="let section of content;" [ngxFragment]="section.fragment">
       <nb-card-body>
-        <div [innerHtml]="section.html"></div>
+        <div [innerHtml]="getTemplate(section.html)"></div>
       </nb-card-body>
     </nb-card>
   `,
   changeDetection: ChangeDetectionStrategy.OnPush,
 })
 export class NgxMdBLockComponent {
+  @Input() content: MdChildren[] = [];
 
-  @Input() source: string;
+  constructor(private readonly domSanitizer: DomSanitizer) {
+  }
+
+  // TODO: create NbDOMPurifyPipe
+  getTemplate(content: string): SafeHtml {
+    return this.domSanitizer.bypassSecurityTrustHtml(content);
+  }
+}
+
+interface MdChildren {
+  fragment: string;
+  html: string;
+  source: string;
+  title: string;
 }

docs/app/pages/docs/page/ngx-admin-landing-page.component.html

@@ -11,7 +11,7 @@
 
   <ng-container *ngFor="let block of currentItem?.children">
     <ng-container [ngSwitch]="block.block">
-      <ngx-md-block *ngSwitchCase="'markdown'" [source]="block.children"></ngx-md-block>
+      <ngx-md-block *ngSwitchCase="'markdown'" [content]="block.sections | async"></ngx-md-block>
       <ngx-component-block *ngSwitchCase="'component'" [source]="block.source"></ngx-component-block>
       <ngx-tabbed-block *ngSwitchCase="'tabbed'" [source]="block.children" [tabs]="currentItem.tabs"></ngx-tabbed-block>
       <ngx-theme-block *ngSwitchCase="'theme'" [block]="block"></ngx-theme-block>