Refactor

README.md

@@ -23,7 +23,7 @@ function MyXMPComponent () {
 
 ### Usage
 
-To load your code with this loader, simply add it to your existing JS loaders in your webpack config. It's also possible to use a tag ther than `<xmp>` by passing in a loader option.
+To load your code with this loader, simply add it to your existing JS loaders in your webpack config. It's also possible to use a tag other than `<xmp>` by passing in a loader option.
 
 ```jsx
 // webpack.config.js
@@ -57,7 +57,7 @@ To load your code with this loader, simply add it to your existing JS loaders in
       ...
     ],
 
-// with custom escape
+// with custom escape function
     ...
     rules: [
       {

index.js

@@ -14,22 +14,17 @@ function getDelimiters (tag) {
   }
 }
 
-// Escape inner text between delimiters
-function escapeTextInDelimiters (str, start, end) {
-  var middleText = str.slice(start.length, end.length * -1)
-  return start + escapeHtml(middleText) + end
-}
-
 // Create block loader with given tag delimiter
-function loaderWithTag (tag) {
+function loaderWithTag (tag, escape) {
   var delimiters = getDelimiters(tag)
   var start = delimiters.start
   var end = delimiters.end
   return blockLoader({
     start: start,
     end: end,
     process: function (str) {
-      return escapeTextInDelimiters(str, start, end) 
+      var middleText = str.slice(start.length, end.length * -1)
+      return start + escape(middleText) + end
     }
   })
 }
@@ -38,10 +33,8 @@ function loaderWithTag (tag) {
 function load (data) {
   var options = getOptions(this) || {}
   var tag = options.tag || 'xmp'
-  if (options.escape) {
-    escapeHtml = options.escape
-  }
-  var loader = loaderWithTag(tag)
+  var escape = options.escape || escapeHtml
+  var loader = loaderWithTag(tag, escape)
   return loader(data)
 }
 

test/xmp-escape-loader.test.js

@@ -22,7 +22,8 @@ test('works on multiline inputs', () => {
 
 test('can receive custom escape', () => {
   const input = '<xmp><div> Test </div></xmp>'
-  const customLoader = xmpEscapeLoader.bind({ query: { escape: string => escapeHtml(string).toLowerCase() } })
+  const escape = (string) => escapeHtml(string).toLowerCase()
+  const customLoader = xmpEscapeLoader.bind({ query: { escape } })
   const output = customLoader(input)
   expect(output).toEqual('<xmp>&lt;div&gt; test &lt;/div&gt;</xmp>')
 })