Make evaluation a method on snippets.

unexpectedjs · Dec 31, 2019 · 7ff820a · 7ff820a
1 parent cfcb869
commit 7ff820a
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 13 deletions.
diff --git a/lib/Snippets.js b/lib/Snippets.js
@@ -6,6 +6,16 @@ function Snippets(snippets) {
   this.items = snippets;
 }
 
+Snippets.prototype.evaluate = function(options, cb) {
+  evaluateSnippets(
+    this.items,
+    options,
+    passError(cb, () => {
+      cb(null, this);
+    })
+  );
+};
+
 Snippets.prototype.get = function(index) {
   return this.items[index];
 };
@@ -38,14 +48,7 @@ Snippets.prototype.getTests = function() {
 };
 
 module.exports = {
-  fromMarkdown: function(markdown, options, cb) {
-    var snippets = extractSnippets(markdown);
-    evaluateSnippets(
-      snippets,
-      options,
-      passError(cb, function() {
-        cb(null, new Snippets(snippets));
-      })
-    );
+  fromMarkdown: function(markdown) {
+    return new Snippets(extractSnippets(markdown));
   }
 };
diff --git a/lib/UnexpectedMarkdown.js b/lib/UnexpectedMarkdown.js
@@ -112,7 +112,10 @@ UnexpectedMarkdown.prototype.getSnippets = function(options, cb) {
     cb(null, this.snippets);
   } else {
     // eslint-disable-next-line handle-callback-err
-    Snippets.fromMarkdown(this.content, options, function(err, snippets) {
+    Snippets.fromMarkdown(this.content).evaluate(options, function(
+      err,
+      snippets
+    ) {
       that.snippets = snippets;
       cb(null, snippets);
     });

diff --git a/lib/convertMarkdownToMocha.js b/lib/convertMarkdownToMocha.js
@@ -2,7 +2,7 @@
 var pathModule = require('path');
 var esprima = require('esprima');
 var escodegen = require('escodegen');
-var extractSnippets = require('./extractSnippets');
+var Snippets = require('./Snippets');
 var locateBabelrc = require('./locateBabelrc');
 var fs = require('fs');
 var cleanStackTrace = require('./cleanStackTrace');
@@ -133,8 +133,8 @@ function countLinesUntilIndex(text, untilIndex) {
 
 function findCodeBlocks(mdSrc) {
   var codeBlocks = [];
-  const snippets = extractSnippets(mdSrc);
-  for (const codeBlock of snippets) {
+  const snippets = Snippets.fromMarkdown(mdSrc);
+  for (const codeBlock of snippets.items) {
     codeBlock.lineNumber = 1 + countLinesUntilIndex(mdSrc, codeBlock.index);
     if (codeBlock.lang === 'output') {
       var lastJavaScriptBlock = codeBlocks[codeBlocks.length - 1];