Refactor to improve bundle size

Author: wooorm

index.js

@@ -1,20 +1,14 @@
 'use strict'
 
+var toString = require('nlcst-to-string')
 var repeat = require('repeat-string')
-var vfileLocation = require('vfile-location')
 var position = require('unist-util-position')
-var toString = require('nlcst-to-string')
-
-module.exports = toNLCST
-
-var ignore = ['table', 'tableRow', 'tableCell']
-
-var source = ['inlineCode']
+var vfileLocation = require('vfile-location')
 
-var newline = '\n'
+module.exports = toNlcst
 
-// Transform `tree` into `nlcst`.
-function toNLCST(tree, file, Parser, options) {
+// Transform a `tree` in mdast to nlcst.
+function toNlcst(tree, file, Parser, options) {
   var settings = options || {}
   var parser
 
@@ -43,36 +37,42 @@ function toNLCST(tree, file, Parser, options) {
 
   parser = 'parse' in Parser ? Parser : new Parser()
 
-  // Transform mdast into NLCST tokens, and pass these into `parser.parse` to
+  // Transform mdast into nlcst tokens, and pass these into `parser.parse` to
   // insert sentences, paragraphs where needed.
   return parser.parse(
     one(
       {
         doc: String(file),
         location: vfileLocation(file),
         parser: parser,
-        ignore: ignore.concat(settings.ignore || []),
-        source: source.concat(settings.source || [])
+        ignore: [].concat(
+          'table',
+          'tableRow',
+          'tableCell',
+          settings.ignore || []
+        ),
+        source: [].concat('inlineCode', settings.source || [])
       },
       tree
     )
   )
 }
 
-// Convert `node` into NLCST.
+// Transform a single node.
 function one(config, node) {
-  var offset = config.location.toOffset
-  var parser = config.parser
-  var doc = config.doc
-  var type = node.type
-  var start = offset(position.start(node))
-  var end = offset(position.end(node))
-
-  if (config.ignore.indexOf(type) === -1) {
-    if (config.source.indexOf(type) !== -1) {
+  var start
+  var end
+
+  if (config.ignore.indexOf(node.type) < 0) {
+    // To do: next major — nodes should have offsets, so
+    // `config.location.toOffset` should be superfluous.
+    start = config.location.toOffset(position.start(node))
+    end = config.location.toOffset(position.end(node))
+
+    if (config.source.indexOf(node.type) > -1) {
       return patch(
         config,
-        [parser.tokenizeSource(doc.slice(start, end))],
+        [config.parser.tokenizeSource(config.doc.slice(start, end))],
         start
       )
     }
@@ -81,62 +81,49 @@ function one(config, node) {
       return all(config, node)
     }
 
-    if (type === 'image' || type === 'imageReference') {
-      return patch(config, parser.tokenize(node.alt), start + 2)
+    if (node.type === 'image' || node.type === 'imageReference') {
+      return patch(config, config.parser.tokenize(node.alt), start + 2)
     }
 
-    if (type === 'text' || type === 'escape') {
-      return patch(config, parser.tokenize(node.value), start)
+    if (node.type === 'break') {
+      return patch(config, [config.parser.tokenizeWhiteSpace('\n')], start)
     }
 
-    if (node.type === 'break') {
-      return patch(config, [parser.tokenizeWhiteSpace('\n')], start)
+    // To do: next major — remove `escape`.
+    if (node.type === 'text' || node.type === 'escape') {
+      return patch(config, config.parser.tokenize(node.value), start)
     }
   }
-
-  return null
 }
 
-// Convert all nodes in `parent` (mdast) into NLCST.
+// Transform all nodes in `parent`.
 function all(config, parent) {
-  var children = parent.children
-  var length = children && children.length
-  var index = -1
   var result = []
+  var index = -1
+  var lineEnding
   var child
-  var node
-  var pos
-  var previousEndLine
-  var previousOffset
-  var endLine
-
-  while (++index < length) {
-    node = children[index]
-    pos = node.position
-    endLine = position.start(node).line
-
-    if (previousEndLine && endLine !== previousEndLine) {
-      child = config.parser.tokenizeWhiteSpace(
-        repeat(newline, endLine - previousEndLine)
-      )
-      patch(config, [child], previousOffset)
+  var end
+  var start
 
-      if (child.value.length < 2) {
-        child.value = repeat(newline, 2)
-      }
+  while (++index < parent.children.length) {
+    child = parent.children[index]
+    start = position.start(child)
 
-      result.push(child)
-    }
+    if (end && start.line !== end.line) {
+      lineEnding = config.parser.tokenizeWhiteSpace(
+        repeat('\n', start.line - end.line)
+      )
+      patch(config, [lineEnding], end.offset)
 
-    child = one(config, node)
+      if (lineEnding.value.length < 2) {
+        lineEnding.value = '\n\n'
+      }
 
-    if (child) {
-      result = result.concat(child)
+      result.push(lineEnding)
     }
 
-    pos = position.end(node)
-    previousEndLine = pos.line
-    previousOffset = pos.offset
+    result = result.concat(one(config, child) || [])
+    end = position.end(child)
   }
 
   return result
@@ -145,25 +132,24 @@ function all(config, parent) {
 // Patch a position on each node in `nodes`.
 // `offset` is the offset in `file` this run of content starts at.
 function patch(config, nodes, offset) {
-  var position = config.location.toPosition
-  var length = nodes.length
   var index = -1
   var start = offset
-  var children
-  var node
   var end
+  var node
 
-  while (++index < length) {
+  while (++index < nodes.length) {
     node = nodes[index]
-    children = node.children
 
-    if (children) {
-      patch(config, children, start)
+    if (node.children) {
+      patch(config, node.children, start)
     }
 
     end = start + toString(node).length
 
-    node.position = {start: position(start), end: position(end)}
+    node.position = {
+      start: config.location.toPoint(start),
+      end: config.location.toPoint(end)
+    }
 
     start = end
   }

package.json

@@ -30,9 +30,9 @@
   ],
   "dependencies": {
     "nlcst-to-string": "^2.0.0",
-    "repeat-string": "^1.5.2",
+    "repeat-string": "^1.0.0",
     "unist-util-position": "^3.0.0",
-    "vfile-location": "^3.0.0"
+    "vfile-location": "^3.1.0"
   },
   "devDependencies": {
     "browserify": "^17.0.0",