f5f0038 fix(typescript): strip abstract keyword from properties in .d.ts

alexeagle · alexeagle · commit 1144eb16578b · 2016-05-01T02:50:49.000Z
diff --git a/BUILD_INFO b/BUILD_INFO
@@ -1,2 +1,2 @@
-Sun May 1 02:40:58 UTC 2016
-ad24e01949175336ee6deda8ce2418fb5334a93c
+Sun May 1 02:50:49 UTC 2016
+f5f0038e03d4003effb7d0f7b42b6e919cb2f317
diff --git a/lib/src/compiler/metadata_resolver.dart b/lib/src/compiler/metadata_resolver.dart
@@ -28,8 +28,7 @@ import "package:angular2/src/core/reflection/reflection.dart" show reflector;
 import "package:angular2/src/core/di.dart" show Injectable, Inject, Optional;
 import "package:angular2/src/core/platform_directives_and_pipes.dart"
     show PLATFORM_DIRECTIVES, PLATFORM_PIPES;
-import "util.dart"
-    show MODULE_SUFFIX, sanitizeIdentifier, ValueTransformer, visitValue;
+import "util.dart" show MODULE_SUFFIX, sanitizeIdentifier;
 import "assertions.dart" show assertArrayOfStrings;
 import "package:angular2/src/compiler/url_resolver.dart" show getUrlScheme;
 import "package:angular2/src/core/di/provider.dart" show Provider;
@@ -326,7 +325,9 @@ class CompileMetadataResolver {
             ? this.getTypeMetadata(
                 provider.useClass, staticTypeModuleUrl(provider.useClass))
             : null,
-        useValue: convertToCompileValue(provider.useValue),
+        useValue: isPresent(provider.useValue)
+            ? new cpl.CompileIdentifierMetadata(runtime: provider.useValue)
+            : null,
         useFactory: isPresent(provider.useFactory)
             ? this.getFactoryMetadata(
                 provider.useFactory, staticTypeModuleUrl(provider.useFactory))
@@ -431,19 +432,3 @@ String calcTemplateBaseUrl(
   }
   return reflector.importUri(type);
 }
