@atjson/renderer-commonmark - npm Package Compare versions

Comparing version 0.7.5 to 0.7.9

dist/commonjs/index.d.ts

@@ -1,38 +0,24 @@
-import Renderer, { State } from '@atjson/renderer-hir';
+import Document from '@atjson/document';
+import { HIRNode } from '@atjson/hir';
+import { State } from '@atjson/renderer-hir';
 export declare function split(): IterableIterator<string>;
 export declare type CodeStyle = 'block' | 'inline' | 'fence';
-export default class CommonmarkRenderer extends Renderer {
-    renderText(text: string, state: State): string;
-    'root'(): IterableIterator<string>;
-    'bold'(): IterableIterator<string>;
-    'quotation'(_: any, state: State): IterableIterator<string>;
-    'heading'(props: {
-        level: number;
-    }): IterableIterator<string>;
+export default class CommonmarkRenderer {
+    state: any;
+    constructor();
+    text(text: string): string;
+    'bold'(node: HIRNode): IterableIterator<string>;
+    'blockquote'(): IterableIterator<string>;
+    'heading'(node: HIRNode): IterableIterator<string>;
     'horizontal-rule'(): IterableIterator<string>;
-    'image'(props: {
-        description: string;
-        title?: string;
-        url: string;
-    }): IterableIterator<string>;
-    'italic'(_: any, state: State): IterableIterator<string>;
+    'image'(node: HIRNode): IterableIterator<string>;
+    'italic'(node: HIRNode): IterableIterator<string>;
     'line-break'(): IterableIterator<string>;
-    'link'(props: {
-        url: string;
-        title?: string;
-    }): IterableIterator<string>;
-    'code'(props: {
-        style: CodeStyle;
-        info?: string;
-    }, state: State): IterableIterator<string>;
-    'html'(props: {
-        type: string;
-    }, state: State): IterableIterator<string>;
-    'list-item'(_: any, state: State): IterableIterator<string>;
-    'list'(props: {
-        type: string;
-        startsAt?: number;
-        tight: boolean;
-    }, state: State): IterableIterator<string>;
-    'paragraph'(_: any, state: State): IterableIterator<string>;
+    'link'(node: HIRNode): IterableIterator<string>;
+    'code'(node: HIRNode): IterableIterator<string>;
+    'html'(node: HIRNode): IterableIterator<string>;
+    'list-item'(node: HIRNode, state: State): IterableIterator<string>;
+    'list'(node: HIRNode): IterableIterator<string>;
+    'paragraph'(): IterableIterator<string>;
+    render(document: Document): string;
 }

dist/commonjs/index.js

 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const renderer_hir_1 = require("@atjson/renderer-hir");
+const hir_1 = require("@atjson/hir");
 function* split() {
-    let rawText = yield;
-    let text = rawText.join('');
+    let text = yield;
     let start = 0;
@@ -52,5 +51,46 @@ let end = text.length;
 }
-class CommonmarkRenderer extends renderer_hir_1.default {
-    renderText(text, state) {
-        if (state.get('isPreformatted')) {
+function render(renderer, node, parent, index) {
+    if (index > 0) {
+        node.previous = parent.children[index - 1];
+    }
+    else {
+        node.previous = null;
+    }
+    if (parent && index < parent.children.length) {
+        node.next = parent.children[index + 1];
+    }
+    else {
+        node.next = null;
+    }
+    node.parent = parent;
+    node.children = node.children();
+    let generator;
+    if (renderer[node.type]) {
+        generator = renderer[node.type](node, parent);
+        let result = generator.next();
+        if (result.done) {
+            return result.value;
+        }
+    }
+    let fragment = node.children.map((childNode, idx) => {
+        if (childNode.type === 'text' && typeof childNode.text === 'string') {
+            return renderer.text(childNode.text);
+        }
+        else {
+            return render(renderer, childNode, node, idx);
+        }
+    }).join('');
+    if (generator) {
+        return generator.next(fragment).value;
+    }
+    else {
+        return fragment;
+    }
+}
+class CommonmarkRenderer {
+    constructor() {
+        this.state = {};
+    }
+    text(text) {
+        if (this.state.isPreformatted) {
             return text;
@@ -60,13 +100,13 @@ }
     }
-    *'root'() {
-        let document = yield;
-        return document.join('');
-    }
-    *'bold'() {
+    *'bold'(node) {
         let [before, text, after] = yield* split();
+        if (node.parent && !node.previous && !node.next &&
+            node.parent.type === 'italic') {
+            return `${before}__${text}__${after}`;
+        }
         return `${before}**${text}**${after}`;
     }
-    *'quotation'(_, state) {
+    *'blockquote'() {
         let text = yield;
-        let lines = text.join('').split('\n');
+        let lines = text.split('\n');
         let endOfQuote = lines.length;
@@ -79,3 +119,3 @@ let startOfQuote = 0;
         let quote = lines.slice(startOfQuote, endOfQuote).map(line => `> ${line}`).join('\n') + '\n';
-        if (!state.get('tight')) {
+        if (!this.state.tight) {
             quote += '\n';
@@ -85,11 +125,10 @@ }
     }
-    *'heading'(props) {
-        let text = yield;
-        let level = new Array(props.level + 1).join('#');
-        let heading = text.join('');
+    *'heading'(node) {
+        let heading = yield;
+        let level = new Array(node.attributes.level + 1).join('#');
         if (heading.indexOf('\n') !== -1) {
-            if (props.level === 1) {
+            if (node.attributes.level === 1) {
                 return `${heading}\n====\n`;
             }
-            else if (props.level === 2) {
+            else if (node.attributes.level === 2) {
                 return `${heading}\n----\n`;
@@ -103,15 +142,19 @@ }
     }
-    *'image'(props) {
-        if (props.title) {
-            let title = props.title.replace(/"/g, '\\"');
-            return `![${props.description}](${props.url} "${title}")`;
+    *'image'(node) {
+        if (node.attributes.title) {
+            let title = node.attributes.title.replace(/"/g, '\\"');
+            return `![${node.attributes.description}](${node.attributes.url} "${title}")`;
         }
-        return `![${props.description}](${props.url})`;
+        return `![${node.attributes.description}](${node.attributes.url})`;
     }
-    *'italic'(_, state) {
-        let isItalicized = state.get('isItalicized');
-        state.set('isItalicized', true);
+    *'italic'(node) {
+        let state = Object.assign({}, this.state);
+        this.state.isItalicized = true;
         let [before, text, after] = yield* split();
-        state.set('isItalicized', isItalicized);
-        let markup = isItalicized ? '_' : '*';
+        let markup = state.isItalicized ? '_' : '*';
+        if (node.parent && !node.previous && !node.next &&
+            node.parent.type === 'bold') {
+            markup = '_';
+        }
+        this.state = state;
         return `${before}${markup}${text}${markup}${after}`;
@@ -122,7 +165,7 @@ }
     }
-    *'link'(props) {
+    *'link'(node) {
         let [before, text, after] = yield* split();
-        let url = escapeAttribute(props.url);
-        if (props.title) {
-            let title = props.title.replace(/"/g, '\\"');
+        let url = escapeAttribute(node.attributes.url);
+        if (node.attributes.title) {
+            let title = node.attributes.title.replace(/"/g, '\\"');
             return `${before}[${text}](${url} "${title}")${after}`;
@@ -132,12 +175,12 @@ }
     }
-    *'code'(props, state) {
-        state.push({ isPreformatted: true, htmlSafe: false });
-        let text = yield;
-        state.pop();
-        let code = text.join('');
-        if (props.style === 'fence') {
+    *'code'(node) {
+        let state = Object.assign({}, this.state);
+        Object.assign(this.state, { isPreformatted: true, htmlSafe: true });
+        let code = yield;
+        this.state = state;
+        if (node.attributes.style === 'fence') {
             code = '\n' + code;
-            let info = props.info || '';
+            let info = node.attributes.info || '';
             let newlines = '\n';
-            if (state.get('isList') && state.get('nextAnnotation')) {
+            if (this.state.isList && node.next) {
                 newlines += '\n';
@@ -152,3 +195,3 @@ }
         }
-        else if (props.style === 'block') {
+        else if (node.attributes.style === 'block') {
             return code.split('\n').map((line) => `    ${line}`).join('\n') + '\n';
@@ -166,8 +209,8 @@ }
     }
-    *'html'(props, state) {
-        state.push({ isPreformatted: true, htmlSafe: true });
-        let text = yield;
-        state.pop();
-        let html = text.join('');
-        if (props.type === 'block') {
+    *'html'(node) {
+        let state = Object.assign({}, this.state);
+        Object.assign(this.state, { isPreformatted: true, htmlSafe: true });
+        let html = yield;
+        this.state = state;
+        if (node.attributes.type === 'block') {
             return html + '\n';
@@ -177,13 +220,12 @@ }
     }
-    *'list-item'(_, state) {
-        let digit = state.get('digit');
-        let delimiter = state.get('delimiter');
+    *'list-item'(node, state) {
+        let digit = this.state.digit;
+        let delimiter = this.state.delimiter;
         let marker = delimiter;
-        if (state.get('type') === 'numbered') {
+        if (this.state.type === 'numbered') {
             marker = `${digit}${delimiter}`;
-            state.set('digit', digit + 1);
+            this.state.digit++;
         }
         let indent = ' '.repeat(marker.length + 1);
-        let text = yield;
-        let item = text.join('');
+        let item = yield;
         let firstCharacter = 0;
@@ -197,3 +239,6 @@ while (item[firstCharacter] === ' ')
         item = ' '.repeat(firstCharacter) + first + '\n' + rest.map(line => indent + line).join('\n').replace(/[ ]+$/, '');
-        if (state.get('hasCodeBlockFollowing')) {
+        if (this.state.tight) {
+            item = item.replace(/([ \n])+$/, '\n');
+        }
+        if (this.state.hasCodeBlockFollowing) {
             return ` ${marker}    ${item}`;
@@ -203,54 +248,56 @@ }
     }
-    *'list'(props, state) {
+    *'list'(node) {
         let start = 1;
-        if (props && props.startsAt != null) {
-            start = props.startsAt;
+        if (node.attributes.startsAt != null) {
+            start = node.attributes.startsAt;
         }
         let delimiter = '';
-        if (props.type === 'numbered') {
+        if (node.attributes.type === 'numbered') {
             delimiter = '.';
-            if (state.get('previous.type') === 'numbered' &&
-                state.get('previous.delimiter') === '.') {
+            if (node.previous &&
+                node.previous.type === 'list' &&
+                node.previous.attributes.type === 'numbered' &&
+                node.previous.delimiter === '.') {
                 delimiter = ')';
             }
         }
-        else if (props.type === 'bulleted') {
+        else if (node.attributes.type === 'bulleted') {
             delimiter = '-';
-            if (state.get('previous.type') === 'bulleted' &&
-                state.get('previous.delimiter') === '-') {
+            if (node.previous &&
+                node.previous.type === 'list' &&
+                node.previous.attributes.type === 'bulleted' &&
+                node.previous.delimiter === '-') {
                 delimiter = '+';
             }
         }
-        let hasCodeBlockFollowing = state.get('nextAnnotation.type') === 'code' &&
-            state.get('nextAnnotation.attributes.style') === 'block';
-        state.push({
+        node.delimiter = delimiter;
+        let state = Object.assign({}, this.state);
+        let hasCodeBlockFollowing = node.next &&
+            node.next.type === 'code' &&
+            node.next.attributes.style === 'block';
+        Object.assign(this.state, {
             isList: true,
-            type: props.type,
+            type: node.attributes.type,
             digit: start,
-            previous: state.get('previous'),
             delimiter,
-            hasCodeBlockFollowing,
-            tight: props && props.tight
+            tight: node.attributes.tight,
+            hasCodeBlockFollowing
         });
         let list = yield;
-        state.pop();
-        if (props && props.tight) {
-            list = list.map(item => item.replace(/([ \n])+$/, '\n'));
-        }
-        state.set('previous', {
-            isList: true,
-            type: props.type,
-            delimiter
-        });
-        return list.join('') + '\n';
+        this.state = state;
+        return list + '\n';
     }
-    *'paragraph'(_, state) {
+    *'paragraph'() {
         let text = yield;
-        if (state.get('tight')) {
-            return text.join('') + '\n';
+        if (this.state.tight) {
+            return text + '\n';
         }
-        return text.join('') + '\n\n';
+        return text + '\n\n';
     }
+    render(document) {
+        let graph = new hir_1.HIR(document);
+        return render(this, graph.rootNode);
+    }
 }
 exports.default = CommonmarkRenderer;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":";;AACA,uDAAuD;AAEvD,QAAe,CAAC;IACd,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5B,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;IAEtB,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,KAAK,GAAG,GAAG,EAAE,CAAC;QAAC,KAAK,EAAE,CAAC;IAAC,CAAC;IACvD,OAAO,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,GAAG,IAAI,GAAG,GAAG,KAAK,EAAE,CAAC;QAAC,GAAG,EAAE,CAAC;IAAC,CAAC;IAEvD,MAAM,CAAC;QACL,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC;QACtB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;KAChB,CAAC;AACJ,CAAC;AAdD,sBAcC;AAKD,2BAA2B,IAAY;IACrC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,oCAAoC,EAAE,MAAM,CAAC;SACrD,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC;SAC5B,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;SACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC;AAED,yBAAyB,IAAY;IACnC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;SACrB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC;AAED,sCAAsC,IAAY;IAChD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACjB,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAChD,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACf,KAAK,EAAE,CAAC;QACV,CAAC;IACH,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QAC5C,EAAE,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC;YACrB,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QACpB,CAAC;QACD,MAAM,CAAC,MAAM,CAAC;IAChB,CAAC,EAAE,CAAC,CAAC,CAAC;AACR,CAAC;AAED,wBAAwC,SAAQ,sBAAQ;IAEtD,UAAU,CAAC,IAAY,EAAE,KAAY;QACnC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;YAChC,MAAM,CAAC,IAAI,CAAC;QACd,CAAC;QACD,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAOD,CAAC,MAAM;QACL,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;IAQD,CAAC,MAAM;QACL,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3C,MAAM,CAAC,GAAG,MAAM,KAAK,IAAI,KAAK,KAAK,EAAE,CAAC;IACxC,CAAC;IAQD,CAAC,WAAW,CAAC,CAAM,EAAE,KAAY;QAC/B,IAAI,IAAI,GAAa,KAAK,CAAC;QAC3B,IAAI,KAAK,GAAa,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;QAC9B,IAAI,YAAY,GAAG,CAAC,CAAC;QAErB,OAAO,YAAY,GAAG,UAAU,GAAG,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;YAAE,YAAY,EAAE,CAAC;QAC3F,OAAO,UAAU,GAAG,YAAY,GAAG,CAAC,IAAI,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;YAAE,UAAU,EAAE,CAAC;QAE3F,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAE7F,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACxB,KAAK,IAAI,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,CAAC,KAAK,CAAC;IACf,CAAC;IAWD,CAAC,SAAS,CAAC,KAAwB;QACjC,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAG5B,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,MAAM,CAAC,GAAG,OAAO,UAAU,CAAC;YAC9B,CAAC;YAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,CAAC,GAAG,OAAO,UAAU,CAAC;YAC9B,CAAC;QACH,CAAC;QACD,MAAM,CAAC,GAAG,KAAK,IAAI,OAAO,IAAI,CAAC;IACjC,CAAC;IAOD,CAAC,iBAAiB;QAChB,MAAM,CAAC,OAAO,CAAC;IACjB,CAAC;IAMD,CAAC,OAAO,CAAC,KAA2D;QAClE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAChB,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC7C,MAAM,CAAC,KAAK,KAAK,CAAC,WAAW,KAAK,KAAK,CAAC,GAAG,KAAK,KAAK,IAAI,CAAC;QAC5D,CAAC;QACD,MAAM,CAAC,KAAK,KAAK,CAAC,WAAW,KAAK,KAAK,CAAC,GAAG,GAAG,CAAC;IACjD,CAAC;IAKD,CAAC,QAAQ,CAAC,CAAM,EAAE,KAAY;QAG5B,IAAI,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC7C,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3C,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QACxC,IAAI,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACtC,MAAM,CAAC,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,KAAK,EAAE,CAAC;IACtD,CAAC;IAMD,CAAC,YAAY;QACX,MAAM,CAAC,MAAM,CAAC;IAChB,CAAC;IAKD,CAAC,MAAM,CAAC,KAAsC;QAC5C,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3C,IAAI,GAAG,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrC,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAChB,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC7C,MAAM,CAAC,GAAG,MAAM,IAAI,IAAI,KAAK,GAAG,KAAK,KAAK,KAAK,KAAK,EAAE,CAAC;QACzD,CAAC;QACD,MAAM,CAAC,GAAG,MAAM,IAAI,IAAI,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;IAC9C,CAAC;IASD,CAAC,MAAM,CAAC,KAA0C,EAAE,KAAY;QAC9D,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QACtD,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,KAAK,CAAC,GAAG,EAAE,CAAC;QACZ,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEzB,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC;YAC5B,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;YACnB,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;YAC5B,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;gBACvD,QAAQ,IAAI,IAAI,CAAC;YACnB,CAAC;YAED,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/B,MAAM,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,QAAQ,EAAE,CAAC;YAC3C,CAAC;YAAC,IAAI,CAAC,CAAC;gBACN,MAAM,CAAC,SAAS,IAAI,GAAG,IAAI,SAAS,QAAQ,EAAE,CAAC;YACjD,CAAC;QACH,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QACjF,CAAC;QAAC,IAAI,CAAC,CAAC;YAGN,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,MAAM,CAAC,KAAK,CAAC;YAIf,CAAC;YAAC,IAAI,CAAC,CAAC;gBACN,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC/D,MAAM,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,SAAS,EAAE,CAAC;YAC3C,CAAC;QACH,CAAC;IACH,CAAC;IAED,CAAC,MAAM,CAAC,KAAuB,EAAE,KAAY;QAC3C,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,KAAK,CAAC,GAAG,EAAE,CAAC;QACZ,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzB,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC;YAC3B,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACrB,CAAC;QACD,MAAM,CAAC,IAAI,CAAC;IACd,CAAC;IAKD,CAAC,WAAW,CAAC,CAAM,EAAE,KAAY;QAC/B,IAAI,KAAK,GAAW,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACvC,IAAI,MAAM,GAAW,SAAS,CAAC;QAC/B,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC;YACrC,MAAM,GAAG,GAAG,KAAK,GAAG,SAAS,EAAE,CAAC;YAChC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC3C,IAAI,IAAI,GAAa,KAAK,CAAC;QAC3B,IAAI,IAAI,GAAW,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjC,IAAI,cAAc,GAAG,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG;YAAE,cAAc,EAAE,CAAC;QAEtD,IAAI,KAAK,GAAa,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC;QAE7B,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAOnH,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,CAAC,IAAI,MAAM,OAAO,IAAI,EAAE,CAAC;QACjC,CAAC;QACD,MAAM,CAAC,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC;IAC7B,CAAC;IAOD,CAAC,MAAM,CAAC,KAA0D,EAAE,KAAY;QAC9E,IAAI,KAAK,GAAG,CAAC,CAAC;QAEd,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC;YACpC,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC;QACzB,CAAC;QAED,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC;YAC9B,SAAS,GAAG,GAAG,CAAC;YAEhB,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,UAAU;gBACzC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBAC5C,SAAS,GAAG,GAAG,CAAC;YAClB,CAAC;QACH,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC;YACrC,SAAS,GAAG,GAAG,CAAC;YAEhB,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,UAAU;gBACzC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBAC5C,SAAS,GAAG,GAAG,CAAC;YAClB,CAAC;QACH,CAAC;QAID,IAAI,qBAAqB,GAAG,KAAK,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,MAAM;YAC3C,KAAK,CAAC,GAAG,CAAC,iCAAiC,CAAC,KAAK,OAAO,CAAC;QAErF,KAAK,CAAC,IAAI,CAAC;YACT,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC;YAC/B,SAAS;YACT,qBAAqB;YACrB,KAAK,EAAE,KAAK,IAAI,KAAK,CAAC,KAAK;SAC5B,CAAC,CAAC;QACH,IAAI,IAAI,GAAa,KAAK,CAAC;QAC3B,KAAK,CAAC,GAAG,EAAE,CAAC;QAEZ,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YACzB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;QAC3D,CAAC;QAED,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE;YACpB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,SAAS;SACV,CAAC,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;IAC9B,CAAC;IAKD,CAAC,WAAW,CAAC,CAAM,EAAE,KAAY;QAC/B,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;QAC9B,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;IAChC,CAAC;CACF;AArSD,qCAqSC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

dist/modules/index.d.ts

@@ -1,38 +0,24 @@
-import Renderer, { State } from '@atjson/renderer-hir';
+import Document from '@atjson/document';
+import { HIRNode } from '@atjson/hir';
+import { State } from '@atjson/renderer-hir';
 export declare function split(): IterableIterator<string>;
 export declare type CodeStyle = 'block' | 'inline' | 'fence';
-export default class CommonmarkRenderer extends Renderer {
-    renderText(text: string, state: State): string;
-    'root'(): IterableIterator<string>;
-    'bold'(): IterableIterator<string>;
-    'quotation'(_: any, state: State): IterableIterator<string>;
-    'heading'(props: {
-        level: number;
-    }): IterableIterator<string>;
+export default class CommonmarkRenderer {
+    state: any;
+    constructor();
+    text(text: string): string;
+    'bold'(node: HIRNode): IterableIterator<string>;
+    'blockquote'(): IterableIterator<string>;
+    'heading'(node: HIRNode): IterableIterator<string>;
     'horizontal-rule'(): IterableIterator<string>;
-    'image'(props: {
-        description: string;
-        title?: string;
-        url: string;
-    }): IterableIterator<string>;
-    'italic'(_: any, state: State): IterableIterator<string>;
+    'image'(node: HIRNode): IterableIterator<string>;
+    'italic'(node: HIRNode): IterableIterator<string>;
     'line-break'(): IterableIterator<string>;
-    'link'(props: {
-        url: string;
-        title?: string;
-    }): IterableIterator<string>;
-    'code'(props: {
-        style: CodeStyle;
-        info?: string;
-    }, state: State): IterableIterator<string>;
-    'html'(props: {
-        type: string;
-    }, state: State): IterableIterator<string>;
-    'list-item'(_: any, state: State): IterableIterator<string>;
-    'list'(props: {
-        type: string;
-        startsAt?: number;
-        tight: boolean;
-    }, state: State): IterableIterator<string>;
-    'paragraph'(_: any, state: State): IterableIterator<string>;
+    'link'(node: HIRNode): IterableIterator<string>;
+    'code'(node: HIRNode): IterableIterator<string>;
+    'html'(node: HIRNode): IterableIterator<string>;
+    'list-item'(node: HIRNode, state: State): IterableIterator<string>;
+    'list'(node: HIRNode): IterableIterator<string>;
+    'paragraph'(): IterableIterator<string>;
+    render(document: Document): string;
 }

dist/modules/index.js

@@ -1,5 +0,4 @@
-import Renderer from '@atjson/renderer-hir';
+import { HIR } from '@atjson/hir';
 export function* split() {
-    let rawText = yield;
-    let text = rawText.join('');
+    let text = yield;
     let start = 0;
@@ -49,5 +48,46 @@ let end = text.length;
 }
-export default class CommonmarkRenderer extends Renderer {
-    renderText(text, state) {
-        if (state.get('isPreformatted')) {
+function render(renderer, node, parent, index) {
+    if (index > 0) {
+        node.previous = parent.children[index - 1];
+    }
+    else {
+        node.previous = null;
+    }
+    if (parent && index < parent.children.length) {
+        node.next = parent.children[index + 1];
+    }
+    else {
+        node.next = null;
+    }
+    node.parent = parent;
+    node.children = node.children();
+    let generator;
+    if (renderer[node.type]) {
+        generator = renderer[node.type](node, parent);
+        let result = generator.next();
+        if (result.done) {
+            return result.value;
+        }
+    }
+    let fragment = node.children.map((childNode, idx) => {
+        if (childNode.type === 'text' && typeof childNode.text === 'string') {
+            return renderer.text(childNode.text);
+        }
+        else {
+            return render(renderer, childNode, node, idx);
+        }
+    }).join('');
+    if (generator) {
+        return generator.next(fragment).value;
+    }
+    else {
+        return fragment;
+    }
+}
+export default class CommonmarkRenderer {
+    constructor() {
+        this.state = {};
+    }
+    text(text) {
+        if (this.state.isPreformatted) {
             return text;
@@ -57,13 +97,13 @@ }
     }
-    *'root'() {
-        let document = yield;
-        return document.join('');
-    }
-    *'bold'() {
+    *'bold'(node) {
         let [before, text, after] = yield* split();
+        if (node.parent && !node.previous && !node.next &&
+            node.parent.type === 'italic') {
+            return `${before}__${text}__${after}`;
+        }
         return `${before}**${text}**${after}`;
     }
-    *'quotation'(_, state) {
+    *'blockquote'() {
         let text = yield;
-        let lines = text.join('').split('\n');
+        let lines = text.split('\n');
         let endOfQuote = lines.length;
@@ -76,3 +116,3 @@ let startOfQuote = 0;
         let quote = lines.slice(startOfQuote, endOfQuote).map(line => `> ${line}`).join('\n') + '\n';
-        if (!state.get('tight')) {
+        if (!this.state.tight) {
             quote += '\n';
@@ -82,11 +122,10 @@ }
     }
-    *'heading'(props) {
-        let text = yield;
-        let level = new Array(props.level + 1).join('#');
-        let heading = text.join('');
+    *'heading'(node) {
+        let heading = yield;
+        let level = new Array(node.attributes.level + 1).join('#');
         if (heading.indexOf('\n') !== -1) {
-            if (props.level === 1) {
+            if (node.attributes.level === 1) {
                 return `${heading}\n====\n`;
             }
-            else if (props.level === 2) {
+            else if (node.attributes.level === 2) {
                 return `${heading}\n----\n`;
@@ -100,15 +139,19 @@ }
     }
-    *'image'(props) {
-        if (props.title) {
-            let title = props.title.replace(/"/g, '\\"');
-            return `![${props.description}](${props.url} "${title}")`;
+    *'image'(node) {
+        if (node.attributes.title) {
+            let title = node.attributes.title.replace(/"/g, '\\"');
+            return `![${node.attributes.description}](${node.attributes.url} "${title}")`;
         }
-        return `![${props.description}](${props.url})`;
+        return `![${node.attributes.description}](${node.attributes.url})`;
     }
-    *'italic'(_, state) {
-        let isItalicized = state.get('isItalicized');
-        state.set('isItalicized', true);
+    *'italic'(node) {
+        let state = Object.assign({}, this.state);
+        this.state.isItalicized = true;
         let [before, text, after] = yield* split();
-        state.set('isItalicized', isItalicized);
-        let markup = isItalicized ? '_' : '*';
+        let markup = state.isItalicized ? '_' : '*';
+        if (node.parent && !node.previous && !node.next &&
+            node.parent.type === 'bold') {
+            markup = '_';
+        }
+        this.state = state;
         return `${before}${markup}${text}${markup}${after}`;
@@ -119,7 +162,7 @@ }
     }
-    *'link'(props) {
+    *'link'(node) {
         let [before, text, after] = yield* split();
-        let url = escapeAttribute(props.url);
-        if (props.title) {
-            let title = props.title.replace(/"/g, '\\"');
+        let url = escapeAttribute(node.attributes.url);
+        if (node.attributes.title) {
+            let title = node.attributes.title.replace(/"/g, '\\"');
             return `${before}[${text}](${url} "${title}")${after}`;
@@ -129,12 +172,12 @@ }
     }
-    *'code'(props, state) {
-        state.push({ isPreformatted: true, htmlSafe: false });
-        let text = yield;
-        state.pop();
-        let code = text.join('');
-        if (props.style === 'fence') {
+    *'code'(node) {
+        let state = Object.assign({}, this.state);
+        Object.assign(this.state, { isPreformatted: true, htmlSafe: true });
+        let code = yield;
+        this.state = state;
+        if (node.attributes.style === 'fence') {
             code = '\n' + code;
-            let info = props.info || '';
+            let info = node.attributes.info || '';
             let newlines = '\n';
-            if (state.get('isList') && state.get('nextAnnotation')) {
+            if (this.state.isList && node.next) {
                 newlines += '\n';
@@ -149,3 +192,3 @@ }
         }
-        else if (props.style === 'block') {
+        else if (node.attributes.style === 'block') {
             return code.split('\n').map((line) => `    ${line}`).join('\n') + '\n';
@@ -163,8 +206,8 @@ }
     }
-    *'html'(props, state) {
-        state.push({ isPreformatted: true, htmlSafe: true });
-        let text = yield;
-        state.pop();
-        let html = text.join('');
-        if (props.type === 'block') {
+    *'html'(node) {
+        let state = Object.assign({}, this.state);
+        Object.assign(this.state, { isPreformatted: true, htmlSafe: true });
+        let html = yield;
+        this.state = state;
+        if (node.attributes.type === 'block') {
             return html + '\n';
@@ -174,13 +217,12 @@ }
     }
-    *'list-item'(_, state) {
-        let digit = state.get('digit');
-        let delimiter = state.get('delimiter');
+    *'list-item'(node, state) {
+        let digit = this.state.digit;
+        let delimiter = this.state.delimiter;
         let marker = delimiter;
-        if (state.get('type') === 'numbered') {
+        if (this.state.type === 'numbered') {
             marker = `${digit}${delimiter}`;
-            state.set('digit', digit + 1);
+            this.state.digit++;
         }
         let indent = ' '.repeat(marker.length + 1);
-        let text = yield;
-        let item = text.join('');
+        let item = yield;
         let firstCharacter = 0;
@@ -194,3 +236,6 @@ while (item[firstCharacter] === ' ')
         item = ' '.repeat(firstCharacter) + first + '\n' + rest.map(line => indent + line).join('\n').replace(/[ ]+$/, '');
-        if (state.get('hasCodeBlockFollowing')) {
+        if (this.state.tight) {
+            item = item.replace(/([ \n])+$/, '\n');
+        }
+        if (this.state.hasCodeBlockFollowing) {
             return ` ${marker}    ${item}`;
@@ -200,53 +245,55 @@ }
     }
-    *'list'(props, state) {
+    *'list'(node) {
         let start = 1;
-        if (props && props.startsAt != null) {
-            start = props.startsAt;
+        if (node.attributes.startsAt != null) {
+            start = node.attributes.startsAt;
         }
         let delimiter = '';
-        if (props.type === 'numbered') {
+        if (node.attributes.type === 'numbered') {
             delimiter = '.';
-            if (state.get('previous.type') === 'numbered' &&
-                state.get('previous.delimiter') === '.') {
+            if (node.previous &&
+                node.previous.type === 'list' &&
+                node.previous.attributes.type === 'numbered' &&
+                node.previous.delimiter === '.') {
                 delimiter = ')';
             }
         }
-        else if (props.type === 'bulleted') {
+        else if (node.attributes.type === 'bulleted') {
             delimiter = '-';
-            if (state.get('previous.type') === 'bulleted' &&
-                state.get('previous.delimiter') === '-') {
+            if (node.previous &&
+                node.previous.type === 'list' &&
+                node.previous.attributes.type === 'bulleted' &&
+                node.previous.delimiter === '-') {
                 delimiter = '+';
             }
         }
-        let hasCodeBlockFollowing = state.get('nextAnnotation.type') === 'code' &&
-            state.get('nextAnnotation.attributes.style') === 'block';
-        state.push({
+        node.delimiter = delimiter;
+        let state = Object.assign({}, this.state);
+        let hasCodeBlockFollowing = node.next &&
+            node.next.type === 'code' &&
+            node.next.attributes.style === 'block';
+        Object.assign(this.state, {
             isList: true,
-            type: props.type,
+            type: node.attributes.type,
             digit: start,
-            previous: state.get('previous'),
             delimiter,
-            hasCodeBlockFollowing,
-            tight: props && props.tight
+            tight: node.attributes.tight,
+            hasCodeBlockFollowing
         });
         let list = yield;
-        state.pop();
-        if (props && props.tight) {
-            list = list.map(item => item.replace(/([ \n])+$/, '\n'));
-        }
-        state.set('previous', {
-            isList: true,
-            type: props.type,
-            delimiter
-        });
-        return list.join('') + '\n';
+        this.state = state;
+        return list + '\n';
     }
-    *'paragraph'(_, state) {
+    *'paragraph'() {
         let text = yield;
-        if (state.get('tight')) {
-            return text.join('') + '\n';
+        if (this.state.tight) {
+            return text + '\n';
         }
-        return text.join('') + '\n\n';
+        return text + '\n\n';
     }
+    render(document) {
+        let graph = new HIR(document);
+        return render(this, graph.rootNode);
+    }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,QAAmB,MAAM,sBAAsB,CAAC;AAEvD,MAAM,SAAS,CAAC;IACd,IAAI,OAAO,GAAG,KAAK,CAAC;IACpB,IAAI,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC5B,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC;IAEtB,OAAO,IAAI,CAAC,KAAK,CAAC,KAAK,GAAG,IAAI,KAAK,GAAG,GAAG,EAAE,CAAC;QAAC,KAAK,EAAE,CAAC;IAAC,CAAC;IACvD,OAAO,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,GAAG,IAAI,GAAG,GAAG,KAAK,EAAE,CAAC;QAAC,GAAG,EAAE,CAAC;IAAC,CAAC;IAEvD,MAAM,CAAC;QACL,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,KAAK,CAAC;QACpB,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,GAAG,CAAC;QACtB,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC;KAChB,CAAC;AACJ,CAAC;AAKD,2BAA2B,IAAY;IACrC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,oCAAoC,EAAE,MAAM,CAAC;SACrD,OAAO,CAAC,UAAU,EAAE,OAAO,CAAC;SAC5B,OAAO,CAAC,IAAI,EAAE,OAAO,CAAC;SACtB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC;SACrB,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;AACpC,CAAC;AAED,yBAAyB,IAAY;IACnC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC;SACrB,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;AACpC,CAAC;AAED,sCAAsC,IAAY;IAChD,IAAI,KAAK,GAAG,CAAC,CAAC;IACd,IAAI,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC;IACjB,GAAG,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE,CAAC;QAChD,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;YACpB,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACpC,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC/B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACf,KAAK,EAAE,CAAC;QACV,CAAC;IACH,CAAC;IAED,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QAC5C,EAAE,CAAC,CAAC,KAAK,KAAK,MAAM,CAAC,CAAC,CAAC;YACrB,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QACpB,CAAC;QACD,MAAM,CAAC,MAAM,CAAC;IAChB,CAAC,EAAE,CAAC,CAAC,CAAC;AACR,CAAC;AAED,MAAM,CAAC,OAAO,yBAA0B,SAAQ,QAAQ;IAEtD,UAAU,CAAC,IAAY,EAAE,KAAY;QACnC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;YAChC,MAAM,CAAC,IAAI,CAAC;QACd,CAAC;QACD,MAAM,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAOD,CAAC,MAAM;QACL,IAAI,QAAQ,GAAG,KAAK,CAAC;QACrB,MAAM,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAC3B,CAAC;IAQD,CAAC,MAAM;QACL,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3C,MAAM,CAAC,GAAG,MAAM,KAAK,IAAI,KAAK,KAAK,EAAE,CAAC;IACxC,CAAC;IAQD,CAAC,WAAW,CAAC,CAAM,EAAE,KAAY;QAC/B,IAAI,IAAI,GAAa,KAAK,CAAC;QAC3B,IAAI,KAAK,GAAa,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,UAAU,GAAG,KAAK,CAAC,MAAM,CAAC;QAC9B,IAAI,YAAY,GAAG,CAAC,CAAC;QAErB,OAAO,YAAY,GAAG,UAAU,GAAG,CAAC,IAAI,KAAK,CAAC,YAAY,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;YAAE,YAAY,EAAE,CAAC;QAC3F,OAAO,UAAU,GAAG,YAAY,GAAG,CAAC,IAAI,KAAK,CAAC,UAAU,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC;YAAE,UAAU,EAAE,CAAC;QAE3F,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,YAAY,EAAE,UAAU,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,KAAK,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QAE7F,EAAE,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACxB,KAAK,IAAI,IAAI,CAAC;QAChB,CAAC;QACD,MAAM,CAAC,KAAK,CAAC;IACf,CAAC;IAWD,CAAC,SAAS,CAAC,KAAwB;QACjC,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QACjD,IAAI,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAG5B,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;YACjC,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,MAAM,CAAC,GAAG,OAAO,UAAU,CAAC;YAC9B,CAAC;YAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,CAAC,CAAC,CAAC,CAAC;gBAC7B,MAAM,CAAC,GAAG,OAAO,UAAU,CAAC;YAC9B,CAAC;QACH,CAAC;QACD,MAAM,CAAC,GAAG,KAAK,IAAI,OAAO,IAAI,CAAC;IACjC,CAAC;IAOD,CAAC,iBAAiB;QAChB,MAAM,CAAC,OAAO,CAAC;IACjB,CAAC;IAMD,CAAC,OAAO,CAAC,KAA2D;QAClE,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAChB,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC7C,MAAM,CAAC,KAAK,KAAK,CAAC,WAAW,KAAK,KAAK,CAAC,GAAG,KAAK,KAAK,IAAI,CAAC;QAC5D,CAAC;QACD,MAAM,CAAC,KAAK,KAAK,CAAC,WAAW,KAAK,KAAK,CAAC,GAAG,GAAG,CAAC;IACjD,CAAC;IAKD,CAAC,QAAQ,CAAC,CAAM,EAAE,KAAY;QAG5B,IAAI,YAAY,GAAG,KAAK,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC;QAC7C,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3C,KAAK,CAAC,GAAG,CAAC,cAAc,EAAE,YAAY,CAAC,CAAC;QACxC,IAAI,MAAM,GAAG,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;QACtC,MAAM,CAAC,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,KAAK,EAAE,CAAC;IACtD,CAAC;IAMD,CAAC,YAAY;QACX,MAAM,CAAC,MAAM,CAAC;IAChB,CAAC;IAKD,CAAC,MAAM,CAAC,KAAsC;QAC5C,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3C,IAAI,GAAG,GAAG,eAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACrC,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YAChB,IAAI,KAAK,GAAG,KAAK,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YAC7C,MAAM,CAAC,GAAG,MAAM,IAAI,IAAI,KAAK,GAAG,KAAK,KAAK,KAAK,KAAK,EAAE,CAAC;QACzD,CAAC;QACD,MAAM,CAAC,GAAG,MAAM,IAAI,IAAI,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;IAC9C,CAAC;IASD,CAAC,MAAM,CAAC,KAA0C,EAAE,KAAY;QAC9D,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,KAAK,EAAE,CAAC,CAAC;QACtD,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,KAAK,CAAC,GAAG,EAAE,CAAC;QACZ,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAEzB,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC;YAC5B,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;YACnB,IAAI,IAAI,GAAG,KAAK,CAAC,IAAI,IAAI,EAAE,CAAC;YAC5B,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,KAAK,CAAC,GAAG,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC;gBACvD,QAAQ,IAAI,IAAI,CAAC;YACnB,CAAC;YAED,EAAE,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC/B,MAAM,CAAC,MAAM,IAAI,GAAG,IAAI,MAAM,QAAQ,EAAE,CAAC;YAC3C,CAAC;YAAC,IAAI,CAAC,CAAC;gBACN,MAAM,CAAC,SAAS,IAAI,GAAG,IAAI,SAAS,QAAQ,EAAE,CAAC;YACjD,CAAC;QACH,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,KAAK,KAAK,OAAO,CAAC,CAAC,CAAC;YACnC,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,IAAY,EAAE,EAAE,CAAC,OAAO,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC;QACjF,CAAC;QAAC,IAAI,CAAC,CAAC;YAGN,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,CAAC,CAAC,CAAC,CAAC;gBACtB,MAAM,CAAC,KAAK,CAAC;YAIf,CAAC;YAAC,IAAI,CAAC,CAAC;gBACN,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC/D,MAAM,CAAC,GAAG,SAAS,GAAG,IAAI,GAAG,SAAS,EAAE,CAAC;YAC3C,CAAC;QACH,CAAC;IACH,CAAC;IAED,CAAC,MAAM,CAAC,KAAuB,EAAE,KAAY;QAC3C,KAAK,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QACrD,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,KAAK,CAAC,GAAG,EAAE,CAAC;QACZ,IAAI,IAAI,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACzB,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,CAAC,CAAC;YAC3B,MAAM,CAAC,IAAI,GAAG,IAAI,CAAC;QACrB,CAAC;QACD,MAAM,CAAC,IAAI,CAAC;IACd,CAAC;IAKD,CAAC,WAAW,CAAC,CAAM,EAAE,KAAY;QAC/B,IAAI,KAAK,GAAW,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QACvC,IAAI,SAAS,GAAG,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;QACvC,IAAI,MAAM,GAAW,SAAS,CAAC;QAC/B,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,KAAK,UAAU,CAAC,CAAC,CAAC;YACrC,MAAM,GAAG,GAAG,KAAK,GAAG,SAAS,EAAE,CAAC;YAChC,KAAK,CAAC,GAAG,CAAC,OAAO,EAAE,KAAK,GAAG,CAAC,CAAC,CAAC;QAChC,CAAC;QAED,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC3C,IAAI,IAAI,GAAa,KAAK,CAAC;QAC3B,IAAI,IAAI,GAAW,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACjC,IAAI,cAAc,GAAG,CAAC,CAAC;QACvB,OAAO,IAAI,CAAC,cAAc,CAAC,KAAK,GAAG;YAAE,cAAc,EAAE,CAAC;QAEtD,IAAI,KAAK,GAAa,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvC,KAAK,CAAC,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QACrD,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK,EAAE,GAAG,IAAI,CAAC,GAAG,KAAK,CAAC;QAE7B,IAAI,GAAG,GAAG,CAAC,MAAM,CAAC,cAAc,CAAC,GAAG,KAAK,GAAG,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,MAAM,GAAG,IAAI,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;QAOnH,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC,CAAC,CAAC;YACvC,MAAM,CAAC,IAAI,MAAM,OAAO,IAAI,EAAE,CAAC;QACjC,CAAC;QACD,MAAM,CAAC,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC;IAC7B,CAAC;IAOD,CAAC,MAAM,CAAC,KAA0D,EAAE,KAAY;QAC9E,IAAI,KAAK,GAAG,CAAC,CAAC;QAEd,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC;YACpC,KAAK,GAAG,KAAK,CAAC,QAAQ,CAAC;QACzB,CAAC;QAED,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC;YAC9B,SAAS,GAAG,GAAG,CAAC;YAEhB,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,UAAU;gBACzC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBAC5C,SAAS,GAAG,GAAG,CAAC;YAClB,CAAC;QACH,CAAC;QAAC,IAAI,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,CAAC,CAAC,CAAC;YACrC,SAAS,GAAG,GAAG,CAAC;YAEhB,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,KAAK,UAAU;gBACzC,KAAK,CAAC,GAAG,CAAC,oBAAoB,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;gBAC5C,SAAS,GAAG,GAAG,CAAC;YAClB,CAAC;QACH,CAAC;QAID,IAAI,qBAAqB,GAAG,KAAK,CAAC,GAAG,CAAC,qBAAqB,CAAC,KAAK,MAAM;YAC3C,KAAK,CAAC,GAAG,CAAC,iCAAiC,CAAC,KAAK,OAAO,CAAC;QAErF,KAAK,CAAC,IAAI,CAAC;YACT,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,KAAK,EAAE,KAAK;YACZ,QAAQ,EAAE,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC;YAC/B,SAAS;YACT,qBAAqB;YACrB,KAAK,EAAE,KAAK,IAAI,KAAK,CAAC,KAAK;SAC5B,CAAC,CAAC;QACH,IAAI,IAAI,GAAa,KAAK,CAAC;QAC3B,KAAK,CAAC,GAAG,EAAE,CAAC;QAEZ,EAAE,CAAC,CAAC,KAAK,IAAI,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC;YACzB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;QAC3D,CAAC;QAED,KAAK,CAAC,GAAG,CAAC,UAAU,EAAE;YACpB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,KAAK,CAAC,IAAI;YAChB,SAAS;SACV,CAAC,CAAC;QAEH,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;IAC9B,CAAC;IAKD,CAAC,WAAW,CAAC,CAAM,EAAE,KAAY;QAC/B,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YACvB,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC;QAC9B,CAAC;QACD,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC;IAChC,CAAC;CACF"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

package.json

 {
   "name": "@atjson/renderer-commonmark",
-  "version": "0.7.5",
+  "version": "0.7.9",
   "description": "A brand new TypeScript library.",
@@ -20,3 +20,3 @@ "main": "dist/commonjs/index.js",
     "@atjson/hir": "^0.7.2",
-    "@atjson/source-commonmark": "^0.7.5",
+    "@atjson/source-commonmark": "^0.7.9",
     "commonmark-spec": "^0.28.0",
@@ -23,0 +23,0 @@ "tslint": "^5.9.1",

src/index.ts

@@ -1,7 +0,7 @@
-import { HIRNode } from '@atjson/hir';
+import Document from '@atjson/document';
+import { HIR, HIRNode } from '@atjson/hir';
 import Renderer, { State } from '@atjson/renderer-hir';
 
 export function* split(): IterableIterator<string> {
-  let rawText = yield;
-  let text = rawText.join('');
+  let text = yield;
   let start = 0;
@@ -56,6 +56,52 @@ let end = text.length;
 
-export default class CommonmarkRenderer extends Renderer {
+function render(renderer: CommonMarkRenderer, node: HIRNode, parent?: HIRNode, index?: number): string {
+  if (index > 0) {
+    node.previous = parent.children[index - 1];
+  } else {
+    node.previous = null;
+  }
 
-  renderText(text: string, state: State) {
-    if (state.get('isPreformatted')) {
+  if (parent && index < parent.children.length) {
+    node.next = parent.children[index + 1];
+  } else {
+    node.next = null;
+  }
+
+  node.parent = parent;
+  node.children = node.children();
+
+  let generator;
+  if (renderer[node.type]) {
+    generator = renderer[node.type](node, parent);
+    let result = generator.next();
+    if (result.done) {
+      return result.value;
+    }
+  }
+
+  let fragment = node.children.map((childNode: HIRNode, idx: number) => {
+    if (childNode.type === 'text' && typeof childNode.text === 'string') {
+      return renderer.text(childNode.text);
+    } else {
+      return render(renderer, childNode, node, idx);
+    }
+  }).join('');
+
+  if (generator) {
+    return generator.next(fragment).value;
+  } else {
+    return fragment;
+  }
+}
+
+export default class CommonmarkRenderer {
+
+  state: any;
+
+  constructor() {
+    this.state = {};
+  }
+
+  text(text: string) {
+    if (this.state.isPreformatted) {
       return text;
@@ -67,12 +113,2 @@ }
   /**
-   * The root allows us to normalize the document
-   * after all annotations have been rendered to
-   * CommonMark.
-   */
-  *'root'(): IterableIterator<string> {
-    let document = yield;
-    return document.join('');
-  }
-
-  /**
    * Bold text looks like **this** in Markdown.
@@ -83,4 +119,8 @@ *
    */
-  *'bold'(): IterableIterator<string> {
+  *'bold'(node: HIRNode): IterableIterator<string> {
     let [before, text, after] = yield* split();
+    if (node.parent && !node.previous && !node.next &&
+        node.parent.type === 'italic') {
+      return `${before}__${text}__${after}`;
+    }
     return `${before}**${text}**${after}`;
@@ -95,5 +135,5 @@ }
    */
-  *'quotation'(_: any, state: State): IterableIterator<string> {
-    let text: string[] = yield;
-    let lines: string[] = text.join('').split('\n');
+  *'blockquote'(): IterableIterator<string> {
+    let text = yield;
+    let lines: string[] = text.split('\n');
     let endOfQuote = lines.length;
@@ -107,3 +147,3 @@ let startOfQuote = 0;
 
-    if (!state.get('tight')) {
+    if (!this.state.tight) {
       quote += '\n';
@@ -123,12 +163,11 @@ }
    */
-  *'heading'(props: { level: number }): IterableIterator<string> {
-    let text = yield;
-    let level = new Array(props.level + 1).join('#');
-    let heading = text.join('');
+  *'heading'(node: HIRNode): IterableIterator<string> {
+    let heading = yield;
+    let level = new Array(node.attributes.level + 1).join('#');
 
     // Multiline headings are supported for level 1 and 2
     if (heading.indexOf('\n') !== -1) {
-      if (props.level === 1) {
+      if (node.attributes.level === 1) {
         return `${heading}\n====\n`;
-      } else if (props.level === 2) {
+      } else if (node.attributes.level === 2) {
         return `${heading}\n----\n`;
@@ -153,8 +192,8 @@ }
    */
-  *'image'(props: { description: string, title?: string, url: string }): IterableIterator<string> {
-    if (props.title) {
-      let title = props.title.replace(/"/g, '\\"');
-      return `![${props.description}](${props.url} "${title}")`;
+  *'image'(node: HIRNode): IterableIterator<string> {
+    if (node.attributes.title) {
+      let title = node.attributes.title.replace(/"/g, '\\"');
+      return `![${node.attributes.description}](${node.attributes.url} "${title}")`;
     }
-    return `![${props.description}](${props.url})`;
+    return `![${node.attributes.description}](${node.attributes.url})`;
   }
@@ -165,10 +204,17 @@
    */
-  *'italic'(_: any, state: State): IterableIterator<string> {
+  *'italic'(node: HIRNode): IterableIterator<string> {
     // This adds support for strong emphasis (per Commonmark)
     // Strong emphasis includes _*two*_ emphasis markers around text.
-    let isItalicized = state.get('isItalicized');
-    state.set('isItalicized', true);
+    let state = Object.assign({}, this.state);
+    this.state.isItalicized = true;
+
     let [before, text, after] = yield* split();
-    state.set('isItalicized', isItalicized);
-    let markup = isItalicized ? '_' : '*';
+    let markup = state.isItalicized ? '_' : '*';
+    if (node.parent && !node.previous && !node.next &&
+        node.parent.type === 'bold') {
+      markup = '_';
+    }
+
+    this.state = state;
+
     return `${before}${markup}${text}${markup}${after}`;
@@ -188,7 +234,7 @@ }
    */
-  *'link'(props: { url: string, title?: string }): IterableIterator<string> {
+  *'link'(node: HIRNode): IterableIterator<string> {
     let [before, text, after] = yield* split();
-    let url = escapeAttribute(props.url);
-    if (props.title) {
-      let title = props.title.replace(/"/g, '\\"');
+    let url = escapeAttribute(node.attributes.url);
+    if (node.attributes.title) {
+      let title = node.attributes.title.replace(/"/g, '\\"');
       return `${before}[${text}](${url} "${title}")${after}`;
@@ -206,13 +252,14 @@ }
    */
-  *'code'(props: { style: CodeStyle, info?: string }, state: State): IterableIterator<string> {
-    state.push({ isPreformatted: true, htmlSafe: false });
-    let text = yield;
-    state.pop();
-    let code = text.join('');
+  *'code'(node: HIRNode): IterableIterator<string> {
+    let state = Object.assign({}, this.state);
+    Object.assign(this.state, { isPreformatted: true, htmlSafe: true });
 
-    if (props.style === 'fence') {
+    let code = yield;
+    this.state = state;
+
+    if (node.attributes.style === 'fence') {
       code = '\n' + code;
-      let info = props.info || '';
+      let info = node.attributes.info || '';
       let newlines = '\n';
-      if (state.get('isList') && state.get('nextAnnotation')) {
+      if (this.state.isList && node.next) {
         newlines += '\n';
@@ -226,3 +273,3 @@ }
       }
-    } else if (props.style === 'block') {
+    } else if (node.attributes.style === 'block') {
       return code.split('\n').map((line: string) => `    ${line}`).join('\n') + '\n';
@@ -244,8 +291,11 @@ } else {
 
-  *'html'(props: { type: string }, state: State): IterableIterator<string> {
-    state.push({ isPreformatted: true, htmlSafe: true });
-    let text = yield;
-    state.pop();
-    let html = text.join('');
-    if (props.type === 'block') {
+  *'html'(node: HIRNode): IterableIterator<string> {
+    let state = Object.assign({}, this.state);
+    Object.assign(this.state, { isPreformatted: true, htmlSafe: true });
+
+    let html = yield;
+
+    this.state = state;
+
+    if (node.attributes.type === 'block') {
       return html + '\n';
@@ -259,14 +309,13 @@ }
    */
-  *'list-item'(_: any, state: State): IterableIterator<string> {
-    let digit: number = state.get('digit');
-    let delimiter = state.get('delimiter');
+  *'list-item'(node: HIRNode, state: State): IterableIterator<string> {
+    let digit: number = this.state.digit;
+    let delimiter = this.state.delimiter;
     let marker: string = delimiter;
-    if (state.get('type') === 'numbered') {
+    if (this.state.type === 'numbered') {
       marker = `${digit}${delimiter}`;
-      state.set('digit', digit + 1);
+      this.state.digit++;
     }
 
     let indent = ' '.repeat(marker.length + 1);
-    let text: string[] = yield;
-    let item: string = text.join('');
+    let item: string = yield;
     let firstCharacter = 0;
@@ -282,2 +331,6 @@ while (item[firstCharacter] === ' ') firstCharacter++;
 
+    if (this.state.tight) {
+      item = item.replace(/([ \n])+$/, '\n');
+    }
+
     // Code blocks using spaces can follow lists,
@@ -288,3 +341,3 @@ // however, they will be included in the list
     // See http://spec.commonmark.org/dingus/?text=%20-%20%20%20hello%0A%0A%20%20%20%20I%27m%20a%20code%20block%20_outside_%20the%20list%0A
-    if (state.get('hasCodeBlockFollowing')) {
+    if (this.state.hasCodeBlockFollowing) {
       return ` ${marker}    ${item}`;
@@ -300,54 +353,50 @@ }
    */
-  *'list'(props: { type: string, startsAt?: number, tight: boolean }, state: State): IterableIterator<string> {
+  *'list'(node: HIRNode): IterableIterator<string> {
     let start = 1;
 
-    if (props && props.startsAt != null) {
-      start = props.startsAt;
+    if (node.attributes.startsAt != null) {
+      start = node.attributes.startsAt;
     }
 
     let delimiter = '';
-    if (props.type === 'numbered') {
+    if (node.attributes.type === 'numbered') {
       delimiter = '.';
 
-      if (state.get('previous.type') === 'numbered' &&
-          state.get('previous.delimiter') === '.') {
+      if (node.previous &&
+          node.previous.type === 'list' &&
+          node.previous.attributes.type === 'numbered' &&
+          node.previous.delimiter === '.') {
         delimiter = ')';
       }
-    } else if (props.type === 'bulleted') {
+    } else if (node.attributes.type === 'bulleted') {
       delimiter = '-';
 
-      if (state.get('previous.type') === 'bulleted' &&
-          state.get('previous.delimiter') === '-') {
+      if (node.previous &&
+          node.previous.type === 'list' &&
+          node.previous.attributes.type === 'bulleted' &&
+          node.previous.delimiter === '-') {
         delimiter = '+';
       }
     }
+    node.delimiter = delimiter;
 
-    // Handle indendation for code blocks that immediately follow
-    // a list.
-    let hasCodeBlockFollowing = state.get('nextAnnotation.type') === 'code' &&
-                                state.get('nextAnnotation.attributes.style') === 'block';
+    let state = Object.assign({}, this.state);
 
-    state.push({
+    // Handle indendation for code blocks that immediately follow a list.
+    let hasCodeBlockFollowing = node.next &&
+                                node.next.type === 'code' &&
+                                node.next.attributes.style === 'block';
+    Object.assign(this.state, {
       isList: true,
-      type: props.type,
+      type: node.attributes.type,
       digit: start,
-      previous: state.get('previous'),
       delimiter,
-      hasCodeBlockFollowing,
-      tight: props && props.tight
+      tight: node.attributes.tight,
+      hasCodeBlockFollowing
     });
-    let list: string[] = yield;
-    state.pop();
 
-    if (props && props.tight) {
-      list = list.map(item => item.replace(/([ \n])+$/, '\n'));
-    }
+    let list = yield;
 
-    state.set('previous', {
-      isList: true,
-      type: props.type,
-      delimiter
-    });
-
-    return list.join('') + '\n';
+    this.state = state;
+    return list + '\n';
   }
@@ -358,9 +407,14 @@
    */
-  *'paragraph'(_: any, state: State): IterableIterator<string> {
+  *'paragraph'(): IterableIterator<string> {
     let text = yield;
-    if (state.get('tight')) {
-      return text.join('') + '\n';
+    if (this.state.tight) {
+      return text + '\n';
     }
-    return text.join('') + '\n\n';
+    return text + '\n\n';
+  },
+
+  render(document: Document): string {
+    let graph = new HIR(document);
+    return render(this, graph.rootNode);
   }
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Major refactor

Supply chain risk

Package has recently undergone a major refactor. It may be unstable or indicate significant internal changes. Use caution when updating to versions that include significant changes.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

64300

increased by15.22%

Number of package files

8

increased by14.29%

Lines of code

968

increased by12.17%

Worsened metrics

Number of medium supply chain risk alerts

1

increased byInfinity%

No dependency changes