Remove support for indents

Previously, remark had information on where content started, so that syntax
(such as block quote start markers) could be ignored.

This is no longer available in remark, and thus it was removed from this
project.

This commit *does* fix support for cr and cr + lf line endings.

Author: wooorm

index.js

@@ -4,34 +4,34 @@ var location = require('vfile-location')
 
 module.exports = source
 
+var search = /\r?\n|\r/g
+
 function source(value, file) {
   var doc = String(file)
   var loc = location(file)
   var position = (value && value.position) || value || {}
-  var start
+  var startOffset = loc.toOffset(position.start)
+  var endOffset = loc.toOffset(position.end)
+  var results = []
+  var match
   var end
-  var indents
-  var indent
-  var lines
-  var length
-  var index
-
-  start = loc.toOffset(position.start)
-  end = loc.toOffset(position.end)
-  indents = position.indent || []
 
-  if (start === -1 || end === -1) {
+  if (startOffset === -1 || endOffset === -1) {
     return null
   }
 
-  lines = doc.slice(start, end).split('\n')
-  length = lines.length
-  index = 0
-
-  while (++index < length) {
-    indent = indents[index - 1]
-    lines[index] = lines[index].slice(indent ? indent - 1 : 0)
+  while (startOffset < endOffset) {
+    search.lastIndex = startOffset
+    match = search.exec(doc)
+    end = match && match.index < endOffset ? match.index : endOffset
+    results.push(doc.slice(startOffset, end))
+    startOffset = end
+
+    if (match && match.index < endOffset) {
+      startOffset += match[0].length
+      results.push(match[0])
+    }
   }
 
-  return lines.join('\n')
+  return results.join('')
 }

readme.md

@@ -40,15 +40,14 @@ var tree = unified()
   .use(parse)
   .parse(file)
 
-var list = tree.children[0].children[0]
-console.log(source(list, file))
+var strong = tree.children[0].children[0].children[0].children[0].children[0]
+console.log(source(strong, file))
 ```
 
 Now, running `node example` yields:
 
 ```markdown
-+ **[Hello](./example)**
-  world.
+**[Hello](./example)**
 ```
 
 ## API
@@ -70,7 +69,7 @@ See [`contributing.md` in `syntax-tree/.github`][contributing] for ways to get
 started.
 See [`support.md`][support] for ways to get help.
 
-This project has a [Code of Conduct][coc].
+This project has a [code of conduct][coc].
 By interacting with this repository, organisation, or community you agree to
 abide by its terms.
 

test.js

@@ -1,54 +1,64 @@
 'use strict'
 
 var test = require('tape')
+var vfile = require('vfile')
 var remark = require('remark')
 var source = require('.')
 
 test('unist-util-source', function (t) {
-  t.plan(10)
+  var file = vfile('> + **[Hello](./example)**\n> world.')
+  var node = remark().parse(file)
 
-  remark()
-    .use(function () {
-      return transformer
-      function transformer(tree, file) {
-        var node = tree
+  t.equal(source(node, file), '> + **[Hello](./example)**\n> world.', 'root')
 
-        t.equal(source(node, file), '> + **[Hello](./example)**\n> world.')
+  node = node.children[0]
+  t.equal(
+    source(node, file),
+    '> + **[Hello](./example)**\n> world.',
+    'block quote'
+  )
 
-        // Blockquote.
-        node = tree.children[0]
-        t.equal(source(node, file), '> + **[Hello](./example)**\n> world.')
+  node = node.children[0]
+  t.equal(source(node, file), '+ **[Hello](./example)**\n> world.', 'list')
 
-        // List.
-        node = node.children[0]
-        t.equal(source(node, file), '+ **[Hello](./example)**\nworld.')
+  node = node.children[0]
+  t.equal(source(node, file), '+ **[Hello](./example)**\n> world.', 'list item')
 
-        // List-item.
-        node = node.children[0]
-        t.equal(source(node, file), '+ **[Hello](./example)**\nworld.')
+  node = node.children[0]
+  t.equal(source(node, file), '**[Hello](./example)**\n> world.', 'paragraph')
 
-        // Paragraph.
-        node = node.children[0]
-        t.equal(source(node, file), '**[Hello](./example)**\nworld.')
+  node = node.children[0]
+  t.equal(source(node, file), '**[Hello](./example)**', 'strong')
 
-        // Strong.
-        node = node.children[0]
-        t.equal(source(node, file), '**[Hello](./example)**')
+  node = node.children[0]
+  t.equal(source(node, file), '[Hello](./example)', 'link')
 
-        // Link.
-        node = node.children[0]
-        t.equal(source(node, file), '[Hello](./example)')
+  node = node.children[0]
+  t.equal(source(node, file), 'Hello', 'text')
 
-        // Text.
-        node = node.children[0]
-        t.equal(source(node, file), 'Hello')
+  t.equal(source({type: node.type, value: node.value}, file), null, 'generated')
 
-        // Generated.
-        t.equal(source({type: node.type, value: node.value}, file), null)
+  t.equal(source(null, file), null, 'missing')
 
-        // Missing.
-        t.equal(source(null, file), null)
-      }
-    })
-    .processSync(['> + **[Hello](./example)**', '> world.'].join('\n'))
+  file = vfile('a\r\nb')
+  node = remark().parse(file).children[0]
+
+  t.equal(source(node, file), 'a\r\nb', 'cr + lf')
+
+  file = vfile('a\rb')
+  node = remark().parse(file).children[0]
+
+  t.equal(source(node, file), 'a\rb', 'cr')
+
+  file = vfile('a\n')
+  node = remark().parse(file)
+
+  t.equal(source(node, file), 'a\n', 'eof eol')
+
+  file = vfile('a\n\rb')
+  node = remark().parse(file)
+
+  t.equal(source(node, file), 'a\n\rb', 'blank lines')
+
+  t.end()
 })