Port the module to evaldown.

This commit also makes node 10 the minimum supported version.

.travis.yml

@@ -2,7 +2,6 @@ language: node_js
 env:
   - TARGET=test
 node_js:
-  - '8'
   - '10'
   - '12'
   - 'node'
@@ -13,7 +12,7 @@ matrix:
       env:
         - TARGET=lint
     - name: Coverage
-      node_js: '8'
+      node_js: '10'
       env:
         - TARGET=coverage
 script: npm run $TARGET

lib/UnexpectedMarkdown.js

@@ -1,11 +1,6 @@
-var Snippets = require('./Snippets');
-var createExpect = require('./createExpect');
-var snippetRegexp = require('./snippetRegexp');
-var marked = require('marked-papandreou');
 var fs = require('fs');
 var pathModule = require('path');
 var convertMarkdownToMocha = require('./convertMarkdownToMocha');
-var cleanStackTrace = require('./cleanStackTrace');
 
 var maps = {};
 
@@ -45,100 +40,3 @@ if (sourceMapSupport) {
     },
   });
 }
-
-var styleRegex = /style=".*?"/;
-
-class UnexpectedMarkdown {
-  constructor(content) {
-    if (!(this instanceof UnexpectedMarkdown)) {
-      return new UnexpectedMarkdown(content);
-    }
-    this.content = content;
-  }
-
-  async toHtml(options) {
-    var content = this.content;
-    var expect = createExpect(options);
-
-    const snippets = await this.getSnippets(options);
-
-    var index = 0;
-    var renderer = new marked.Renderer();
-    renderer.code = function (code) {
-      var snippet = snippets.get(index);
-      var previousSnippet = snippets.get(index - 1);
-      index += 1;
-      var lang = snippet.lang;
-      if (lang === 'output') {
-        if (previousSnippet && previousSnippet.lang === 'javascript') {
-          if (previousSnippet.htmlErrorMessage) {
-            return previousSnippet.htmlErrorMessage.replace(
-              styleRegex,
-              'class="output"'
-            );
-          }
-
-          return '<div class="output"></div>';
-        } else {
-          throw new Error(
-            `No matching javascript block for output:\n${snippet.code}`
-          );
-        }
-      }
-
-      return expect.output
-        .clone('html')
-        .code(code, lang)
-        .toString()
-        .replace(styleRegex, `class="code ${this.options.langPrefix}${lang}"`);
-    };
-
-    return marked(content, { renderer: renderer, ...options });
-  }
-
-  async getSnippets(options) {
-    if (this.snippets) {
-      return this.snippets;
-    } else {
-      return Snippets.fromMarkdown(this.content).evaluate(options);
-    }
-  }
-
-  async withUpdatedExamples(options) {
-    const snippets = await this.getSnippets(options);
-
-    var index = 0;
-    var updatedContent = this.content.replace(snippetRegexp, function (
-      $0,
-      htmlComments,
-      lang
-    ) {
-      var currentIndex = index;
-      index += 1;
-      var snippet = snippets.get(currentIndex);
-      if (snippet.lang === 'output') {
-        var example = snippets.get(currentIndex - 1);
-        var output = '';
-        if (example && example.lang === 'javascript') {
-          if (example.errorMessage) {
-            output = example.errorMessage;
-            if (snippet.flags.cleanStackTrace) {
-              output = cleanStackTrace(output);
-            }
-          }
-        }
-        return `${htmlComments || ''}\`\`\`${lang}\n${output}\n\`\`\``;
-      } else {
-        return $0;
-      }
-    });
-
-    return new UnexpectedMarkdown(updatedContent);
-  }
-
-  toString() {
-    return this.content;
-  }
-}
-
-module.exports = UnexpectedMarkdown;

lib/convertMarkdownToMocha.js

@@ -1,11 +1,13 @@
 /* global unexpected:true */
+var fs = require('fs');
 var pathModule = require('path');
 var esprima = require('esprima');
 var escodegen = require('escodegen');
-var Snippets = require('./Snippets');
+var { Markdown } = require('evaldown');
+
 var locateBabelrc = require('./locateBabelrc');
-var fs = require('fs');
 var cleanStackTrace = require('./cleanStackTrace');
+var createExpect = require('./createExpect');
 
 var transpile;
 var hasBabel = false;
@@ -124,12 +126,18 @@ function countLinesUntilIndex(text, untilIndex) {
 
 function findCodeBlocks(mdSrc) {
   var codeBlocks = [];
-  const snippets = Snippets.fromMarkdown(mdSrc);
+  const snippets = new Markdown(mdSrc, {
+    marker: 'unexpected-markdown',
+    transpileFn: hasBabel ? transpile : null,
+    customGlobals: {
+      expect: () => createExpect(),
+    },
+  }).getSnippets();
   for (const codeBlock of snippets.items) {
     codeBlock.lineNumber = 1 + countLinesUntilIndex(mdSrc, codeBlock.index);
     if (codeBlock.lang === 'output') {
       var lastJavaScriptBlock = codeBlocks[codeBlocks.length - 1];
-      if (!lastJavaScriptBlock || 'output' in lastJavaScriptBlock) {
+      if (!lastJavaScriptBlock || lastJavaScriptBlock.output) {
         throw new Error('output block must follow code block');
       }
       lastJavaScriptBlock.output = codeBlock.code;

lib/createExpect.js

@@ -18,12 +18,6 @@ module.exports = function (options) {
   if (typeof options.indentationWidth === 'number') {
     expect.output.indentationWidth = options.indentationWidth;
   }
-  expect.installPlugin(require('magicpen-prism'));
 
-  var themePlugin =
-    options.theme === 'dark'
-      ? require('./magicpenDarkSyntaxTheme')
-      : require('./magicpenGithubSyntaxTheme');
-
-  return expect.installPlugin(themePlugin);
+  return expect;
 };