Return Root from nodes() (#5274)

* return Root from nodes()

* add children

Author: helixbass

lib/coffeescript/coffeescript.js

@@ -209,7 +209,7 @@ exports.tokens = withPrettyErrors (code, options) ->
 # or traverse it by using `.traverseChildren()` with a callback.
 exports.nodes = withPrettyErrors (source, options) ->
   source = lexer.tokenize source, options if typeof source is 'string'
-  parser.parse(source).body
+  parser.parse source
 
 # This file used to export these methods; leave stubs that throw warnings
 # instead. These methods have been moved into `index.coffee` to provide

lib/coffeescript/nodes.js

@@ -512,6 +512,8 @@ exports.Root = class Root extends Base
   constructor: (@body) ->
     super()
 
+  children: ['body']
+
   # Wrap everything in a safety closure, unless requested not to. It would be
   # better not to generate them in the first place, but for now, clean up
   # obvious double-parentheses.

lib/coffeescript/repl.js

@@ -25,7 +25,7 @@ replDefaults =
     input = input.replace /^\s*try\s*{([\s\S]*)}\s*catch.*$/m, '$1'
 
     # Require AST nodes to do some AST manipulation.
-    {Block, Assign, Value, Literal, Call, Code} = require './nodes'
+    {Block, Assign, Value, Literal, Call, Code, Root} = require './nodes'
 
     try
       # Tokenize the clean input.
@@ -41,14 +41,14 @@ replDefaults =
       # Collect referenced variable names just like in `CoffeeScript.compile`.
       referencedVars = (token[1] for token in tokens when token[0] is 'IDENTIFIER')
       # Generate the AST of the tokens.
-      ast = CoffeeScript.nodes tokens
+      ast = CoffeeScript.nodes(tokens).body
       # Add assignment to `__` variable to force the input to be an expression.
       ast = new Block [new Assign (new Value new Literal '__'), ast, '=']
       # Wrap the expression in a closure to support top-level `await`.
       ast     = new Code [], ast
       isAsync = ast.isAsync
       # Invoke the wrapping closure.
-      ast    = new Block [new Call ast]
+      ast    = new Root new Block [new Call ast]
       js     = ast.compile {bare: yes, locals: Object.keys(context), referencedVars, sharedScope: yes}
       if transpile
         js = transpile.transpile(js, transpile.options).code

src/coffeescript.coffee

@@ -626,7 +626,7 @@ test 'Values with properties end up with a location that includes the properties
     a['b']
     a[b.c()].d
   '''
-  block = CoffeeScript.nodes source
+  {body: block} = CoffeeScript.nodes source
   [
     singleProperty
     twoProperties
@@ -656,7 +656,7 @@ test 'Values with properties end up with a location that includes the properties
 
 test 'StringWithInterpolations::fromStringLiteral() assigns correct location to tagged template literal', ->
   checkLocationData = (source, {stringWithInterpolationsLocationData, stringLocationData}) ->
-    block = CoffeeScript.nodes source
+    {body: block} = CoffeeScript.nodes source
     taggedTemplateLiteral = block.expressions[0].unwrap()
     {args: [stringWithInterpolations]} = taggedTemplateLiteral
     {body} = stringWithInterpolations

src/nodes.coffee

@@ -5,7 +5,7 @@ test "operator precedence for logical operators", ->
   source = '''
     a or b and c
   '''
-  block = CoffeeScript.nodes source
+  {body: block} = CoffeeScript.nodes source
   [expression] = block.expressions
   eq expression.first.base.value, 'a'
   eq expression.operator, '||'
@@ -17,7 +17,7 @@ test "operator precedence for bitwise operators", ->
   source = '''
     a | b ^ c & d
   '''
-  block = CoffeeScript.nodes source
+  {body: block} = CoffeeScript.nodes source
   [expression] = block.expressions
   eq expression.first.base.value, 'a'
   eq expression.operator, '|'
@@ -31,7 +31,7 @@ test "operator precedence for binary ? operator", ->
   source = '''
      a ? b and c
   '''
-  block = CoffeeScript.nodes source
+  {body: block} = CoffeeScript.nodes source
   [expression] = block.expressions
   eq expression.first.base.value, 'a'
   eq expression.operator, '?'
@@ -43,7 +43,7 @@ test "new calls have a range including the new", ->
   source = '''
     a = new B().c(d)
   '''
-  block = CoffeeScript.nodes source
+  {body: block} = CoffeeScript.nodes source
 
   assertColumnRange = (node, firstColumn, lastColumn) ->
     eq node.locationData.first_line, 0
@@ -65,7 +65,7 @@ test "location data is properly set for nested `new`", ->
   source = '''
     new new A()()
   '''
-  block = CoffeeScript.nodes source
+  {body: block} = CoffeeScript.nodes source
 
   assertColumnRange = (node, firstColumn, lastColumn) ->
     eq node.locationData.first_line, 0