Refactor code

Author: wooorm

index.js

@@ -15,110 +15,133 @@ var yellow = ansiColor(33, 39)
 var green = ansiColor(32, 39)
 
 // Define ANSII color removal functionality.
-var colorExpression = /(?:(?:\u001B\[)|\u009b)(?:\d{1,3})?(?:(?:;\d{0,3})*)?[A-M|f-m]|\u001b[A-M]/g
+var colorExpression = /(?:(?:\u001B\[)|\u009B)(?:\d{1,3})?(?:(?:;\d{0,3})*)?[A-M|f-m]|\u001B[A-M]/g
 
 // Standard keys defined by unist: https://github.com/syntax-tree/unist.
 // We don’t ignore `data` though.
 var ignore = ['type', 'value', 'children', 'position']
 
 // Inspects a node, without using color.
-function noColor(node, pad) {
-  return stripColor(inspect(node, pad))
+function noColor(node) {
+  return stripColor(inspect(node))
 }
 
 // Inspects a node.
-function inspect(node, pad) {
-  var result
-  var children
-  var index
-  var length
+function inspect(node) {
+  return inspectValue(node, '')
 
-  if (node && Boolean(node.length) && typeof node !== 'string') {
-    length = node.length
-    index = -1
-    result = []
+  function inspectValue(node, pad) {
+    if (node && Boolean(node.length) && typeof node === 'object') {
+      return inspectAll(node, pad)
+    }
 
-    while (++index < length) {
-      result[index] = inspect(node[index])
+    if (node && node.type) {
+      return inspectTree(node, pad)
     }
 
-    return result.join('\n')
+    return inspectNonTree(node, pad)
   }
 
-  if (!node || !node.type) {
-    return String(node)
+  function inspectNonTree(value, pad) {
+    return formatNesting(pad) + String(value)
   }
 
-  result = [formatNode(node)]
-  children = node.children
-  length = children && children.length
-  index = -1
+  function inspectAll(nodes, pad) {
+    var length = nodes.length
+    var index = -1
+    var result = []
+    var node
+    var tail
+
+    while (++index < length) {
+      node = nodes[index]
+      tail = index === length - 1
+
+      result.push(
+        formatNesting(pad + (tail ? '└' : '├') + '─ '),
+        inspectValue(node, pad + (tail ? ' ' : '│') + '  '),
+        tail ? '' : '\n'
+      )
+    }
 
-  if (!length) {
-    return result[0]
+    return result.join('')
   }
 
-  if (!pad || typeof pad === 'number') {
-    pad = ''
+  function inspectTree(node, pad) {
+    var result = formatNode(node, pad)
+    var content = inspectAll(node.children || [], pad)
+    return content ? result + '\n' + content : result
   }
 
-  while (++index < length) {
-    node = children[index]
+  // Colored nesting formatter.
+  function formatNesting(value) {
+    return value ? dim(value) : ''
+  }
 
-    if (index === length - 1) {
-      result.push(formatNesting(pad + '└─ ') + inspect(node, pad + '   '))
-    } else {
-      result.push(formatNesting(pad + '├─ ') + inspect(node, pad + '│  '))
+  // Colored node formatter.
+  function formatNode(node) {
+    var result = [node.type]
+    var position = node.position || {}
+    var location = stringifyPosition(position.start, position.end)
+    var attributes = []
+    var key
+    var value
+
+    if (node.children) {
+      result.push(dim('['), yellow(node.children.length), dim(']'))
+    } else if (typeof node.value === 'string') {
+      result.push(dim(': '), green(JSON.stringify(node.value)))
     }
-  }
 
-  return result.join('\n')
-}
+    if (location) {
+      result.push(' (', location, ')')
+    }
 
-// Colored nesting formatter.
-function formatNesting(value) {
-  return dim(value)
-}
+    for (key in node) {
+      value = node[key]
 
-// Compile a single position.
-function compile(pos) {
-  var values = []
+      if (
+        ignore.indexOf(key) !== -1 ||
+        value === null ||
+        value === undefined ||
+        (typeof value === 'object' && isEmpty(value))
+      ) {
+        continue
+      }
 
-  if (!pos) {
-    return null
-  }
+      attributes.push('[' + key + '=' + JSON.stringify(value) + ']')
+    }
 
-  values = [[pos.line || 1, pos.column || 1].join(':')]
+    if (attributes.length !== 0) {
+      result = result.concat(' ', attributes)
+    }
 
-  if ('offset' in pos) {
-    values.push(String(pos.offset || 0))
+    return result.join('')
   }
-
-  return values
 }
 
-// Compile a location.
-function stringify(start, end) {
-  var values = []
+// Compile a position.
+function stringifyPosition(start, end) {
+  var result = []
   var positions = []
   var offsets = []
 
   add(start)
   add(end)
 
   if (positions.length !== 0) {
-    values.push(positions.join('-'))
+    result.push(positions.join('-'))
   }
 
   if (offsets.length !== 0) {
-    values.push(offsets.join('-'))
+    result.push(offsets.join('-'))
   }
 
-  return values.join(', ')
+  return result.join(', ')
 
   // Add a position.
   function add(position) {
-    var tuple = compile(position)
+    var tuple = stringifyPoint(position)
 
     if (tuple) {
       positions.push(tuple[0])
@@ -130,48 +153,24 @@ function stringify(start, end) {
   }
 }
 
-// Colored node formatter.
-function formatNode(node) {
-  var log = node.type
-  var location = node.position || {}
-  var position = stringify(location.start, location.end)
-  var key
-  var values = []
-  var value
-
-  if (node.children) {
-    log += dim('[') + yellow(node.children.length) + dim(']')
-  } else if (typeof node.value === 'string') {
-    log += dim(': ') + green(JSON.stringify(node.value))
-  }
+// Compile a point.
+function stringifyPoint(value) {
+  var result = []
 
-  if (position) {
-    log += ' (' + position + ')'
+  if (!value) {
+    return null
   }
 
-  for (key in node) {
-    value = node[key]
-
-    if (
-      ignore.indexOf(key) !== -1 ||
-      value === null ||
-      value === undefined ||
-      (typeof value === 'object' && isEmpty(value))
-    ) {
-      continue
-    }
-
-    values.push('[' + key + '=' + JSON.stringify(value) + ']')
-  }
+  result = [[value.line || 1, value.column || 1].join(':')]
 
-  if (values.length !== 0) {
-    log += ' ' + values.join('')
+  if ('offset' in value) {
+    result.push(String(value.offset || 0))
   }
 
-  return log
+  return result
 }
 
-// Remove ANSI colour from `value`.
+// Remove ANSI color from `value`.
 function stripColor(value) {
   return value.replace(colorExpression, '')
 }

test.js

@@ -81,7 +81,7 @@ test('inspect()', function (t) {
         }
       ])
     ),
-    ['SymbolNode: "$"', 'WordNode[1]', '└─ text: "5,00"'].join('\n'),
+    ['├─ SymbolNode: "$"', '└─ WordNode[1]', '   └─ text: "5,00"'].join('\n'),
     'should work with a list of nodes'
   )