wip: making tests green

angular · Apr 26, 2016 · a46a711 · a46a711
1 parent 3bcd91f
commit a46a711
Show file tree

Hide file tree

Showing 12 changed files with 85 additions and 88 deletions.
diff --git a/modules/angular2/src/compiler/animation/animation_parser.ts b/modules/angular2/src/compiler/animation/animation_parser.ts
@@ -73,7 +73,7 @@ export function parseAnimationEvent(eventStr: string): ParsedEventResult {
   var matches = RegExpWrapper.firstMatch(eventRegex, eventStr);
   var key, from, to;
   if (!isPresent(matches)) {
-    errors.push(new AnimationParseError(`the provided ${event} is not of a supported format`));
+    errors.push(new AnimationParseError(`the provided ${eventStr} is not of a supported format`));
     key = 'default';
     from = ANY_STATE;
     to = EMPTY_STATE;
@@ -92,22 +92,6 @@ export function parseAnimationEvent(eventStr: string): ParsedEventResult {
   return new ParsedEventResult(animationEvent, errors);
 }
 
-function _checkAndStripQuotes(value: string, errors: AnimationParseError[]): string {
-  var DQ = '"';
-  var SQ = "'";
-  var firstVal = value[0];
-  if (firstVal == DQ || firstVal == SQ) {
-    var lastVal = value[value.length - 1];
-    if (lastVal == firstVal) {
-      value = value.substring(1, value.length - 1);
-    } else {
-      errors.push(new AnimationParseError(`Unbalanced string value " ${value} " detected`));
-      value = value.substring(1);
-    }
-  }
-  return value;
-}
-
 function _squashSiblingStyles(entry: CompileAnimationMetadata | CompileAnimationMetadata[],
                               errors: AnimationParseError[]): CompileAnimationMetadata {
   var squashedEntries = _squashSiblingStylesEntry(entry, errors);

diff --git a/modules/angular2/src/compiler/animation_compiler.ts b/modules/angular2/src/compiler/animation_compiler.ts
@@ -3,7 +3,6 @@ import {BaseException} from 'angular2/src/facade/exceptions';
 import {Identifiers} from './identifiers';
 import * as o from './output/output_ast';
 
-import {AnimationMetadata} from 'angular2/src/core/metadata/animations';
 import {ListWrapper, Map, StringMapWrapper} from 'angular2/src/facade/collection';
 
 import {AnimationStateEvent} from 'angular2/src/core/animation/animation_state_event';
@@ -32,7 +31,6 @@ export class CompileAnimation {
 
 export class AnimationCompiler {
   compileComponent(component: CompileDirectiveMetadata): CompileAnimation[] {
-    var animationDetails = component.template.animations;
     var compiledAnimations: CompileAnimation[] = [];
     var index = 0;
     component.template.animations.forEach(metadata => {
@@ -45,7 +43,7 @@ export class AnimationCompiler {
         errors.forEach((error: AnimationParseError) => { errorMessage += "\n- " + error.msg; });
         // todo (matsko): include the component name when throwing
         throw new BaseException(
-          `Unable to parse the animation sequence for "${event}" due to the following errors: ` +
+          `Unable to parse the animation sequence for "${metadata.name}" due to the following errors: ` +
           errorMessage);
       }
       var ast = animationResults.ast;

diff --git a/modules/angular2/src/compiler/compile_metadata.ts b/modules/angular2/src/compiler/compile_metadata.ts
@@ -57,7 +57,7 @@ export class CompileAnimationEntryMetadata {
     return new CompileAnimationEntryMetadata(name, animation);
   }
 
-  constructor(public name: string = null, public animation: CompileAnimationMetadata = []) {}
+  constructor(public name: string = null, public animation: CompileAnimationMetadata = null) {}
 
   toJson(): {[key: string]: any} {
     return {
@@ -78,7 +78,7 @@ export class CompileAnimationStyleMetadata extends CompileAnimationMetadata {
     return new CompileAnimationStyleMetadata(styles);
   }
 
-  constructor(public styles: {[key: string]: string | number} = {}) { super(); }
+  constructor(public styles: {[key: string]: string | number} = null) { super(); }
 
   toJson(): {[key: string]: any} {
     return {
@@ -96,7 +96,7 @@ export class CompileAnimationAnimateMetadata extends CompileAnimationMetadata {
     return new CompileAnimationAnimateMetadata(styles, timings);
   }
 
-  constructor(public styles: Array<{[key: string]: string | number}> = [], public timings: string|number = 0) { super(); }
+  constructor(public styles: Array<{[key: string]: string | number}> = null, public timings: string|number = 0) { super(); }
 
   toJson(): {[key: string]: any} {
     return {
@@ -110,7 +110,7 @@ export class CompileAnimationAnimateMetadata extends CompileAnimationMetadata {
 }
 
 export abstract class CompileAnimationWithStepsMetadata extends CompileAnimationMetadata {
-  constructor(public steps: CompileAnimationMetadata[] = []) { super(); }
+  constructor(public steps: CompileAnimationMetadata[] = null) { super(); }
 }
 
 export class CompileAnimationSequenceMetadata extends CompileAnimationWithStepsMetadata {
@@ -119,14 +119,18 @@ export class CompileAnimationSequenceMetadata extends CompileAnimationWithStepsM
     return new CompileAnimationSequenceMetadata(steps);
   }
 
-  constructor(steps: CompileAnimationMetadata[] = []) {
+  constructor(steps: CompileAnimationMetadata[] = null) {
     super(steps);
   }
 
   toJson(): {[key: string]: any} {
+    var steps: any[] = null;
+    if (isPresent(this.steps)) {
+      steps = this.steps.map(step => _objToJson(step));
+    }
     return {
       'class': 'AnimationSequenceMetadata',
-      'value': this.steps.map(step => _objToJson(step))
+      'value': steps
     };
   }
 }
@@ -137,14 +141,18 @@ export class CompileAnimationGroupMetadata extends CompileAnimationWithStepsMeta
     return new CompileAnimationGroupMetadata(steps);
   }
 
-  constructor(steps: CompileAnimationMetadata[] = []) {
+  constructor(steps: CompileAnimationMetadata[] = null) {
     super(steps);
   }
 
   toJson(): {[key: string]: any} {
+    var steps: any[] = null;
+    if (isPresent(this.steps)) {
+      steps = this.steps.map(step => _objToJson(step));
+    }
     return {
       'class': 'AnimationGroupMetadata',
-      'value': this.steps.map(step => _objToJson(step))
+      'value': steps
     };
   }
 }

diff --git a/modules/angular2/src/compiler/view_compiler/property_binder.ts b/modules/angular2/src/compiler/view_compiler/property_binder.ts
@@ -141,24 +141,31 @@ function bindAndWriteToRenderer(boundProps: BoundElementPropertyAst[], context:
           throw new BaseException(`Internal Error: couldn't find animations for ${boundProp.name}`);
         }
 
-        var ANIMATION_FIRED_VAL = o.variable('animationFired');
-        var TRUE_VAL = o.literal(true);
-        var FALSE_VAL = o.literal(false);
-        updateStmts.push(ANIMATION_FIRED_VAL.set(FALSE_VAL).toDeclStmt());
+        var PLAYER_VAR = o.variable('player');
+        updateStmts.push(PLAYER_VAR.set(o.NULL_EXPR).toDeclStmt());
         animations.forEach((animation: CompileAnimation) => {
           updateStmts.push(
             new o.IfStmt(
-                  ANIMATION_FIRED_VAL.equals(FALSE_VAL)
+                  PLAYER_VAR.equals(o.NULL_EXPR)
                   .and(_compareToAnimationStateExpr(fieldExpr, animation.event.fromState))
                   .and(_compareToAnimationStateExpr(currValExpr, animation.event.toState)), [
-                    animation.animationFactory.callFn([
-                      o.THIS_EXPR.prop('renderer'),
-                      renderNode
-                    ]).callMethod('play', []).toStmt(),
-                    ANIMATION_FIRED_VAL.set(TRUE_VAL).toStmt()
+                    PLAYER_VAR.set(
+                      animation.animationFactory.callFn([
+                        o.THIS_EXPR.prop('renderer'),
+                        renderNode
+                      ])
+                    ).toStmt()
                 ])
           );
         });
+        updateStmts.push(new o.IfStmt(o.not(PLAYER_VAR.equals(o.NULL_EXPR)), [
+          PLAYER_VAR.callMethod('onDone', [
+            o.fn([], [
+              PLAYER_VAR.callMethod('destroy', []).toStmt()
+            ])
+          ]).toStmt(),
+          PLAYER_VAR.callMethod('play', []).toStmt()
+        ]));
         break;
     }
 

diff --git a/modules/angular2/src/core/metadata.dart b/modules/angular2/src/core/metadata.dart
@@ -5,6 +5,7 @@ import 'package:angular2/src/core/change_detection/change_detection.dart';
 import './metadata/di.dart';
 import './metadata/directives.dart';
 import './metadata/view.dart';
+import './metadata/animations.dart' show AnimationEntryMetadata;
 
 export './metadata/di.dart';
 export './metadata/directives.dart';
@@ -80,7 +81,7 @@ class Component extends ComponentMetadata {
       ViewEncapsulation encapsulation,
       List<String> styles,
       List<String> styleUrls,
-      List<dynamic> animations)
+      List<AnimationEntryMetadata> animations})
       : super(
             selector: selector,
             inputs: inputs,
@@ -118,7 +119,7 @@ class View extends ViewMetadata {
       ViewEncapsulation encapsulation,
       List<String> styles,
       List<String> styleUrls,
-      List<dynamic> animations)
+      List<AnimationEntryMetadata> animations})
       : super(
             templateUrl: templateUrl,
             template: template,

diff --git a/modules/angular2/src/core/metadata/animations.ts b/modules/angular2/src/core/metadata/animations.ts
@@ -1,5 +1,4 @@
 import {isArray, isString, isStringMap} from 'angular2/src/facade/lang';
-import {StringMapWrapper} from 'angular2/src/facade/collection';
 import {BaseException} from 'angular2/src/facade/exceptions';
 import {CONST} from 'angular2/src/facade/lang';
 
@@ -8,15 +7,7 @@ export abstract class AnimationMetadata {}
 
 @CONST()
 export class AnimationEntryMetadata extends AnimationMetadata {
-  public animation: AnimationMetadata;
-  constructor(public name: string, animation: AnimationMetadata|AnimationMetadata[]) {
-    super();
-    if (isArray(animation)) {
-      this.animation = new AnimationSequenceMetadata(<AnimationMetadata[]>animation);
-    } else {
-      this.animation = <AnimationMetadata>animation;
-    }
-  }
+  constructor(public name: string, public animation: AnimationMetadata) { super(); }
 }
 
 @CONST()
@@ -75,5 +66,8 @@ export function style(token: {[key: string]: string | number}): AnimationStyleMe
 }
 
 export function animation(name: string, animation: AnimationMetadata|AnimationMetadata[]): AnimationEntryMetadata {
-  return new AnimationEntryMetadata(name, animation);
+  var entry = isArray(animation)
+    ? new AnimationSequenceMetadata(<AnimationMetadata[]>animation)
+    : <AnimationMetadata>animation;
+  return new AnimationEntryMetadata(name, entry);
 }
diff --git a/modules/angular2/src/platform/dom/animation/web_animations_driver.ts b/modules/angular2/src/platform/dom/animation/web_animations_driver.ts
@@ -13,13 +13,13 @@ export class WebAnimationsDriver implements AnimationDriver {
           easing: string): AnimationPlayer {
 
     var formattedSteps = [];
-    if (!StringMapWrapper.isEmpty(startingStyles)) {
+    if (startingStyles.length > 0) {
       let data = _populateStyles(startingStyles);
       data['offset'] = 0;
       formattedSteps.push(data);
     }
 
-    keyframes.forEach((keyframe) => {
+    keyframes.forEach((keyframe: AnimationKeyframe) => {
       let data = _populateStyles(keyframe.styles);
       data['offset'] = keyframe.position / 100;
       formattedSteps.push(data);
@@ -44,7 +44,7 @@ export class WebAnimationsDriver implements AnimationDriver {
   }
 }
 
-function _populateStyles(styles) {
+function _populateStyles(styles: AnimationStyles[]) {
   var data = {};
   styles.forEach((entry) => {
     StringMapWrapper.forEach(entry.styles, (val, prop) => {

diff --git a/modules/angular2/src/testing/test_component_builder.ts b/modules/angular2/src/testing/test_component_builder.ts
@@ -24,6 +24,8 @@ import {DebugNode, DebugElement, getDebugNode} from 'angular2/src/core/debug/deb
 
 import {tick} from './fake_async';
 
+import {AnimationEntryMetadata} from 'angular2/animate';
+
 /**
  * Fixture for debugging and testing a component.
  */
@@ -99,7 +101,7 @@ export class TestComponentBuilder {
   /** @internal */
   _templateOverrides = new Map<Type, string>();
   /** @internal */
-  _animationOverrides = new Map<Type, {[key: string]: any | any[]}>();
+  _animationOverrides = new Map<Type, AnimationEntryMetadata[]>();
   /** @internal */
   _viewBindingsOverrides = new Map<Type, any[]>();
   /** @internal */
@@ -134,8 +136,7 @@ export class TestComponentBuilder {
     return clone;
   }
 
-  overrideAnimations(componentType: Type,
-                     animations: {[key: string]: any | any[]}): TestComponentBuilder {
+  overrideAnimations(componentType: Type, animations: AnimationEntryMetadata[]): TestComponentBuilder {
     var clone = this._clone();
     clone._animationOverrides.set(componentType, animations);
     return clone;

diff --git a/modules/angular2/test/compiler/compile_metadata_spec.ts b/modules/angular2/test/compiler/compile_metadata_spec.ts
@@ -69,10 +69,10 @@ export function main() {
         styles: ['someStyle'],
         styleUrls: ['someStyleUrl'],
         animations: [
-          new CompileAnimationEntryMetadata('animation', [
+          new CompileAnimationEntryMetadata('animation', new CompileAnimationSequenceMetadata([
             new CompileAnimationStyleMetadata({ 'opacity': 0 }),
             new CompileAnimationAnimateMetadata([{ 'opacity': 1 }], 1000)
-          ])
+          ]))
         ],
         ngContentSelectors: ['*']
       });
@@ -244,8 +244,7 @@ export function main() {
           new CompileAnimationSequenceMetadata([
             new CompileAnimationStyleMetadata({ "color": "red" }),
             new CompileAnimationAnimateMetadata([{ "color": "blue" }], 1000),
-          ])
-        );
+          ]));
         expect(CompileAnimationEntryMetadata.fromJson(full.toJson())).toEqual(full);
       });
 

diff --git a/modules/angular2/test/core/animation/animation_integration_spec.ts b/modules/angular2/test/core/animation/animation_integration_spec.ts
@@ -413,14 +413,14 @@ function declareTests() {
                             expect(enterCompleted).toEqual(true);
                           });
                     })));
+    */
 
       it('should destroy all animation players once the animation is complete',
          inject([TestComponentBuilder, AnimationDriver, NgZone],
                 fakeAsync(
                     (tcb: TestComponentBuilder, driver: MockAnimationDriver, zone: MockNgZone) => {
-                      tcb.overrideAnimations(DummyIfCmp,
-                                             {
-                                               "ngEnter": [
+                      tcb.overrideAnimations(DummyIfCmp, [
+                        animation("myAnimation(void => *)", [
                                                  style({'background': 'red', 'opacity': 0.5}),
                                                  animate({'background': 'black'}, 500),
                                                  group([
@@ -431,9 +431,8 @@ function declareTests() {
                                                    animate({'opacity': '1'}, 500),
                                                    animate({'background': 'white'}, 1000)
                                                  ])
-                                               ]
-                                             })
-                          .createAsync(DummyIfCmp)
+                                               ])
+                      ]).createAsync(DummyIfCmp)
                           .then((fixture) => {
                             tick();
 
@@ -444,7 +443,7 @@ function declareTests() {
                             flushMicrotasks();
                             zone.simulateMicrotaskEmpty();
 
-                            expect(driver.log.length).toEqual(6);
+                            expect(driver.log.length).toEqual(5);
 
                             driver.log.forEach(entry => entry['player'].finish());
                             driver.log.forEach(entry => {
@@ -454,8 +453,6 @@ function declareTests() {
                             });
                           });
                     })));
-    });
-    */
 
     it('should use first matched animation when multiple animations are registered',
        inject(