Revert "feat(upgrade): use ComponentFactory.inputs/outputs/ngContentSelectors"

This reverts commit a3e32fb7e1.

packages/upgrade/src/dynamic/content_projection_helper.ts

@@ -0,0 +1,70 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {CssSelector, SelectorMatcher, createElementCssSelector} from '@angular/compiler';
+import {Compiler, Type} from '@angular/core';
+
+import * as angular from '../common/angular1';
+import {COMPILER_KEY} from '../common/constants';
+import {ContentProjectionHelper} from '../common/content_projection_helper';
+import {getAttributesAsArray, getComponentName} from '../common/util';
+
+
+export class DynamicContentProjectionHelper extends ContentProjectionHelper {
+  groupProjectableNodes($injector: angular.IInjectorService, component: Type<any>, nodes: Node[]):
+      Node[][] {
+    const ng2Compiler = $injector.get(COMPILER_KEY) as Compiler;
+    const ngContentSelectors = ng2Compiler.getNgContentSelectors(component);
+
+    if (!ngContentSelectors) {
+      throw new Error('Expecting ngContentSelectors for: ' + getComponentName(component));
+    }
+
+    return this.groupNodesBySelector(ngContentSelectors, nodes);
+  }
+
+  /**
+   * Group a set of DOM nodes into `ngContent` groups, based on the given content selectors.
+   */
+  groupNodesBySelector(ngContentSelectors: string[], nodes: Node[]): Node[][] {
+    const projectableNodes: Node[][] = [];
+    let matcher = new SelectorMatcher();
+    let wildcardNgContentIndex: number;
+
+    for (let i = 0, ii = ngContentSelectors.length; i < ii; ++i) {
+      projectableNodes[i] = [];
+
+      const selector = ngContentSelectors[i];
+      if (selector === '*') {
+        wildcardNgContentIndex = i;
+      } else {
+        matcher.addSelectables(CssSelector.parse(selector), i);
+      }
+    }
+
+    for (let j = 0, jj = nodes.length; j < jj; ++j) {
+      const ngContentIndices: number[] = [];
+      const node = nodes[j];
+      const selector =
+          createElementCssSelector(node.nodeName.toLowerCase(), getAttributesAsArray(node));
+
+      matcher.match(selector, (_, index) => ngContentIndices.push(index));
+      ngContentIndices.sort();
+
+      if (wildcardNgContentIndex !== undefined) {
+        ngContentIndices.push(wildcardNgContentIndex);
+      }
+
+      if (ngContentIndices.length) {
+        projectableNodes[ngContentIndices[0]].push(node);
+      }
+    }
+
+    return projectableNodes;
+  }
+}

packages/upgrade/src/dynamic/ng_content_selector_helper.ts

@@ -0,0 +1,24 @@
+/**
+ * @license
+ * Copyright Google Inc. All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+
+import {Compiler, Injectable} from '@angular/core';
+
+import {ComponentInfo} from '../common/component_info';
+import {NgContentSelectorHelper} from '../common/ng_content_selector_helper';
+
+
+/**
+ * See `NgContentSelectorHelper` for more information about this class.
+ */
+@Injectable()
+export class DynamicNgContentSelectorHelper extends NgContentSelectorHelper {
+  constructor(private compiler: Compiler) { super(); }
+  getNgContentSelectors(info: ComponentInfo): string[] {
+    return this.compiler.getNgContentSelectors(info.component);
+  }
+}

packages/upgrade/src/dynamic/upgrade_adapter.ts

@@ -6,15 +6,19 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
+import {DirectiveResolver} from '@angular/compiler';
 import {Compiler, CompilerOptions, Directive, Injector, NgModule, NgModuleRef, NgZone, Provider, Testability, Type} from '@angular/core';
 import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
 import * as angular from '../common/angular1';
+import {ComponentInfo} from '../common/component_info';
 import {$$TESTABILITY, $COMPILE, $INJECTOR, $ROOT_SCOPE, COMPILER_KEY, INJECTOR_KEY, NG_ZONE_KEY} from '../common/constants';
 import {downgradeComponent} from '../common/downgrade_component';
 import {downgradeInjectable} from '../common/downgrade_injectable';
+import {NgContentSelectorHelper} from '../common/ng_content_selector_helper';
 import {Deferred, controllerKey, onError} from '../common/util';
 
+import {DynamicNgContentSelectorHelper} from './ng_content_selector_helper';
 import {UpgradeNg1ComponentAdapterBuilder} from './upgrade_ng1_adapter';
 
 let upgradeCount: number = 0;
@@ -100,6 +104,7 @@ let upgradeCount: number = 0;
  */
 export class UpgradeAdapter {
   private idPrefix: string = `NG2_UPGRADE_${upgradeCount++}_`;
+  private directiveResolver: DirectiveResolver = new DirectiveResolver();
   private downgradedComponents: Type<any>[] = [];
   /**
    * An internal map of ng1 components which need to up upgraded to ng2.
@@ -185,7 +190,10 @@ export class UpgradeAdapter {
   downgradeNg2Component(component: Type<any>): Function {
     this.downgradedComponents.push(component);
 
-    return downgradeComponent({component});
+    const metadata: Directive = this.directiveResolver.resolve(component);
+    const info: ComponentInfo = {component, inputs: metadata.inputs, outputs: metadata.outputs};
+
+    return downgradeComponent(info);
   }
 
   /**
@@ -553,6 +561,7 @@ export class UpgradeAdapter {
                     providers: [
                       {provide: $INJECTOR, useFactory: () => ng1Injector},
                       {provide: $COMPILE, useFactory: () => ng1Injector.get($COMPILE)},
+                      {provide: NgContentSelectorHelper, useClass: DynamicNgContentSelectorHelper},
                       this.upgradedProviders
                     ],
                     imports: [this.ng2AppModule],