@atjson/renderer-commonmark - npm Package Compare versions

Comparing version 0.6.5 to 0.7.1

dist/commonjs/index.js

@@ -22,12 +22,48 @@ "use strict";
 exports.split = split;
+function escapePunctuation(text) {
+    return text.replace(/([#$%'"!()*+,=?@\\\[\]\^_`{|}~-])/g, '\\$1')
+        .replace(/(\d+)\./g, '$1\\.')
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;');
+}
+function escapeAttribute(text) {
+    return text.replace(/\(/g, '\\(')
+        .replace(/\)/g, '\\)');
+}
+function getNumberOfRequiredBackticks(text) {
+    let index = 0;
+    let counts = [0];
+    for (let i = 0, len = text.length; i < len; i++) {
+        if (text[i] === '`') {
+            counts[index] = counts[index] + 1;
+        }
+        else if (counts[index] !== 0) {
+            counts.push(0);
+            index++;
+        }
+    }
+    return counts.sort().reduce((result, count) => {
+        if (count === result) {
+            return result + 1;
+        }
+        return result;
+    }, 1);
+}
 class CommonmarkRenderer extends renderer_hir_1.default {
+    renderText(text, state) {
+        if (state.get('isPreformatted')) {
+            return text;
+        }
+        return escapePunctuation(text).replace(/\u00A0/gu, '&nbsp;');
+    }
     *'root'() {
         let document = yield;
-        return document.join('').trimRight();
+        return document.join('');
     }
     *'bold'() {
         let [before, text, after] = yield* split();
-        return `${before}__${text}__${after}`;
+        return `${before}**${text}**${after}`;
     }
-    *'blockquote'() {
+    *'blockquote'(_, state) {
         let text = yield;
@@ -37,25 +73,43 @@ let lines = text.join('').split('\n');
         let startOfQuote = 0;
-        while (lines[startOfQuote].match(/^(\s)*$/))
+        while (startOfQuote < endOfQuote - 1 && lines[startOfQuote].match(/^\s*$/))
             startOfQuote++;
-        while (lines[endOfQuote - 1].match(/^(\s)*$/))
+        while (endOfQuote > startOfQuote + 1 && lines[endOfQuote - 1].match(/^\s*$/))
             endOfQuote--;
-        return [
-            ...lines.slice(startOfQuote, endOfQuote).map(line => `> ${line}`),
-            '\n'
-        ].join('\n');
+        let quote = lines.slice(startOfQuote, endOfQuote).map(line => `> ${line}`).join('\n') + '\n';
+        if (!state.get('tight')) {
+            quote += '\n';
+        }
+        return quote;
     }
     *'heading'(props) {
-        let heading = yield;
+        let text = yield;
         let level = new Array(props.level + 1).join('#');
-        return `${level} ${heading.join('')}\n\n`;
+        let heading = text.join('');
+        if (heading.indexOf('\n') !== -1) {
+            if (props.level === 1) {
+                return `${heading}\n====\n`;
+            }
+            else if (props.level === 2) {
+                return `${heading}\n----\n`;
+            }
+        }
+        return `${level} ${heading}\n`;
     }
     *'horizontal-rule'() {
-        return '---\n\n';
+        return '***\n';
     }
     *'image'(props) {
+        if (props.title) {
+            let title = props.title.replace(/"/g, '\\"');
+            return `![${props.alt}](${props.url} "${title}")`;
+        }
         return `![${props.alt}](${props.url})`;
     }
-    *'italic'() {
+    *'italic'(_, state) {
+        let isItalicized = state.get('isItalicized');
+        state.set('isItalicized', true);
         let [before, text, after] = yield* split();
-        return `${before}*${text}*${after}`;
+        state.set('isItalicized', isItalicized);
+        let markup = isItalicized ? '_' : '*';
+        return `${before}${markup}${text}${markup}${after}`;
     }
@@ -67,75 +121,143 @@ *'line-break'() {
         let [before, text, after] = yield* split();
-        return `${before}[${text}](${props.href})${after}`;
+        let href = escapeAttribute(props.href);
+        if (props.title) {
+            let title = props.title.replace(/"/g, '\\"');
+            return `${before}[${text}](${href} "${title}")${after}`;
+        }
+        return `${before}[${text}](${href})${after}`;
     }
+    *'code'(props, state) {
+        state.push({ isPreformatted: true, htmlSafe: false });
+        let text = yield;
+        state.pop();
+        let code = text.join('');
+        if (props.style === 'fence') {
+            code = '\n' + code;
+            let info = props.info || '';
+            let newlines = '\n';
+            if (state.get('isList') && state.get('nextAnnotation')) {
+                newlines += '\n';
+            }
+            if (code.indexOf('```') !== -1) {
+                return `~~~${info}${code}~~~${newlines}`;
+            }
+            else {
+                return `\`\`\`${info}${code}\`\`\`${newlines}`;
+            }
+        }
+        else if (props.style === 'block') {
+            return code.split('\n').map(line => `    ${line}`).join('\n') + '\n';
+        }
+        else {
+            if (code.length === 0) {
+                return '` `';
+            }
+            else {
+                let backticks = '`'.repeat(getNumberOfRequiredBackticks(code));
+                return `${backticks}${code}${backticks}`;
+            }
+        }
+    }
+    *'html'(props, state) {
+        state.push({ isPreformatted: true, htmlSafe: true });
+        let text = yield;
+        state.pop();
+        let html = text.join('');
+        if (props.type === 'block') {
+            return html + '\n';
+        }
+        return html;
+    }
     *'list-item'(_, state) {
-        let indent = '   '.repeat(state.get('indent'));
-        let rawItem = yield;
-        let index = state.get('index');
-        let item = rawItem.join('').split('\n').map(line => indent + line).join('\n').trim();
-        if (state.get('type') === 'ordered-list') {
-            item = `${indent}${index}. ${item}`;
-            state.set('index', index + 1);
+        let digit = state.get('digit');
+        let delimiter = state.get('delimiter');
+        let marker = delimiter;
+        if (state.get('type') === 'numbered') {
+            marker = `${digit}${delimiter}`;
+            state.set('digit', digit + 1);
         }
-        else if (state.get('type') === 'unordered-list') {
-            item = `${indent}- ${item}`;
+        let indent = ' '.repeat(marker.length + 1);
+        let text = yield;
+        let item = text.join('');
+        let firstCharacter = 0;
+        while (item[firstCharacter] === ' ')
+            firstCharacter++;
+        let lines = item.split('\n');
+        lines.push(lines.pop().replace(/[ ]+$/, ''));
+        lines.unshift(lines.shift().replace(/^[ ]+/, ''));
+        let [first, ...rest] = lines;
+        item = ' '.repeat(firstCharacter) + first + '\n' + rest.map(line => indent + line).join('\n').replace(/[ ]+$/, '');
+        if (state.get('hasCodeBlockFollowing')) {
+            return ` ${marker}    ${item}`;
         }
-        return item;
+        return `${marker} ${item}`;
     }
-    *'ordered-list'(_, state) {
-        let indent = state.get('indent');
-        if (indent == null) {
-            indent = -1;
+    *'ordered-list'(props, state) {
+        let start = 1;
+        if (props && props.start != null) {
+            start = props.start;
         }
+        let delimiter = '.';
+        if (state.get('previous.type') === 'numbered' && state.get('previous.delimiter') === '.') {
+            delimiter = ')';
+        }
+        let hasCodeBlockFollowing = state.get('nextAnnotation.type') === 'code' &&
+            state.get('nextAnnotation.attributes.style') === 'block';
         state.push({
-            type: 'ordered-list',
-            indent: indent + 1,
-            index: 1
+            isList: true,
+            type: 'numbered',
+            digit: start,
+            previous: state.get('previous'),
+            delimiter,
+            hasCodeBlockFollowing,
+            tight: props && props.tight
         });
         let list = yield;
         state.pop();
-        let markdown = `${list.join('\n')}\n\n`;
-        if (state.get('type') === 'ordered-list' ||
-            state.get('type') === 'unordered-list') {
-            return `\n${markdown}`;
+        if (props && props.tight) {
+            list = list.map(item => item.replace(/([ \n])+$/, '\n'));
         }
-        return markdown;
+        state.set('previous', {
+            isList: true,
+            type: 'numbered',
+            delimiter
+        });
+        return list.join('') + '\n';
     }
-    *'unordered-list'(_, state) {
-        let indent = state.get('indent');
-        if (indent == null) {
-            indent = -1;
+    *'unordered-list'(props, state) {
+        let delimiter = '-';
+        if (state.get('previous.type') === 'bulleted' && state.get('previous.delimiter') === '-') {
+            delimiter = '+';
         }
+        let hasCodeBlockFollowing = state.get('nextAnnotation.type') === 'code' &&
+            state.get('nextAnnotation.attributes.style') === 'block';
         state.push({
-            type: 'unordered-list',
-            indent: indent + 1,
+            isList: true,
+            type: 'bulleted',
+            previous: state.get('previous'),
+            delimiter,
+            tight: props && props.tight,
+            hasCodeBlockFollowing
         });
         let list = yield;
         state.pop();
-        let markdown = `${list.join('\n')}\n\n`;
-        if (state.get('type') === 'ordered-list' ||
-            state.get('type') === 'unordered-list') {
-            return `\n${markdown}`;
+        state.set('previous', {
+            isList: true,
+            type: 'bulleted',
+            delimiter
+        });
+        if (props && props.tight) {
+            list = list.map(item => item.replace(/([ \n])+$/, '\n'));
         }
-        return markdown;
+        return list.join('') + '\n';
     }
-    *'paragraph'() {
-        let rawText = yield;
-        let text = rawText.join('');
-        if (text.lastIndexOf('\n\n') === Math.max(text.length - 2, 0)) {
-            return text;
+    *'paragraph'(_, state) {
+        let text = yield;
+        if (state.get('tight')) {
+            return text.join('') + '\n';
         }
-        return `${text}\n\n`;
+        return text.join('') + '\n\n';
     }
-    *renderAnnotation(annotation, state) {
-        let rule = this[annotation.type];
-        if (rule) {
-            return yield* this[annotation.type](annotation.attributes, state);
-        }
-        else {
-            let text = yield;
-            return text.join('');
-        }
-    }
 }
 exports.default = CommonmarkRenderer;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSx1REFBdUQ7QUFFdkQsUUFBZSxDQUFDO0lBQ2QsSUFBSSxPQUFPLEdBQUcsS0FBSyxDQUFDO0lBQ3BCLElBQUksSUFBSSxHQUFHLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUM7SUFDNUIsSUFBSSxLQUFLLEdBQUcsQ0FBQyxDQUFDO0lBQ2QsSUFBSSxHQUFHLEdBQUcsSUFBSSxDQUFDLE1BQU0sQ0FBQztJQUV0QixPQUFPLElBQUksQ0FBQyxLQUFLLENBQUMsS0FBSyxHQUFHLElBQUksS0FBSyxHQUFHLEdBQUcsRUFBRSxDQUFDO1FBQUMsS0FBSyxFQUFFLENBQUM7SUFBQyxDQUFDO0lBQ3ZELE9BQU8sSUFBSSxDQUFDLEdBQUcsR0FBRyxDQUFDLENBQUMsS0FBSyxHQUFHLElBQUksR0FBRyxHQUFHLEtBQUssRUFBRSxDQUFDO1FBQUMsR0FBRyxFQUFFLENBQUM7SUFBQyxDQUFDO0lBRXZELE1BQU0sQ0FBQztRQUNMLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLEtBQUssQ0FBQztRQUNwQixJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssRUFBRSxHQUFHLENBQUM7UUFDdEIsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUM7S0FDaEIsQ0FBQztBQUNKLENBQUM7QUFkRCxzQkFjQztBQUVELHdCQUF3QyxTQUFRLHNCQUFRO0lBT3RELENBQUMsTUFBTTtRQUNMLElBQUksUUFBUSxHQUFHLEtBQUssQ0FBQztRQUNyQixNQUFNLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQyxTQUFTLEVBQUUsQ0FBQztJQUN2QyxDQUFDO0lBS0QsQ0FBQyxNQUFNO1FBQ0wsSUFBSSxDQUFDLE1BQU0sRUFBRSxJQUFJLEVBQUUsS0FBSyxDQUFDLEdBQUcsS0FBSyxDQUFDLENB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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"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"}

dist/modules/index.js

@@ -20,12 +20,48 @@ "use strict";
 }
+function escapePunctuation(text) {
+    return text.replace(/([#$%'"!()*+,=?@\\\[\]\^_`{|}~-])/g, '\\$1')
+        .replace(/(\d+)\./g, '$1\\.')
+        .replace(/&/g, '&')
+        .replace(/</g, '&lt;')
+        .replace(/>/g, '&gt;');
+}
+function escapeAttribute(text) {
+    return text.replace(/\(/g, '\\(')
+        .replace(/\)/g, '\\)');
+}
+function getNumberOfRequiredBackticks(text) {
+    let index = 0;
+    let counts = [0];
+    for (let i = 0, len = text.length; i < len; i++) {
+        if (text[i] === '`') {
+            counts[index] = counts[index] + 1;
+        }
+        else if (counts[index] !== 0) {
+            counts.push(0);
+            index++;
+        }
+    }
+    return counts.sort().reduce((result, count) => {
+        if (count === result) {
+            return result + 1;
+        }
+        return result;
+    }, 1);
+}
 export default class CommonmarkRenderer extends Renderer {
+    renderText(text, state) {
+        if (state.get('isPreformatted')) {
+            return text;
+        }
+        return escapePunctuation(text).replace(/\u00A0/gu, '&nbsp;');
+    }
     *'root'() {
         let document = yield;
-        return document.join('').trimRight();
+        return document.join('');
     }
     *'bold'() {
         let [before, text, after] = yield* split();
-        return `${before}__${text}__${after}`;
+        return `${before}**${text}**${after}`;
     }
-    *'blockquote'() {
+    *'blockquote'(_, state) {
         let text = yield;
@@ -35,25 +71,43 @@ let lines = text.join('').split('\n');
         let startOfQuote = 0;
-        while (lines[startOfQuote].match(/^(\s)*$/))
+        while (startOfQuote < endOfQuote - 1 && lines[startOfQuote].match(/^\s*$/))
             startOfQuote++;
-        while (lines[endOfQuote - 1].match(/^(\s)*$/))
+        while (endOfQuote > startOfQuote + 1 && lines[endOfQuote - 1].match(/^\s*$/))
             endOfQuote--;
-        return [
-            ...lines.slice(startOfQuote, endOfQuote).map(line => `> ${line}`),
-            '\n'
-        ].join('\n');
+        let quote = lines.slice(startOfQuote, endOfQuote).map(line => `> ${line}`).join('\n') + '\n';
+        if (!state.get('tight')) {
+            quote += '\n';
+        }
+        return quote;
     }
     *'heading'(props) {
-        let heading = yield;
+        let text = yield;
         let level = new Array(props.level + 1).join('#');
-        return `${level} ${heading.join('')}\n\n`;
+        let heading = text.join('');
+        if (heading.indexOf('\n') !== -1) {
+            if (props.level === 1) {
+                return `${heading}\n====\n`;
+            }
+            else if (props.level === 2) {
+                return `${heading}\n----\n`;
+            }
+        }
+        return `${level} ${heading}\n`;
     }
     *'horizontal-rule'() {
-        return '---\n\n';
+        return '***\n';
     }
     *'image'(props) {
+        if (props.title) {
+            let title = props.title.replace(/"/g, '\\"');
+            return `![${props.alt}](${props.url} "${title}")`;
+        }
         return `![${props.alt}](${props.url})`;
     }
-    *'italic'() {
+    *'italic'(_, state) {
+        let isItalicized = state.get('isItalicized');
+        state.set('isItalicized', true);
         let [before, text, after] = yield* split();
-        return `${before}*${text}*${after}`;
+        state.set('isItalicized', isItalicized);
+        let markup = isItalicized ? '_' : '*';
+        return `${before}${markup}${text}${markup}${after}`;
     }
@@ -65,74 +119,142 @@ *'line-break'() {
         let [before, text, after] = yield* split();
-        return `${before}[${text}](${props.href})${after}`;
+        let href = escapeAttribute(props.href);
+        if (props.title) {
+            let title = props.title.replace(/"/g, '\\"');
+            return `${before}[${text}](${href} "${title}")${after}`;
+        }
+        return `${before}[${text}](${href})${after}`;
     }
+    *'code'(props, state) {
+        state.push({ isPreformatted: true, htmlSafe: false });
+        let text = yield;
+        state.pop();
+        let code = text.join('');
+        if (props.style === 'fence') {
+            code = '\n' + code;
+            let info = props.info || '';
+            let newlines = '\n';
+            if (state.get('isList') && state.get('nextAnnotation')) {
+                newlines += '\n';
+            }
+            if (code.indexOf('```') !== -1) {
+                return `~~~${info}${code}~~~${newlines}`;
+            }
+            else {
+                return `\`\`\`${info}${code}\`\`\`${newlines}`;
+            }
+        }
+        else if (props.style === 'block') {
+            return code.split('\n').map(line => `    ${line}`).join('\n') + '\n';
+        }
+        else {
+            if (code.length === 0) {
+                return '` `';
+            }
+            else {
+                let backticks = '`'.repeat(getNumberOfRequiredBackticks(code));
+                return `${backticks}${code}${backticks}`;
+            }
+        }
+    }
+    *'html'(props, state) {
+        state.push({ isPreformatted: true, htmlSafe: true });
+        let text = yield;
+        state.pop();
+        let html = text.join('');
+        if (props.type === 'block') {
+            return html + '\n';
+        }
+        return html;
+    }
     *'list-item'(_, state) {
-        let indent = '   '.repeat(state.get('indent'));
-        let rawItem = yield;
-        let index = state.get('index');
-        let item = rawItem.join('').split('\n').map(line => indent + line).join('\n').trim();
-        if (state.get('type') === 'ordered-list') {
-            item = `${indent}${index}. ${item}`;
-            state.set('index', index + 1);
+        let digit = state.get('digit');
+        let delimiter = state.get('delimiter');
+        let marker = delimiter;
+        if (state.get('type') === 'numbered') {
+            marker = `${digit}${delimiter}`;
+            state.set('digit', digit + 1);
         }
-        else if (state.get('type') === 'unordered-list') {
-            item = `${indent}- ${item}`;
+        let indent = ' '.repeat(marker.length + 1);
+        let text = yield;
+        let item = text.join('');
+        let firstCharacter = 0;
+        while (item[firstCharacter] === ' ')
+            firstCharacter++;
+        let lines = item.split('\n');
+        lines.push(lines.pop().replace(/[ ]+$/, ''));
+        lines.unshift(lines.shift().replace(/^[ ]+/, ''));
+        let [first, ...rest] = lines;
+        item = ' '.repeat(firstCharacter) + first + '\n' + rest.map(line => indent + line).join('\n').replace(/[ ]+$/, '');
+        if (state.get('hasCodeBlockFollowing')) {
+            return ` ${marker}    ${item}`;
         }
-        return item;
+        return `${marker} ${item}`;
     }
-    *'ordered-list'(_, state) {
-        let indent = state.get('indent');
-        if (indent == null) {
-            indent = -1;
+    *'ordered-list'(props, state) {
+        let start = 1;
+        if (props && props.start != null) {
+            start = props.start;
         }
+        let delimiter = '.';
+        if (state.get('previous.type') === 'numbered' && state.get('previous.delimiter') === '.') {
+            delimiter = ')';
+        }
+        let hasCodeBlockFollowing = state.get('nextAnnotation.type') === 'code' &&
+            state.get('nextAnnotation.attributes.style') === 'block';
         state.push({
-            type: 'ordered-list',
-            indent: indent + 1,
-            index: 1
+            isList: true,
+            type: 'numbered',
+            digit: start,
+            previous: state.get('previous'),
+            delimiter,
+            hasCodeBlockFollowing,
+            tight: props && props.tight
         });
         let list = yield;
         state.pop();
-        let markdown = `${list.join('\n')}\n\n`;
-        if (state.get('type') === 'ordered-list' ||
-            state.get('type') === 'unordered-list') {
-            return `\n${markdown}`;
+        if (props && props.tight) {
+            list = list.map(item => item.replace(/([ \n])+$/, '\n'));
         }
-        return markdown;
+        state.set('previous', {
+            isList: true,
+            type: 'numbered',
+            delimiter
+        });
+        return list.join('') + '\n';
     }
-    *'unordered-list'(_, state) {
-        let indent = state.get('indent');
-        if (indent == null) {
-            indent = -1;
+    *'unordered-list'(props, state) {
+        let delimiter = '-';
+        if (state.get('previous.type') === 'bulleted' && state.get('previous.delimiter') === '-') {
+            delimiter = '+';
         }
+        let hasCodeBlockFollowing = state.get('nextAnnotation.type') === 'code' &&
+            state.get('nextAnnotation.attributes.style') === 'block';
         state.push({
-            type: 'unordered-list',
-            indent: indent + 1,
+            isList: true,
+            type: 'bulleted',
+            previous: state.get('previous'),
+            delimiter,
+            tight: props && props.tight,
+            hasCodeBlockFollowing
         });
         let list = yield;
         state.pop();
-        let markdown = `${list.join('\n')}\n\n`;
-        if (state.get('type') === 'ordered-list' ||
-            state.get('type') === 'unordered-list') {
-            return `\n${markdown}`;
+        state.set('previous', {
+            isList: true,
+            type: 'bulleted',
+            delimiter
+        });
+        if (props && props.tight) {
+            list = list.map(item => item.replace(/([ \n])+$/, '\n'));
         }
-        return markdown;
+        return list.join('') + '\n';
     }
-    *'paragraph'() {
-        let rawText = yield;
-        let text = rawText.join('');
-        if (text.lastIndexOf('\n\n') === Math.max(text.length - 2, 0)) {
-            return text;
+    *'paragraph'(_, state) {
+        let text = yield;
+        if (state.get('tight')) {
+            return text.join('') + '\n';
         }
-        return `${text}\n\n`;
+        return text.join('') + '\n\n';
     }
-    *renderAnnotation(annotation, state) {
-        let rule = this[annotation.type];
-        if (rule) {
-            return yield* this[annotation.type](annotation.attributes, state);
-        }
-        else {
-            let text = yield;
-            return text.join('');
-        }
-    }
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUNBLE9BQU8sUUFBbUIsTUFBTSxzQkFBc0IsQ0FBQztBQUV2RCxNQUFNLFNBQVMsQ0FBQztJQUNkLElBQUksT0FBTyxHQUFHLEtBQUssQ0FBQztJQUNwQixJQUFJLElBQUksR0FBRyxPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FBQyxDQUFDO0lBQzVCLElBQUksS0FBSyxHQUFHLENBQUMsQ0FBQztJQUNkLElBQUksR0FBRyxHQUFHLElBQUksQ0FBQyxNQUFNLENBQUM7SUFFdEIsT0FBTyxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssR0FBRyxJQUFJLEtBQUssR0FBRyxHQUFHLEVBQUUsQ0FBQztRQUFDLEtBQUssRUFBRSxDQUFDO0lBQUMsQ0FBQztJQUN2RCxPQUFPLElBQUksQ0FBQyxHQUFHLEdBQUcsQ0FBQyxDQUFDLEtBQUssR0FBRyxJQUFJLEdBQUcsR0FBRyxLQUFLLEVBQUUsQ0FBQztRQUFDLEdBQUcsRUFBRSxDQUFDO0lBQUMsQ0FBQztJQUV2RCxNQUFNLENBQUM7UUFDTCxJQUFJLENBQUMsS0FBSyxDQUFDLENBQUMsRUFBRSxLQUFLLENBQUM7UUFDcEIsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLEVBQUUsR0FBRyxDQUFDO1FBQ3RCLElBQUksQ0FBQyxLQUFLLENBQUMsR0FBRyxDQUFDO0tBQ2hCLENBQUM7QUFDSixDQUFDO0FBRUQsTUFBTSxDQUFDLE9BQU8seUJBQTBCLFNBQVEsUUFBUTtJQU90RCxDQUFDLE1BQU07UUFDTCxJQUFJLFFBQVEsR0FBRyxLQUFLLENBQUM7UUFDckIsTUFBTSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsRUFBRSxDQUFDLENBQUMsU0FBUyxFQUFFLENBQUM7SUFDdkMsQ0FBQztJQUtELENBQUMsTUFBTTtRQUNMLElBQUksQ0FBQyxNQUFNLEVBQUUsSUFBSSxFQUFF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
+//# 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.6.5",
+  "version": "0.7.1",
   "description": "A brand new TypeScript library.",
@@ -18,10 +18,12 @@ "main": "dist/commonjs/index.js",
   "devDependencies": {
-    "@atjson/core": "^0.5.12",
-    "@atjson/hir": "^0.5.17",
-    "tslint": "^5.7.0",
-    "typescript": "^2.4.2"
+    "@atjson/document": "^0.7.0",
+    "@atjson/hir": "^0.7.0",
+    "@atjson/source-commonmark": "^0.7.1",
+    "commonmark-spec": "^0.28.0",
+    "tslint": "^5.9.1",
+    "typescript": "^2.6.2"
   },
   "dependencies": {
-    "@atjson/renderer-hir": "^0.5.20"
+    "@atjson/renderer-hir": "^0.7.0"
   }
 }

src/index.ts

@@ -20,4 +20,47 @@ import { HIRNode } from '@atjson/hir';
 
+type CodeStyle = 'block' | 'inline' | 'fence';
+
+// http://spec.commonmark.org/0.28/#backslash-escapes
+function escapePunctuation(text: string) {
+  return text.replace(/([#$%'"!()*+,=?@\\\[\]\^_`{|}~-])/g, '\\$1')
+             .replace(/(\d+)\./g, '$1\\.')
+             .replace(/&/g, '&')
+             .replace(/</g, '&lt;')
+             .replace(/>/g, '&gt;');
+}
+
+function escapeAttribute(text: string) {
+  return text.replace(/\(/g, '\\(')
+             .replace(/\)/g, '\\)');
+}
+
+function getNumberOfRequiredBackticks(text: string) {
+  let index = 0;
+  let counts = [0];
+  for (let i = 0, len = text.length; i < len; i++) {
+    if (text[i] === '`') {
+      counts[index] = counts[index] + 1;
+    } else if (counts[index] !== 0) {
+      counts.push(0);
+      index++;
+    }
+  }
+
+  return counts.sort().reduce((result, count) => {
+    if (count === result) {
+      return result + 1;
+    }
+    return result;
+  }, 1);
+}
+
 export default class CommonmarkRenderer extends Renderer {
 
+  renderText(text: string, state: State) {
+    if (state.get('isPreformatted')) {
+      return text;
+    }
+    return escapePunctuation(text).replace(/\u00A0/gu, '&nbsp;');
+  }
+
   /**
@@ -30,11 +73,14 @@ * The root allows us to normalize the document
     let document = yield;
-    return document.join('').trimRight();
+    return document.join('');
   }
 
   /**
-   * Bold text looks like __this__ in Markdown.
+   * Bold text looks like **this** in Markdown.
+   *
+   * Asterisks are used here because they can split
+   * words; underscores cannot split words.
    */
   *'bold'(): IterableIterator<string> {
     let [before, text, after] = yield* split();
-    return `${before}__${text}__${after}`;
+    return `${before}**${text}**${after}`;
   }
@@ -48,3 +94,3 @@
    */
-  *'blockquote'(): IterableIterator<string> {
+  *'blockquote'(_, state: State): IterableIterator<string> {
     let text: string[] = yield;
@@ -55,9 +101,11 @@ let lines: string[] = text.join('').split('\n');
 
-    while (lines[startOfQuote].match(/^(\s)*$/)) startOfQuote++;
-    while (lines[endOfQuote - 1].match(/^(\s)*$/)) endOfQuote--;
+    while (startOfQuote < endOfQuote - 1 && lines[startOfQuote].match(/^\s*$/)) startOfQuote++;
+    while (endOfQuote > startOfQuote + 1 && lines[endOfQuote - 1].match(/^\s*$/)) endOfQuote--;
 
-    return [
-      ...lines.slice(startOfQuote, endOfQuote).map(line => `> ${line}`),
-      '\n'
-    ].join('\n');
+    let quote = lines.slice(startOfQuote, endOfQuote).map(line => `> ${line}`).join('\n') + '\n';
+
+    if (!state.get('tight')) {
+      quote += '\n';
+    }
+    return quote;
   }
@@ -69,7 +117,21 @@
    * ###### and six `#` being the least important
+   *
+   * If the heading spans multiple lines, then we will use the underline
+   * style, using a series of `=` or `-` markers. This only works for
+   * headings of level 1 or 2, so any other level will be broken.
    */
   *'heading'(props: { level: number }): IterableIterator<string> {
-    let heading = yield;
+    let text = yield;
     let level = new Array(props.level + 1).join('#');
-    return `${level} ${heading.join('')}\n\n`;
+    let heading = text.join('');
+
+    // Multiline headings are supported for level 1 and 2
+    if (heading.indexOf('\n') !== -1) {
+      if (props.level === 1) {
+        return `${heading}\n====\n`;
+      } else if (props.level === 2) {
+        return `${heading}\n----\n`;
+      }
+    }
+    return `${level} ${heading}\n`;
   }
@@ -79,7 +141,7 @@
    * A horizontal rule separates sections of a story
-   * ---
+   * ***
    * Into multiple sections.
    */
   *'horizontal-rule'(): IterableIterator<string> {
-    return '---\n\n';
+    return '***\n';
   }
@@ -91,3 +153,7 @@
    */
-  *'image'(props: { alt: string, url: string }): IterableIterator<string> {
+  *'image'(props: { alt: string, title?: string, url: string }): IterableIterator<string> {
+    if (props.title) {
+      let title = props.title.replace(/"/g, '\\"');
+      return `![${props.alt}](${props.url} "${title}")`;
+    }
     return `![${props.alt}](${props.url})`;
@@ -99,5 +165,11 @@ }
    */
-  *'italic'(): IterableIterator<string> {
+  *'italic'(_, state: State): 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 [before, text, after] = yield* split();
-    return `${before}*${text}*${after}`;
+    state.set('isItalicized', isItalicized);
+    let markup = isItalicized ? '_' : '*';
+    return `${before}${markup}${text}${markup}${after}`;
   }
@@ -116,24 +188,98 @@
    */
-  *'link'(props: { href: string }): IterableIterator<string> {
+  *'link'(props: { href: string, title?: string }): IterableIterator<string> {
     let [before, text, after] = yield* split();
-    return `${before}[${text}](${props.href})${after}`;
+    let href = escapeAttribute(props.href);
+    if (props.title) {
+      let title = props.title.replace(/"/g, '\\"');
+      return `${before}[${text}](${href} "${title}")${after}`;
+    }
+    return `${before}[${text}](${href})${after}`;
   }
 
   /**
+   * A `code` span can be inline or as a block:
+   *
+   * ```js
+   * function () {}
+   * ```
+   */
+  *'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('');
+
+    if (props.style === 'fence') {
+      code = '\n' + code;
+      let info = props.info || '';
+      let newlines = '\n';
+      if (state.get('isList') && state.get('nextAnnotation')) {
+        newlines += '\n';
+      }
+
+      if (code.indexOf('```') !== -1) {
+        return `~~~${info}${code}~~~${newlines}`;
+      } else {
+        return `\`\`\`${info}${code}\`\`\`${newlines}`;
+      }
+    } else if (props.style === 'block') {
+      return code.split('\n').map(line => `    ${line}`).join('\n') + '\n';
+    } else {
+      // MarkdownIt strips all leading and trailing whitespace from code blocks,
+      // which means that we get an empty string for a single whitespace (` `).
+      if (code.length === 0) {
+        return '` `';
+
+      // We need to properly escape backticks inside of code blocks
+      // by using variable numbers of backticks.
+      } else {
+        let backticks = '`'.repeat(getNumberOfRequiredBackticks(code));
+        return `${backticks}${code}${backticks}`;
+      }
+    }
+  }
+
+  *'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') {
+      return html + '\n';
+    }
+    return html;
+  }
+
+  /**
    * A list item is part of an ordered list or an unordered list.
    */
   *'list-item'(_, state: State): IterableIterator<string> {
-    let indent: string = '   '.repeat(state.get('indent'));
-    let rawItem: string[] = yield;
-    let index: number = state.get('index');
-    let item: string = rawItem.join('').split('\n').map(line => indent + line).join('\n').trim();
+    let digit: number = state.get('digit');
+    let delimiter = state.get('delimiter');
+    let marker: string = delimiter;
+    if (state.get('type') === 'numbered') {
+      marker = `${digit}${delimiter}`;
+      state.set('digit', digit + 1);
+    }
+    let indent = ' '.repeat(marker.length + 1);
+    let text: string[] = yield;
+    let item: string = text.join('');
+    let firstCharacter = 0;
+    while (item[firstCharacter] === ' ') firstCharacter++;
+    let lines = item.split('\n');
+    lines.push(lines.pop().replace(/[ ]+$/, ''));
+    lines.unshift(lines.shift().replace(/^[ ]+/, ''));
+    let [first, ...rest] = lines;
 
-    if (state.get('type') === 'ordered-list') {
-      item = `${indent}${index}. ${item}`;
-      state.set('index', index + 1);
-    } else if (state.get('type') === 'unordered-list') {
-      item = `${indent}- ${item}`;
+    item = ' '.repeat(firstCharacter) + first + '\n' + rest.map(line => indent + line).join('\n').replace(/[ ]+$/, '');
+
+    // Code blocks using spaces can follow lists,
+    // however, they will be included in the list
+    // if we don't adjust spacing on the list item
+    // to force the code block outside of 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')) {
+      return ` ${marker}    ${item}`;
     }
-
-    return item;
+    return `${marker} ${item}`;
   }
@@ -146,11 +292,26 @@
    */
-  *'ordered-list'(_, state: State): IterableIterator<string> {
-    let indent = state.get('indent');
-    if (indent == null) {
-      indent = -1;
+  *'ordered-list'(props: { start?: number, tight: boolean }, state: State): IterableIterator<string> {
+    let start = 1;
+
+    if (props && props.start != null) {
+      start = props.start;
     }
+    let delimiter = '.';
+    if (state.get('previous.type') === 'numbered' && state.get('previous.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');
+
     state.push({
-      type: 'ordered-list',
-      indent: indent + 1,
-      index: 1
+      isList: true,
+      type: 'numbered',
+      digit: start,
+      previous: state.get('previous'),
+      delimiter,
+      hasCodeBlockFollowing,
+      tight: props && props.tight
     });
@@ -160,60 +321,66 @@ let list = yield;
 
-    let markdown = `${list.join('\n')}\n\n`;
-    if (state.get('type') === 'ordered-list' ||
-        state.get('type') === 'unordered-list') {
-      return `\n${markdown}`;
+    if (props && props.tight) {
+      list = list.map(item => item.replace(/([ \n])+$/, '\n');
     }
-    return markdown;
+
+    state.set('previous', {
+      isList: true,
+      type: 'numbered',
+      delimiter
+    });
+
+    return list.join('') + '\n';
   }
 
   /**
-   * - An ordered list contains
+   * - An unordered list contains
    * - A number
    * - Of things with dashes preceding them
    */
-  *'unordered-list'(_, state: State): IterableIterator<string> {
-    let indent = state.get('indent');
-    if (indent == null) {
-      indent = -1;
+  *'unordered-list'(props: { tight: boolean }, state: State): IterableIterator<string> {
+    let delimiter = '-';
+    if (state.get('previous.type') === 'bulleted' && state.get('previous.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');
+
     state.push({
-      type: 'unordered-list',
-      indent: indent + 1,
+      isList: true,
+      type: 'bulleted',
+      previous: state.get('previous'),
+      delimiter,
+      tight: props && props.tight,
+      hasCodeBlockFollowing
     });
+
     let list = yield;
     state.pop();
 
-    let markdown = `${list.join('\n')}\n\n`;
-    if (state.get('type') === 'ordered-list' ||
-        state.get('type') === 'unordered-list') {
-      return `\n${markdown}`;
+    state.set('previous', {
+      isList: true,
+      type: 'bulleted',
+      delimiter
+    });
+
+    if (props && props.tight) {
+      list = list.map(item => item.replace(/([ \n])+$/, '\n');
     }
-    return markdown;
+
+    return list.join('') + '\n';
   }
 
   /**
-   * A paragraph is the base unit of text.
-   *
-   * They are created by adding two newlines between
-   * text.
+   * Paragraphs are delimited by two or more newlines in markdown.
    */
-  *'paragraph'(): IterableIterator<string> {
-    let rawText = yield;
-    let text = rawText.join('');
-    if (text.lastIndexOf('\n\n') === Math.max(text.length - 2, 0)) {
-      return text;
+  *'paragraph'(_, state: State): IterableIterator<string> {
+    let text = yield;
+    if (state.get('tight')) {
+      return text.join('') + '\n';
     }
-    return `${text}\n\n`;
+    return text.join('') + '\n\n';
   }
-
-  *renderAnnotation(annotation: HIRNode, state: State) {
-    let rule = this[annotation.type];
-    if (rule) {
-      return yield* this[annotation.type](annotation.attributes, state);
-    } else {
-      let text = yield;
-      return text.join('');
-    }
-  }
 }

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

New author

Supply chain risk

A new npm collaborator published a version of the package for the first time. New collaborators are usually benign additions to a project, but do indicate a change to the security surface area of a package.

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

56262

increased by88.56%

Lines of code

844

increased by66.8%

Worsened metrics

Dev dependency count

6

increased by50%

Number of package files

6

decreased by-14.29%

Number of medium supply chain risk alerts

2

increased byInfinity%

Dependency changes

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

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

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

• - Removed@atjson/core@0.5.12(transitive)

• - Removed@atjson/hir@0.5.17(transitive)

• - Removed@atjson/renderer-hir@0.5.20(transitive)

• - Removed@types/entities@1.1.1(transitive)

• - Removedentities@1.1.2(transitive)

• Updated@atjson/renderer-hir@^0.7.0