More parity support with the Angular Dart output AST (#25)

* Various changes.

* Update presubmit.

* More changes to get NG2-output parity

Author: matanlurey

.analysis_options

@@ -21,7 +21,8 @@ linter:
     - empty_constructor_bodies
     - hash_and_equals
     - library_prefixes
-    - non_constant_identifier_names
+    # This convention is broken on purpose in parts of the code.
+    # - non_constant_identifier_names
     - prefer_is_not_empty
     - slash_for_doc_comments
     - type_init_formals

CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## 1.0.0-alpha+2
+
+- Added `returnVoid` to well, `return;`
+- Added support for top-level field assignments:
+
+```dart
+new LibraryBuilder()..addMember(literal(false).asConst('foo'))
+```
+
+- Added support for specifying a `target` when using `asAssign`:
+
+```dart
+// Outputs bank.bar = goldBar
+reference('goldBar').asAssign('bar', target: reference('bank'))
+```
+
+- Added support for the cascade operator:
+
+```dart
+// Outputs foo..doThis()..doThat()
+reference('foo').cascade((c) => <ExpressionBuilder> [
+  c.invoke('doThis', []),
+  c.invoke('doThat', []),
+]);
+```
+
+- Added support for accessing a property
+
+```dart
+// foo.bar
+reference('foo').property('bar');
+```
+
 ## 1.0.0-alpha+1
 
 - Slight updates to confusing documentation.

lib/code_builder.dart

@@ -30,5 +30,5 @@ export 'src/builders/reference.dart'
     show explicitThis, reference, ReferenceBuilder;
 export 'src/builders/shared.dart' show AstBuilder, Scope;
 export 'src/builders/statement.dart'
-    show ifThen, elseIf, elseThen, IfStatementBuilder, StatementBuilder;
+    show ifThen, elseIf, elseThen, returnVoid, IfStatementBuilder, StatementBuilder;
 export 'src/builders/type.dart' show NewInstanceBuilder, TypeBuilder;

lib/src/builders/expression.dart

@@ -9,6 +9,7 @@ import 'package:analyzer/src/dart/ast/token.dart';
 import 'package:code_builder/dart/core.dart';
 import 'package:code_builder/src/builders/method.dart';
 import 'package:code_builder/src/builders/parameter.dart';
+import 'package:code_builder/src/builders/reference.dart';
 import 'package:code_builder/src/builders/shared.dart';
 import 'package:code_builder/src/builders/statement.dart';
 import 'package:code_builder/src/builders/statement/if.dart';
@@ -17,6 +18,7 @@ import 'package:code_builder/src/tokens.dart';
 
 part 'expression/assert.dart';
 part 'expression/assign.dart';
+part 'expression/cascade.dart';
 part 'expression/invocation.dart';
 part 'expression/negate.dart';
 part 'expression/operators.dart';
@@ -79,7 +81,7 @@ Literal _literal(value) {
 }
 
 /// Implements much of [ExpressionBuilder].
-abstract class AbstractExpressionMixin implements ExpressionBuilder {
+abstract class AbstractExpressionMixin extends TopLevelMixin implements ExpressionBuilder {
   @override
   ExpressionBuilder operator *(ExpressionBuilder other) {
     return new _AsBinaryExpression(
@@ -122,9 +124,10 @@ abstract class AbstractExpressionMixin implements ExpressionBuilder {
   @override
   StatementBuilder asAssign(
     String variable, {
+    ExpressionBuilder target,
     bool nullAware: false,
   }) =>
-      new _AsAssign(this, variable, nullAware);
+      new _AsAssign(this, variable, nullAware, target);
 
   @override
   StatementBuilder asConst(String variable, [TypeBuilder type]) {
@@ -166,6 +169,14 @@ abstract class AbstractExpressionMixin implements ExpressionBuilder {
     return invocation;
   }
 
+  @override
+  ExpressionBuilder cascade(
+    Iterable<ExpressionBuilder> create(ExpressionBuilder self),
+  ) {
+    // Sorry for the huge hack. Need to think more clearly about this in future.
+    return new _CascadeExpression(this, create(reference('.')));
+  }
+
   @override
   ExpressionBuilder equals(ExpressionBuilder other) {
     return new _AsBinaryExpression(
@@ -212,6 +223,9 @@ abstract class AbstractExpressionMixin implements ExpressionBuilder {
 
   @override
   ExpressionBuilder parentheses() => new _ParenthesesExpression(this);
+
+  @override
+  ExpressionBuilder property(String name) => new _MemberExpression(this, name);
 }
 
 /// Builds an [Expression] AST when [buildExpression] is invoked.
@@ -233,7 +247,9 @@ abstract class ExpressionBuilder
   StatementBuilder asAssert();
 
   /// Returns as a [StatementBuilder] that assigns to an existing [variable].
-  StatementBuilder asAssign(String variable, {bool nullAware});
+  ///
+  /// If [target] is specified, determined to be `{target}.{variable}`.
+  StatementBuilder asAssign(String variable, {ExpressionBuilder target, bool nullAware});
 
   /// Returns as a [StatementBuilder] that assigns to a new `const` [variable].
   StatementBuilder asConst(String variable, [TypeBuilder type]);
@@ -268,6 +284,11 @@ abstract class ExpressionBuilder
     Map<String, ExpressionBuilder> namedArguments,
   ]);
 
+  /// Return as an [ExpressionBuilder] with `..` appended.
+  ExpressionBuilder cascade(
+    Iterable<ExpressionBuilder> create(ExpressionBuilder self),
+  );
+
   /// Returns as an [ExpressionBuilder] comparing using `==` against [other].
   ExpressionBuilder equals(ExpressionBuilder other);
 
@@ -292,6 +313,9 @@ abstract class ExpressionBuilder
 
   /// Returns as an [ExpressionBuilder] wrapped in parentheses.
   ExpressionBuilder parentheses();
+
+  /// Returns {{this}}.{{name}}.
+  ExpressionBuilder property(String name);
 }
 
 /// An [AstBuilder] that can add [ExpressionBuilder].
@@ -322,13 +346,13 @@ abstract class HasExpressionsMixin extends HasExpressions {
   }
 }
 
-class _AsStatement implements StatementBuilder {
+class _AsStatement extends TopLevelMixin implements StatementBuilder {
   final ExpressionBuilder _expression;
 
   _AsStatement(this._expression);
 
   @override
-  AstNode buildAst([Scope scope]) => buildStatement(scope);
+  Statement buildAst([Scope scope]) => buildStatement(scope);
 
   @override
   Statement buildStatement([Scope scope]) {
@@ -339,7 +363,26 @@ class _AsStatement implements StatementBuilder {
   }
 }
 
-class _LiteralExpression extends Object with AbstractExpressionMixin {
+class _MemberExpression extends Object with AbstractExpressionMixin, TopLevelMixin {
+  final String _name;
+  final ExpressionBuilder _target;
+
+  _MemberExpression(this._target, this._name);
+
+  @override
+  AstNode buildAst([Scope scope]) => buildExpression(scope);
+
+  @override
+  Expression buildExpression([Scope scope]) {
+    return new PropertyAccess(
+      _target.buildExpression(scope),
+      $period,
+      stringIdentifier(_name),
+    );
+  }
+}
+
+class _LiteralExpression extends Object with AbstractExpressionMixin, TopLevelMixin {
   final Literal _literal;
 
   _LiteralExpression(this._literal);
@@ -351,7 +394,7 @@ class _LiteralExpression extends Object with AbstractExpressionMixin {
   Expression buildExpression([_]) => _literal;
 }
 
-class _ParenthesesExpression extends Object with AbstractExpressionMixin {
+class _ParenthesesExpression extends Object with AbstractExpressionMixin, TopLevelMixin {
   final ExpressionBuilder _expression;
 
   _ParenthesesExpression(this._expression);
@@ -379,7 +422,7 @@ ExpressionBuilder _expressionify(v) {
   throw new ArgumentError('Could not expressionify $v');
 }
 
-class _TypedListExpression extends Object with AbstractExpressionMixin {
+class _TypedListExpression extends Object with AbstractExpressionMixin, TopLevelMixin {
   static List<ExpressionBuilder> _toExpression(Iterable values) {
     return values.map(_expressionify).toList();
   }
@@ -414,7 +457,7 @@ class _TypedListExpression extends Object with AbstractExpressionMixin {
   }
 }
 
-class _TypedMapExpression extends Object with AbstractExpressionMixin {
+class _TypedMapExpression extends Object with AbstractExpressionMixin, TopLevelMixin {
   static Map<ExpressionBuilder, ExpressionBuilder> _toExpression(Map values) {
     return new Map<ExpressionBuilder, ExpressionBuilder>.fromIterable(
       values.keys,

lib/src/builders/expression/assert.dart

@@ -4,13 +4,13 @@
 
 part of code_builder.src.builders.expression;
 
-class _AsAssert implements StatementBuilder {
+class _AsAssert extends TopLevelMixin implements StatementBuilder {
   final ExpressionBuilder _expression;
 
   _AsAssert(this._expression);
 
   @override
-  AstNode buildAst([Scope scope]) => buildStatement(scope);
+  Statement buildAst([Scope scope]) => buildStatement(scope);
 
   @override
   Statement buildStatement([Scope scope]) {

lib/src/builders/expression/assign.dart

@@ -8,23 +8,24 @@ class _AsAssign extends AbstractExpressionMixin {
   final String _name;
   final bool _nullAware;
   final ExpressionBuilder _value;
+  final ExpressionBuilder _target;
 
-  _AsAssign(this._value, this._name, this._nullAware);
+  _AsAssign(this._value, this._name, this._nullAware, this._target);
 
   @override
   AstNode buildAst([Scope scope]) => buildExpression(scope);
 
   @override
   Expression buildExpression([Scope scope]) {
     return new AssignmentExpression(
-      stringIdentifier(_name),
+      _target != null ? _target.property(_name).buildExpression(scope) : stringIdentifier(_name),
       _nullAware ? $nullAwareEquals : $equals,
       _value.buildExpression(scope),
     );
   }
 }
 
-class _AsAssignNew implements StatementBuilder {
+class _AsAssignNew extends TopLevelMixin implements StatementBuilder {
   final ExpressionBuilder _value;
   final String _name;
   final TypeBuilder _type;
@@ -33,7 +34,7 @@ class _AsAssignNew implements StatementBuilder {
   _AsAssignNew(this._value, this._name, this._type, this._modifier);
 
   @override
-  AstNode buildAst([Scope scope]) => buildStatement(scope);
+  Statement buildAst([Scope scope]) => buildStatement(scope);
 
   @override
   Statement buildStatement([Scope scope]) {
@@ -54,4 +55,26 @@ class _AsAssignNew implements StatementBuilder {
       $semicolon,
     );
   }
+
+  @override
+  CompilationUnitMember buildTopLevelAst([Scope scope]) {
+    return new TopLevelVariableDeclaration(
+      null,
+      null,
+      new VariableDeclarationList(
+        null,
+        null,
+        _type == null || _modifier != $var ? _modifier : null,
+        _type?.buildType(scope),
+        [
+          new VariableDeclaration(
+            stringIdentifier(_name),
+            $equals,
+            _value.buildExpression(scope),
+          ),
+        ],
+      ),
+      $semicolon,
+    );
+  }
 }

lib/src/builders/expression/cascade.dart

@@ -0,0 +1,23 @@
+// Copyright (c) 2016, the Dart project authors.  Please see the AUTHORS file
+// for details. All rights reserved. Use of this source code is governed by a
+// BSD-style license that can be found in the LICENSE file.
+
+part of code_builder.src.builders.expression;
+
+class _CascadeExpression extends TopLevelMixin with AbstractExpressionMixin {
+  final List<ExpressionBuilder> _cascades;
+  final ExpressionBuilder _target;
+
+  _CascadeExpression(this._target, this._cascades);
+
+  @override
+  AstNode buildAst([Scope scope]) => buildExpression(scope);
+
+  @override
+  Expression buildExpression([Scope scope]) {
+    return new CascadeExpression(
+      _target.buildExpression(scope),
+      _cascades.map((e) => e.buildExpression(scope)).toList(),
+    );
+  }
+}

lib/src/builders/expression/invocation.dart

@@ -63,7 +63,7 @@ abstract class InvocationBuilder
 }
 
 class _FunctionInvocationBuilder extends Object
-    with AbstractInvocationBuilderMixin, AbstractExpressionMixin
+    with AbstractInvocationBuilderMixin, AbstractExpressionMixin, TopLevelMixin
     implements InvocationBuilder {
   final ExpressionBuilder _target;
 
@@ -80,7 +80,7 @@ class _FunctionInvocationBuilder extends Object
 }
 
 class _MethodInvocationBuilder extends Object
-    with AbstractInvocationBuilderMixin, AbstractExpressionMixin
+    with AbstractInvocationBuilderMixin, AbstractExpressionMixin, TopLevelMixin
     implements InvocationBuilder {
   final String _method;
   final ExpressionBuilder _target;

lib/src/builders/expression/operators.dart

@@ -4,7 +4,7 @@
 
 part of code_builder.src.builders.expression;
 
-class _AsBinaryExpression extends Object with AbstractExpressionMixin {
+class _AsBinaryExpression extends Object with AbstractExpressionMixin, TopLevelMixin {
   final ExpressionBuilder _left;
   final ExpressionBuilder _right;
   final Token _operator;

lib/src/builders/expression/return.dart

@@ -4,7 +4,7 @@
 
 part of code_builder.src.builders.expression;
 
-class _AsReturn implements StatementBuilder {
+class _AsReturn extends TopLevelMixin implements StatementBuilder {
   final ExpressionBuilder _value;
 
   _AsReturn(this._value);