@atjson/renderer-commonmark - npm Package Compare versions

Comparing version 0.7.12 to 0.7.13

dist/modules/index.d.ts

 import Document from '@atjson/document';
-import { HIRNode } from '@atjson/hir';
-import { State } from '@atjson/renderer-hir';
-export declare function split(): IterableIterator<string>;
+export declare function split(): Iterable<any>;
 export declare type CodeStyle = 'block' | 'inline' | 'fence';
+export interface Annotation {
+    type: string;
+    attributes?: any;
+    previous: Annotation | null;
+    next: Annotation | null;
+    parent: Annotation | null;
+    text?: string;
+    children: Annotation[];
+}
 export default class CommonmarkRenderer {
@@ -10,16 +17,16 @@ state: any;
     text(text: string): string;
-    'bold'(node: HIRNode): IterableIterator<string>;
-    'blockquote'(): IterableIterator<string>;
-    'heading'(node: HIRNode): IterableIterator<string>;
-    'horizontal-rule'(): IterableIterator<string>;
-    'image'(node: HIRNode): IterableIterator<string>;
-    'italic'(node: HIRNode): IterableIterator<string>;
-    'line-break'(): 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>;
+    'bold'(node: Annotation): Iterable<any>;
+    'blockquote'(): Iterable<any>;
+    'heading'(node: Annotation): Iterable<any>;
+    'horizontal-rule'(): Iterable<any>;
+    'image'(node: Annotation): Iterable<any>;
+    'italic'(node: Annotation): Iterable<any>;
+    'line-break'(): Iterable<any>;
+    'link'(node: Annotation): Iterable<any>;
+    'code'(node: Annotation): Iterable<any>;
+    'html'(node: Annotation): Iterable<any>;
+    'list-item'(): Iterable<any>;
+    'list'(node: Annotation): Iterable<any>;
+    'paragraph'(): Iterable<any>;
     render(document: Document): string;
 }

dist/modules/index.js

@@ -48,20 +48,28 @@ import { HIR } from '@atjson/hir';
 }