-
-// Only fill CompileIdentifierMetadata.runtime if needed...
-dynamic convertToCompileValue(dynamic value) {
-  return visitValue(value, new _CompileValueConverter(), null);
-}
-
-class _CompileValueConverter extends ValueTransformer {
-  dynamic visitOther(dynamic value, dynamic context) {
-    if (isStaticType(value)) {
-      return new cpl.CompileIdentifierMetadata(
-          name: value["name"], moduleUrl: staticTypeModuleUrl(value));
-    } else {
-      return new cpl.CompileIdentifierMetadata(runtime: value);
-    }
-  }
-}
diff --git a/lib/src/compiler/output/dart_emitter.dart b/lib/src/compiler/output/dart_emitter.dart
@@ -372,10 +372,6 @@ class _DartEmitterVisitor extends AbstractEmitterVisitor
 
   void _visitIdentifier(CompileIdentifierMetadata value,
       List<o.Type> typeParams, EmitterVisitorContext ctx) {
-    if (isBlank(value.name)) {
-      throw new BaseException(
-          '''Internal error: unknown identifier ${ value}''');
-    }
     if (isPresent(value.moduleUrl) && value.moduleUrl != this._moduleUrl) {
       var prefix = this.importsWithPrefixes[value.moduleUrl];
       if (isBlank(prefix)) {
diff --git a/lib/src/compiler/output/js_emitter.dart b/lib/src/compiler/output/js_emitter.dart
@@ -9,7 +9,6 @@ import "package:angular2/src/facade/lang.dart"
         evalExpression,
         RegExpWrapper,
         StringWrapper;
-import "package:angular2/src/facade/exceptions.dart" show BaseException;
 import "abstract_emitter.dart" show OutputEmitter, EmitterVisitorContext;
 import "abstract_js_emitter.dart" show AbstractJsEmitterVisitor;
 import "path_util.dart" show getImportModulePath, ImportEnv;
@@ -39,10 +38,6 @@ class JsEmitterVisitor extends AbstractJsEmitterVisitor {
     /* super call moved to initializer */;
   }
   dynamic visitExternalExpr(o.ExternalExpr ast, EmitterVisitorContext ctx) {
-    if (isBlank(ast.value.name)) {
-      throw new BaseException(
-          '''Internal error: unknown identifier ${ ast . value}''');
-    }
     if (isPresent(ast.value.moduleUrl) &&
         ast.value.moduleUrl != this._moduleUrl) {
       var prefix = this.importsWithPrefixes[ast.value.moduleUrl];
diff --git a/lib/src/compiler/output/ts_emitter.dart b/lib/src/compiler/output/ts_emitter.dart
@@ -330,10 +330,6 @@ class _TsEmitterVisitor extends AbstractEmitterVisitor
 
   void _visitIdentifier(CompileIdentifierMetadata value,
       List<o.Type> typeParams, EmitterVisitorContext ctx) {
-    if (isBlank(value.name)) {
-      throw new BaseException(
-          '''Internal error: unknown identifier ${ value}''');
-    }
     if (isPresent(value.moduleUrl) && value.moduleUrl != this._moduleUrl) {
       var prefix = this.importsWithPrefixes[value.moduleUrl];
       if (isBlank(prefix)) {
diff --git a/lib/src/compiler/util.dart b/lib/src/compiler/util.dart
@@ -1,15 +1,7 @@
 library angular2.src.compiler.util;
 
 import "package:angular2/src/facade/lang.dart"
-    show
-        IS_DART,
-        StringWrapper,
-        Math,
-        isBlank,
-        isArray,
-        isStrictStringMap,
-        isPrimitive;
-import "package:angular2/src/facade/collection.dart" show StringMapWrapper;
+    show IS_DART, StringWrapper, Math, isBlank;
 
 var MODULE_SUFFIX = IS_DART ? ".dart" : "";
 var CAMEL_CASE_REGEXP = new RegExp(r'([A-Z])');
@@ -38,44 +30,3 @@ List<String> splitAtColon(String input, List<String> defaultValues) {
 String sanitizeIdentifier(String name) {
   return StringWrapper.replaceAll(name, new RegExp(r'\W'), "_");
 }
-
-dynamic visitValue(dynamic value, ValueVisitor visitor, dynamic context) {
-  if (isArray(value)) {
-    return visitor.visitArray((value as List<dynamic>), context);
-  } else if (isStrictStringMap(value)) {
-    return visitor.visitStringMap((value as Map<String, dynamic>), context);
-  } else if (isBlank(value) || isPrimitive(value)) {
-    return visitor.visitPrimitive(value, context);
-  } else {
-    return visitor.visitOther(value, context);
-  }
-}
-
-abstract class ValueVisitor {
-  dynamic visitArray(List<dynamic> arr, dynamic context);
-  dynamic visitStringMap(Map<String, dynamic> map, dynamic context);
-  dynamic visitPrimitive(dynamic value, dynamic context);
-  dynamic visitOther(dynamic value, dynamic context);
-}
-
-class ValueTransformer implements ValueVisitor {
-  dynamic visitArray(List<dynamic> arr, dynamic context) {
-    return arr.map((value) => visitValue(value, this, context)).toList();
-  }
-
-  dynamic visitStringMap(Map<String, dynamic> map, dynamic context) {
-    var result = {};
-    StringMapWrapper.forEach(map, (value, key) {
-      result[key] = visitValue(value, this, context);
-    });
-    return result;
-  }
-
-  dynamic visitPrimitive(dynamic value, dynamic context) {
-    return value;
-  }
-
-  dynamic visitOther(dynamic value, dynamic context) {
-    return value;
-  }
-}
diff --git a/lib/src/compiler/view_compiler/compile_element.dart b/lib/src/compiler/view_compiler/compile_element.dart
@@ -1,6 +1,5 @@
 library angular2.src.compiler.view_compiler.compile_element;
 
-import "package:angular2/src/facade/exceptions.dart" show BaseException;
 import "../output/output_ast.dart" as o;
 import "../identifiers.dart" show Identifiers, identifierToken;
 import "constants.dart" show InjectMethodVars;
@@ -28,7 +27,6 @@ import "util.dart"
 import "compile_query.dart"
     show CompileQuery, createQueryList, addQueryToTokenMap;
 import "compile_method.dart" show CompileMethod;
-import "../util.dart" show ValueTransformer, visitValue;
 
 class CompileNode {
   CompileElement parent;
@@ -106,7 +104,6 @@ class CompileElement extends CompileNode {
   _createAppElement() {
     var fieldName = '''_appEl_${ this . nodeIndex}''';
     var parentNodeIndex = this.isRootElement() ? null : this.parent.nodeIndex;
-    // private is fine here as no child view will reference an AppElement
     this.view.fields.add(new o.ClassField(fieldName,
         o.importType(Identifiers.AppElement), [o.StmtModifier.Private]));
     var statement = o.THIS_EXPR
@@ -190,7 +187,13 @@ class CompileElement extends CompileNode {
               .importExpr(provider.useClass)
               .instantiate(depsExpr, o.importType(provider.useClass));
         } else {
-          return _convertValueToOutputAst(provider.useValue);
+          if (provider.useValue is CompileIdentifierMetadata) {
+            return o.importExpr(provider.useValue);
+          } else if (provider.useValue is o.Expression) {
+            return provider.useValue;
+          } else {
+            return o.literal(provider.useValue);
+          }
         }
       }).toList();
       var propName =
@@ -465,12 +468,13 @@ o.Expression createProviderProperty(
     type = o.DYNAMIC_TYPE;
   }
   if (isEager) {
-    view.fields.add(new o.ClassField(propName, type));
+    view.fields.add(new o.ClassField(propName, type, [o.StmtModifier.Private]));
     view.createMethod.addStmt(
         o.THIS_EXPR.prop(propName).set(resolvedProviderValueExpr).toStmt());
   } else {
     var internalField = '''_${ propName}''';
-    view.fields.add(new o.ClassField(internalField, type));
+    view.fields
+        .add(new o.ClassField(internalField, type, [o.StmtModifier.Private]));
     var getter = new CompileMethod(view);
     getter.resetDebugInfo(compileElement.nodeIndex, compileElement.sourceAst);
     // Note: Equals is important for JS so that it also checks the undefined case!
@@ -490,37 +494,3 @@ class _QueryWithRead {
     this.read = isPresent(query.meta.read) ? query.meta.read : match;
   }
 }
-
-o.Expression _convertValueToOutputAst(dynamic value) {
-  return visitValue(value, new _ValueOutputAstTransformer(), null);
-}
-
-class _ValueOutputAstTransformer extends ValueTransformer {
-  o.Expression visitArray(List<dynamic> arr, dynamic context) {
-    return o.literalArr(
-        arr.map((value) => visitValue(value, this, context)).toList());
-  }
-
-  o.Expression visitStringMap(Map<String, dynamic> map, dynamic context) {
-    var entries = [];
-    StringMapWrapper.forEach(map, (value, key) {
-      entries.add([key, visitValue(value, this, context)]);
-    });
-    return o.literalMap(entries);
-  }
-
-  o.Expression visitPrimitive(dynamic value, dynamic context) {
-    return o.literal(value);
-  }
-
-  o.Expression visitOther(dynamic value, dynamic context) {
-    if (value is CompileIdentifierMetadata) {
-      return o.importExpr(value);
-    } else if (value is o.Expression) {
-      return value;
-    } else {
-      throw new BaseException(
-          '''Illegal state: Don\'t now how to compile value ${ value}''');
-    }
-  }
-}
diff --git a/lib/src/compiler/view_compiler/compile_pipe.dart b/lib/src/compiler/view_compiler/compile_pipe.dart
@@ -38,8 +38,8 @@ class CompilePipe {
       }
       return injectFromViewParentInjector(diDep.token, false);
     }).toList();
-    this.view.fields.add(
-        new o.ClassField(this.instance.name, o.importType(this.meta.type)));
+    this.view.fields.add(new o.ClassField(this.instance.name,
+        o.importType(this.meta.type), [o.StmtModifier.Private]));
     this.view.createMethod.resetDebugInfo(null, null);
     this.view.createMethod.addStmt(o.THIS_EXPR
         .prop(this.instance.name)
diff --git a/lib/src/compiler/view_compiler/compile_query.dart b/lib/src/compiler/view_compiler/compile_query.dart
@@ -109,8 +109,8 @@ o.Expression createQueryList(
     o.Expression directiveInstance,
     String propertyName,
     CompileView compileView) {
-  compileView.fields
-      .add(new o.ClassField(propertyName, o.importType(Identifiers.QueryList)));
+  compileView.fields.add(new o.ClassField(propertyName,
+      o.importType(Identifiers.QueryList), [o.StmtModifier.Private]));
   var expr = o.THIS_EXPR.prop(propertyName);
   compileView.createMethod.addStmt(o.THIS_EXPR
       .prop(propertyName)
diff --git a/lib/src/compiler/view_compiler/event_binder.dart b/lib/src/compiler/view_compiler/event_binder.dart
@@ -92,7 +92,6 @@ class CompileEventListener {
       markPathToRootStart.callMethod("markPathToRootAsCheckOnce", []).toStmt()
     ]))..addAll(this._method.finish())))
       ..addAll([new o.ReturnStatement(resultExpr)]));
-    // private is fine here as no child view will reference the event handler...
     this.compileElement.view.eventHandlerMethods.add(new o.ClassMethod(
         this._methodName,
         [this._eventParam],
@@ -124,7 +123,6 @@ class CompileEventListener {
     var disposable = o.variable(
         '''disposable_${ this . compileElement . view . disposables . length}''');
     this.compileElement.view.disposables.add(disposable);
-    // private is fine here as no child view will reference the event handler...
     this.compileElement.view.createMethod.addStmt(disposable
         .set(listenExpr)
         .toDeclStmt(o.FUNCTION_TYPE, [o.StmtModifier.Private]));
diff --git a/lib/src/compiler/view_compiler/property_binder.dart b/lib/src/compiler/view_compiler/property_binder.dart
@@ -45,7 +45,6 @@ bind(
     // e.g. an empty expression was given
     return;
   }
-  // private is fine here as no child view will reference the cached value...
   view.fields
       .add(new o.ClassField(fieldExpr.name, null, [o.StmtModifier.Private]));
   view.createMethod.addStmt(o.THIS_EXPR
diff --git a/lib/src/compiler/view_compiler/util.dart b/lib/src/compiler/view_compiler/util.dart
@@ -89,7 +89,8 @@ o.Expression createFlatArray(List<o.Expression> expressions) {
 
 createPureProxy(o.Expression fn, num argCount, o.ReadPropExpr pureProxyProp,
     CompileView view) {
-  view.fields.add(new o.ClassField(pureProxyProp.name, null));
+  view.fields.add(
+      new o.ClassField(pureProxyProp.name, null, [o.StmtModifier.Private]));
   var pureProxyId = argCount < Identifiers.pureProxies.length
       ? Identifiers.pureProxies[argCount]
       : null;
diff --git a/lib/src/compiler/view_compiler/view_builder.dart b/lib/src/compiler/view_compiler/view_builder.dart
@@ -137,7 +137,9 @@ class ViewBuilderVisitor implements TemplateAstVisitor {
       CompileElement parent) {
     var fieldName = '''_text_${ this . view . nodes . length}''';
     this.view.fields.add(new o.ClassField(
-        fieldName, o.importType(this.view.genConfig.renderTypes.renderText)));
+        fieldName,
+        o.importType(this.view.genConfig.renderTypes.renderText),
+        [o.StmtModifier.Private]));
     var renderNode = o.THIS_EXPR.prop(fieldName);
     var compileNode = new CompileNode(
         parent, this.view, this.view.nodes.length, renderNode, ast);
@@ -206,8 +208,10 @@ class ViewBuilderVisitor implements TemplateAstVisitor {
       ]);
     }
     var fieldName = '''_el_${ nodeIndex}''';
-    this.view.fields.add(new o.ClassField(fieldName,
-        o.importType(this.view.genConfig.renderTypes.renderElement)));
+    this.view.fields.add(new o.ClassField(
+        fieldName,
+        o.importType(this.view.genConfig.renderTypes.renderElement),
+        [o.StmtModifier.Private]));
     this.view.createMethod.addStmt(
         o.THIS_EXPR.prop(fieldName).set(createRenderNodeExpr).toStmt());
     var renderNode = o.THIS_EXPR.prop(fieldName);
@@ -281,8 +285,10 @@ class ViewBuilderVisitor implements TemplateAstVisitor {
       EmbeddedTemplateAst ast, CompileElement parent) {
     var nodeIndex = this.view.nodes.length;
     var fieldName = '''_anchor_${ nodeIndex}''';
-    this.view.fields.add(new o.ClassField(fieldName,
-        o.importType(this.view.genConfig.renderTypes.renderComment)));
+    this.view.fields.add(new o.ClassField(
+        fieldName,
+        o.importType(this.view.genConfig.renderTypes.renderComment),
+        [o.StmtModifier.Private]));
     this.view.createMethod.addStmt(o.THIS_EXPR
         .prop(fieldName)
         .set(ViewProperties.renderer.callMethod("createTemplateAnchor", [
diff --git a/lib/src/facade/lang.dart b/lib/src/facade/lang.dart
@@ -26,7 +26,6 @@ bool isString(Object obj) => obj is String;
 bool isFunction(Object obj) => obj is Function;
 bool isType(Object obj) => obj is Type;
 bool isStringMap(Object obj) => obj is Map;
-bool isStrictStringMap(Object obj) => obj is Map;
 bool isArray(Object obj) => obj is List;
 bool isPromise(Object obj) => obj is Future;
 bool isNumber(Object obj) => obj is num;
diff --git a/test/core/linker/view_injector_integration_spec.dart b/test/core/linker/view_injector_integration_spec.dart
@@ -363,38 +363,6 @@ main() {
         expect(d).toBeAnInstanceOf(NeedsDirective);
         expect(d.dependency).toBeAnInstanceOf(SimpleDirective);
       }));
-      it("should support useValue with different values", fakeAsync(() {
-        var el = createComp(
-            "",
-            tcb.overrideProviders(TestComp, [
-              provide("numLiteral", useValue: 0),
-              provide("boolLiteral", useValue: true),
-              provide("strLiteral", useValue: "a"),
-              provide("null", useValue: null),
-              provide("array", useValue: [1]),
-              provide("map", useValue: {"a": 1}),
-              provide("instance", useValue: new TestValue("a")),
-              provide("nested", useValue: [
-                {
-                  "a": [1]
-                },
-                new TestValue("b")
-              ])
-            ]));
-        expect(el.inject("numLiteral")).toBe(0);
-        expect(el.inject("boolLiteral")).toBe(true);
-        expect(el.inject("strLiteral")).toBe("a");
-        expect(el.inject("null")).toBe(null);
-        expect(el.inject("array")).toEqual([1]);
-        expect(el.inject("map")).toEqual({"a": 1});
-        expect(el.inject("instance")).toEqual(new TestValue("a"));
-        expect(el.inject("nested")).toEqual([
-          {
-            "a": [1]
-          },
-          new TestValue("b")
-        ]);
-      }));
       it("should instantiate providers that have dependencies with SkipSelf",
           fakeAsync(() {
         var el = createComp(
@@ -762,8 +730,3 @@ No provider for SimpleDirective ("[ERROR ->]<div needsDirectiveFromHost></div>")
     });
   });
 }
-
-class TestValue {
-  String value;
-  TestValue(this.value) {}
-}