-function render(renderer, node, parent, index) {
-    if (index > 0) {
-        node.previous = parent.children[index - 1];
+function hirNodeToMarkdownNode(node, parent) {
+    let markdownNode = {
+        type: node.type,
+        attributes: node.attributes,
+        parent,
+        previous: null,
+        next: null,
+        text: node.text,
+        children: []
+    };
+    markdownNode.children.push(...node.children().map((childNode) => {
+        return hirNodeToMarkdownNode(childNode, markdownNode);
+    }));
+    return markdownNode;
+}
+function render(renderer, node, index) {
+    if (node.parent && index > 0) {
+        node.previous = node.parent.children[index - 1];
     }
-    else {
-        node.previous = null;
+    if (node.parent && index < node.parent.children.length) {
+        node.next = node.parent.children[index + 1];
     }
-    if (parent && index < parent.children.length) {
-        node.next = parent.children[index + 1];
-    }
-    else {
-        node.next = null;
-    }
-    node.parent = parent;
-    node.children = node.children();
+    let factory = renderer[node.type];
     let generator;
-    if (renderer[node.type]) {
-        generator = renderer[node.type](node, parent);
+    if (factory) {
+        generator = factory.call(renderer, node);
         let result = generator.next();
@@ -72,3 +80,3 @@ if (result.done) {
     }
-    let fragment = node.children.map((childNode, idx) => {
+    let fragment = node.children.map((childNode, index) => {
         if (childNode.type === 'text' && typeof childNode.text === 'string') {
@@ -78,3 +86,3 @@ return renderer.text(childNode.text);
         else {
-            return render(renderer, childNode, node, idx);
+            return render(renderer, childNode, index);
         }
@@ -221,3 +229,3 @@ }).join('');
     }
-    *'list-item'(node, state) {
+    *'list-item'() {
         let digit = this.state.digit;
@@ -259,3 +267,3 @@ let delimiter = this.state.delimiter;
                 node.previous.attributes.type === 'numbered' &&
-                node.previous.delimiter === '.') {
+                node.previous.attributes.delimiter === '.') {
                 delimiter = ')';
@@ -269,7 +277,7 @@ }
                 node.previous.attributes.type === 'bulleted' &&
-                node.previous.delimiter === '-') {
+                node.previous.attributes.delimiter === '-') {
                 delimiter = '+';
             }
         }
-        node.delimiter = delimiter;
+        node.attributes.delimiter = delimiter;
         let state = Object.assign({}, this.state);
@@ -300,5 +308,5 @@ let hasCodeBlockFollowing = node.next &&
         let graph = new HIR(document);
-        return render(this, graph.rootNode);
+        return render(this, hirNodeToMarkdownNode(graph.rootNode, null), -1);
     }
 }
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,GAAG,EAAW,MAAM,aAAa,CAAC;AAE3C,MAAM,SAAS,CAAC;IACd,IAAI,IAAI,GAAG,KAAK,CAAC;IACjB,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;QAAE,KAAK,EAAE,CAAC;KAAE;IACvD,OAAO,IAAI,CAAC,GAAG,GAAG,CAAC,CAAC,KAAK,GAAG,IAAI,GAAG,GAAG,KAAK,EAAE;QAAE,GAAG,EAAE,CAAC;KAAE;IAEvD,OAAO;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,OAAO,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,OAAO,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,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,GAAG,GAAG,EAAE,CAAC,EAAE,EAAE;QAC/C,IAAI,IAAI,CAAC,CAAC,CAAC,KAAK,GAAG,EAAE;YACnB,MAAM,CAAC,KAAK,CAAC,GAAG,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;SACnC;aAAM,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;YAC9B,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;YACf,KAAK,EAAE,CAAC;SACT;KACF;IAED,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE;QAC5C,IAAI,KAAK,KAAK,MAAM,EAAE;YACpB,OAAO,MAAM,GAAG,CAAC,CAAC;SACnB;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,EAAE,CAAC,CAAC,CAAC;AACR,CAAC;AAYD,+BAA+B,IAAa,EAAE,MAAyB;IACrE,IAAI,YAAY,GAAe;QAC7B,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,UAAU,EAAE,IAAI,CAAC,UAAU;QAC3B,MAAM;QACN,QAAQ,EAAE,IAAI;QACd,IAAI,EAAE,IAAI;QACV,IAAI,EAAE,IAAI,CAAC,IAAI;QACf,QAAQ,EAAE,EAAE;KACb,CAAC;IAEF,YAAY,CAAC,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,EAAE,CAAC,GAAG,CAAC,CAAC,SAAkB,EAAE,EAAE;QACvE,OAAO,qBAAqB,CAAC,SAAS,EAAE,YAAY,CAAC,CAAC;IACxD,CAAC,CAAC,CAAC,CAAC;IAEJ,OAAO,YAAY,CAAC;AACtB,CAAC;AAED,gBAAgB,QAA4B,EAAE,IAAgB,EAAE,KAAa;IAC3E,IAAI,IAAI,CAAC,MAAM,IAAI,KAAK,GAAG,CAAC,EAAE;QAC5B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;KACjD;IAED,IAAI,IAAI,CAAC,MAAM,IAAI,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE;QACtD,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;KAC7C;IAED,IAAI,OAAO,GAAS,QAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACzC,IAAI,SAAS,CAAC;IACd,IAAI,OAAO,EAAE;QACX,SAAS,GAAG,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC;QACzC,IAAI,MAAM,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;QAC9B,IAAI,MAAM,CAAC,IAAI,EAAE;YACf,OAAO,MAAM,CAAC,KAAK,CAAC;SACrB;KACF;IAED,IAAI,QAAQ,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC,SAAqB,EAAE,KAAa,EAAE,EAAE;QACxE,IAAI,SAAS,CAAC,IAAI,KAAK,MAAM,IAAI,OAAO,SAAS,CAAC,IAAI,KAAK,QAAQ,EAAE;YACnE,OAAO,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;SACtC;aAAM;YACL,OAAO,MAAM,CAAC,QAAQ,EAAE,SAAS,EAAE,KAAK,CAAC,CAAC;SAC3C;IACH,CAAC,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IAEZ,IAAI,SAAS,EAAE;QACb,OAAO,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,KAAK,CAAC;KACvC;SAAM;QACL,OAAO,QAAQ,CAAC;KACjB;AACH,CAAC;AAED,MAAM,CAAC,OAAO;IAIZ;QACE,IAAI,CAAC,KAAK,GAAG,EAAE,CAAC;IAClB,CAAC;IAED,IAAI,CAAC,IAAY;QACf,IAAI,IAAI,CAAC,KAAK,CAAC,cAAc,EAAE;YAC7B,OAAO,IAAI,CAAC;SACb;QACD,OAAO,iBAAiB,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;IAC/D,CAAC;IAQD,CAAC,MAAM,CAAC,IAAgB;QACtB,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3C,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO,MAAM,GAAG,KAAK,CAAC;SACvB;aAAM;YACL,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI;gBAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,QAAQ,EAAE;gBACjC,OAAO,GAAG,MAAM,KAAK,IAAI,KAAK,KAAK,EAAE,CAAC;aACvC;YACD,OAAO,GAAG,MAAM,KAAK,IAAI,KAAK,KAAK,EAAE,CAAC;SACvC;IACH,CAAC;IAQD,CAAC,YAAY;QACX,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,IAAI,KAAK,GAAa,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACvC,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,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;YACrB,KAAK,IAAI,IAAI,CAAC;SACf;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAWD,CAAC,SAAS,CAAC,IAAgB;QACzB,IAAI,OAAO,GAAG,KAAK,CAAC;QACpB,IAAI,KAAK,GAAG,IAAI,KAAK,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAG3D,IAAI,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE;YAChC,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,CAAC,EAAE;gBAC/B,OAAO,GAAG,OAAO,UAAU,CAAC;aAC7B;iBAAM,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,CAAC,EAAE;gBACtC,OAAO,GAAG,OAAO,UAAU,CAAC;aAC7B;SACF;QACD,OAAO,GAAG,KAAK,IAAI,OAAO,IAAI,CAAC;IACjC,CAAC;IAOD,CAAC,iBAAiB;QAChB,OAAO,OAAO,CAAC;IACjB,CAAC;IAMD,CAAC,OAAO,CAAC,IAAgB;QACvB,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;YACzB,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACvD,OAAO,KAAK,IAAI,CAAC,UAAU,CAAC,WAAW,KAAK,IAAI,CAAC,UAAU,CAAC,GAAG,KAAK,KAAK,IAAI,CAAC;SAC/E;QACD,OAAO,KAAK,IAAI,CAAC,UAAU,CAAC,WAAW,KAAK,IAAI,CAAC,UAAU,CAAC,GAAG,GAAG,CAAC;IACrE,CAAC;IAKD,CAAC,QAAQ,CAAC,IAAgB;QAGxB,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1C,IAAI,CAAC,KAAK,CAAC,YAAY,GAAG,IAAI,CAAC;QAE/B,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3C,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAEnB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;YACrB,OAAO,MAAM,GAAG,KAAK,CAAC;SACvB;aAAM;YACL,IAAI,MAAM,GAAG,KAAK,CAAC,YAAY,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC;YAC5C,IAAI,IAAI,CAAC,MAAM,IAAI,CAAC,IAAI,CAAC,QAAQ,IAAI,CAAC,IAAI,CAAC,IAAI;gBAC3C,IAAI,CAAC,MAAM,CAAC,IAAI,KAAK,MAAM,EAAE;gBAC/B,MAAM,GAAG,GAAG,CAAC;aACd;YACD,OAAO,GAAG,MAAM,GAAG,MAAM,GAAG,IAAI,GAAG,MAAM,GAAG,KAAK,EAAE,CAAC;SACrD;IACH,CAAC;IAMD,CAAC,YAAY;QACX,OAAO,MAAM,CAAC;IAChB,CAAC;IAKD,CAAC,MAAM,CAAC,IAAgB;QACtB,IAAI,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;QAC3C,IAAI,GAAG,GAAG,eAAe,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;QAC/C,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,EAAE;YACzB,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;YACvD,OAAO,GAAG,MAAM,IAAI,IAAI,KAAK,GAAG,KAAK,KAAK,KAAK,KAAK,EAAE,CAAC;SACxD;QACD,OAAO,GAAG,MAAM,IAAI,IAAI,KAAK,GAAG,IAAI,KAAK,EAAE,CAAC;IAC9C,CAAC;IASD,CAAC,MAAM,CAAC,IAAgB;QACtB,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAEpE,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAEnB,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,OAAO,EAAE;YACrC,IAAI,GAAG,IAAI,GAAG,IAAI,CAAC;YACnB,IAAI,IAAI,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,IAAI,EAAE,CAAC;YACtC,IAAI,QAAQ,GAAG,IAAI,CAAC;YACpB,IAAI,IAAI,CAAC,KAAK,CAAC,MAAM,IAAI,IAAI,CAAC,IAAI,EAAE;gBAClC,QAAQ,IAAI,IAAI,CAAC;aAClB;YAED,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE;gBAC9B,OAAO,MAAM,IAAI,GAAG,IAAI,MAAM,QAAQ,EAAE,CAAC;aAC1C;iBAAM;gBACL,OAAO,SAAS,IAAI,GAAG,IAAI,SAAS,QAAQ,EAAE,CAAC;aAChD;SACF;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,OAAO,EAAE;YAC5C,OAAO,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;SAChF;aAAM;YAGL,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;gBACrB,OAAO,KAAK,CAAC;aAId;iBAAM;gBACL,IAAI,SAAS,GAAG,GAAG,CAAC,MAAM,CAAC,4BAA4B,CAAC,IAAI,CAAC,CAAC,CAAC;gBAC/D,OAAO,GAAG,SAAS,GAAG,IAAI,GAAG,SAAS,EAAE,CAAC;aAC1C;SACF;IACH,CAAC;IAED,CAAC,MAAM,CAAC,IAAgB;QACtB,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAC1C,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,cAAc,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC;QAEpE,IAAI,IAAI,GAAG,KAAK,CAAC;QAEjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QAEnB,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,OAAO,EAAE;YACpC,OAAO,IAAI,GAAG,IAAI,CAAC;SACpB;QACD,OAAO,IAAI,CAAC;IACd,CAAC;IAKD,CAAC,WAAW;QACV,IAAI,KAAK,GAAW,IAAI,CAAC,KAAK,CAAC,KAAK,CAAC;QACrC,IAAI,SAAS,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC;QACrC,IAAI,MAAM,GAAW,SAAS,CAAC;QAC/B,IAAI,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,UAAU,EAAE;YAClC,MAAM,GAAG,GAAG,KAAK,GAAG,SAAS,EAAE,CAAC;YAChC,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;SACpB;QAED,IAAI,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC3C,IAAI,IAAI,GAAW,KAAK,CAAC;QACzB,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;QAEnH,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;YACpB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;SACxC;QAOD,IAAI,IAAI,CAAC,KAAK,CAAC,qBAAqB,EAAE;YACpC,OAAO,IAAI,MAAM,OAAO,IAAI,EAAE,CAAC;SAChC;QACD,OAAO,GAAG,MAAM,IAAI,IAAI,EAAE,CAAC;IAC7B,CAAC;IAOD,CAAC,MAAM,CAAC,IAAgB;QACtB,IAAI,KAAK,GAAG,CAAC,CAAC;QAEd,IAAI,IAAI,CAAC,UAAU,CAAC,QAAQ,IAAI,IAAI,EAAE;YACpC,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;SAClC;QAED,IAAI,SAAS,GAAG,EAAE,CAAC;QACnB,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,UAAU,EAAE;YACvC,SAAS,GAAG,GAAG,CAAC;YAEhB,IAAI,IAAI,CAAC,QAAQ;gBACb,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM;gBAC7B,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,KAAK,UAAU;gBAC5C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,KAAK,GAAG,EAAE;gBAC9C,SAAS,GAAG,GAAG,CAAC;aACjB;SACF;aAAM,IAAI,IAAI,CAAC,UAAU,CAAC,IAAI,KAAK,UAAU,EAAE;YAC9C,SAAS,GAAG,GAAG,CAAC;YAEhB,IAAI,IAAI,CAAC,QAAQ;gBACb,IAAI,CAAC,QAAQ,CAAC,IAAI,KAAK,MAAM;gBAC7B,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,IAAI,KAAK,UAAU;gBAC5C,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC,SAAS,KAAK,GAAG,EAAE;gBAC9C,SAAS,GAAG,GAAG,CAAC;aACjB;SACF;QACD,IAAI,CAAC,UAAU,CAAC,SAAS,GAAG,SAAS,CAAC;QAEtC,IAAI,KAAK,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;QAG1C,IAAI,qBAAqB,GAAG,IAAI,CAAC,IAAI;YACT,IAAI,CAAC,IAAI,CAAC,IAAI,KAAK,MAAM;YACzB,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC,KAAK,KAAK,OAAO,CAAC;QACnE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,EAAE;YACxB,MAAM,EAAE,IAAI;YACZ,IAAI,EAAE,IAAI,CAAC,UAAU,CAAC,IAAI;YAC1B,KAAK,EAAE,KAAK;YACZ,SAAS;YACT,KAAK,EAAE,IAAI,CAAC,UAAU,CAAC,KAAK;YAC5B,qBAAqB;SACtB,CAAC,CAAC;QAEH,IAAI,IAAI,GAAG,KAAK,CAAC;QAEjB,IAAI,CAAC,KAAK,GAAG,KAAK,CAAC;QACnB,OAAO,IAAI,GAAG,IAAI,CAAC;IACrB,CAAC;IAKD,CAAC,WAAW;QACV,IAAI,IAAI,GAAG,KAAK,CAAC;QACjB,IAAI,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE;YACpB,OAAO,IAAI,GAAG,IAAI,CAAC;SACpB;QACD,OAAO,IAAI,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,QAAkB;QACvB,IAAI,KAAK,GAAG,IAAI,GAAG,CAAC,QAAQ,CAAC,CAAC;QAC9B,OAAO,MAAM,CAAC,IAAI,EAAE,qBAAqB,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACvE,CAAC;CACF"}

package.json

 {
   "name": "@atjson/renderer-commonmark",
-  "version": "0.7.12",
+  "version": "0.7.13",
   "description": "A brand new TypeScript library.",
@@ -10,3 +10,3 @@ "main": "dist/commonjs/index.js",
     "prepublish": "npm run build",
-    "build": "rm -rf dist; tsc -p . & tsc -p . --module ESNext --outDir dist/modules/ --target ES2017; exit 0",
+    "build": "rm -rf dist; tsc -p . & tsc -p . --module ESNext --outDir dist/modules/ --target ES2017",
     "test": "../../node_modules/jest/bin/jest.js packages/$(basename $PWD) --config=../../package.json"
@@ -19,9 +19,12 @@ },
   "devDependencies": {
-    "@atjson/document": "^0.7.12",
-    "@atjson/hir": "^0.7.12",
-    "@atjson/source-commonmark": "^0.7.12",
+    "@atjson/source-commonmark": "^0.7.13",
     "commonmark-spec": "^0.28.0",
+    "markdown-it": "^8.4.1",
     "tslint": "^5.9.1",
     "typescript": "^2.6.2"
+  },
+  "dependencies": {
+    "@atjson/document": "^0.7.13",
+    "@atjson/hir": "^0.7.13"
   }
 }

src/index.ts

 import Document from '@atjson/document';
 import { HIR, HIRNode } from '@atjson/hir';
-import Renderer, { State } from '@atjson/renderer-hir';
 
-export function* split(): IterableIterator<string> {
+export function* split(): Iterable<any> {
   let text = yield;
@@ -56,21 +55,43 @@ let start = 0;
 
-function render(renderer: CommonMarkRenderer, node: HIRNode, parent?: HIRNode, index?: number): string {
-  if (index > 0) {
-    node.previous = parent.children[index - 1];
-  } else {
-    node.previous = null;
+export interface Annotation {
+  type: string;
+  attributes?: any;
+  previous: Annotation | null;
+  next: Annotation | null;
+  parent: Annotation | null;
+  text?: string;
+  children: Annotation[];
+}
+
+function hirNodeToMarkdownNode(node: HIRNode, parent: Annotation | null): Annotation {
+  let markdownNode: Annotation = {
+    type: node.type,
+    attributes: node.attributes,
+    parent,
+    previous: null,
+    next: null,
+    text: node.text,
+    children: []
+  };
+
+  markdownNode.children.push(...node.children().map((childNode: HIRNode) => {
+    return hirNodeToMarkdownNode(childNode, markdownNode);
+  }));
+
+  return markdownNode;
+}
+
+function render(renderer: CommonmarkRenderer, node: Annotation, index: number): string {
+  if (node.parent && index > 0) {
+    node.previous = node.parent.children[index - 1];
   }
 
-  if (parent && index < parent.children.length) {
-    node.next = parent.children[index + 1];
-  } else {
-    node.next = null;
+  if (node.parent && index < node.parent.children.length) {
+    node.next = node.parent.children[index + 1];
   }
 
-  node.parent = parent;
-  node.children = node.children();
-
+  let factory = (<any>renderer)[node.type];
   let generator;
-  if (renderer[node.type]) {
-    generator = renderer[node.type](node, parent);
+  if (factory) {
+    generator = factory.call(renderer, node);
     let result = generator.next();
@@ -82,7 +103,7 @@ if (result.done) {
 
-  let fragment = node.children.map((childNode: HIRNode, idx: number) => {
+  let fragment = node.children.map((childNode: Annotation, index: number) => {
     if (childNode.type === 'text' && typeof childNode.text === 'string') {
       return renderer.text(childNode.text);
     } else {
-      return render(renderer, childNode, node, idx);
+      return render(renderer, childNode, index);
     }
@@ -119,3 +140,3 @@ }).join('');
    */
-  *'bold'(node: HIRNode): IterableIterator<string> {
+  *'bold'(node: Annotation): Iterable<any> {
     let [before, text, after] = yield* split();
@@ -139,3 +160,3 @@ if (text.length === 0) {
    */
-  *'blockquote'(): IterableIterator<string> {
+  *'blockquote'(): Iterable<any> {
     let text = yield;
@@ -166,3 +187,3 @@ let lines: string[] = text.split('\n');
    */
-  *'heading'(node: HIRNode): IterableIterator<string> {
+  *'heading'(node: Annotation): Iterable<any> {
     let heading = yield;
@@ -187,3 +208,3 @@ let level = new Array(node.attributes.level + 1).join('#');
    */
-  *'horizontal-rule'(): IterableIterator<string> {
+  *'horizontal-rule'(): Iterable<any> {
     return '***\n';
@@ -196,3 +217,3 @@ }
    */
-  *'image'(node: HIRNode): IterableIterator<string> {
+  *'image'(node: Annotation): Iterable<any> {
     if (node.attributes.title) {
@@ -208,3 +229,3 @@ let title = node.attributes.title.replace(/"/g, '\\"');
    */
-  *'italic'(node: HIRNode): IterableIterator<string> {
+  *'italic'(node: Annotation): Iterable<any> {
     // This adds support for strong emphasis (per Commonmark)
@@ -234,3 +255,3 @@ // Strong emphasis includes _*two*_ emphasis markers around text.
    */
-  *'line-break'(): IterableIterator<string> {
+  *'line-break'(): Iterable<any> {
     return '  \n';
@@ -242,3 +263,3 @@ }
    */
-  *'link'(node: HIRNode): IterableIterator<string> {
+  *'link'(node: Annotation): Iterable<any> {
     let [before, text, after] = yield* split();
@@ -260,3 +281,3 @@ let url = escapeAttribute(node.attributes.url);
    */
-  *'code'(node: HIRNode): IterableIterator<string> {
+  *'code'(node: Annotation): Iterable<any> {
     let state = Object.assign({}, this.state);
@@ -298,3 +319,3 @@ Object.assign(this.state, { isPreformatted: true, htmlSafe: true });
 
-  *'html'(node: HIRNode): IterableIterator<string> {
+  *'html'(node: Annotation): Iterable<any> {
     let state = Object.assign({}, this.state);
@@ -316,3 +337,3 @@ Object.assign(this.state, { isPreformatted: true, htmlSafe: true });
    */
-  *'list-item'(node: HIRNode, state: State): IterableIterator<string> {
+  *'list-item'(): Iterable<any> {
     let digit: number = this.state.digit;
@@ -358,3 +379,3 @@ let delimiter = this.state.delimiter;
    */
-  *'list'(node: HIRNode): IterableIterator<string> {
+  *'list'(node: Annotation): Iterable<any> {
     let start = 1;
@@ -373,3 +394,3 @@
           node.previous.attributes.type === 'numbered' &&
-          node.previous.delimiter === '.') {
+          node.previous.attributes.delimiter === '.') {
         delimiter = ')';
@@ -383,7 +404,7 @@ }
           node.previous.attributes.type === 'bulleted' &&
-          node.previous.delimiter === '-') {
+          node.previous.attributes.delimiter === '-') {
         delimiter = '+';
       }
     }
-    node.delimiter = delimiter;
+    node.attributes.delimiter = delimiter;
 
@@ -414,3 +435,3 @@ let state = Object.assign({}, this.state);
    */
-  *'paragraph'(): IterableIterator<string> {
+  *'paragraph'(): Iterable<any> {
     let text = yield;
@@ -421,8 +442,8 @@ if (this.state.tight) {
     return text + '\n\n';
-  },
+  }
 
   render(document: Document): string {
     let graph = new HIR(document);
-    return render(this, graph.rootNode);
+    return render(this, hirNodeToMarkdownNode(graph.rootNode, null), -1);
   }
 }

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

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

64039

increased by64.34%

Dev dependency count

5

decreased by-16.67%

Number of package files

7

increased by40%

Lines of code

1044

increased by55.36%

Worsened metrics

Dependency count

2

increased byInfinity%

Dependency changes

• + Added@atjson/document@^0.7.13

• + Added@atjson/hir@^0.7.13

• + Added@atjson/document@0.7.16(transitive)

• + Added@atjson/hir@0.7.16(transitive)