@angular/upgrade - npm Package Compare versions

Comparing version 2.0.0-rc.1 to 2.0.0-rc.2

esm/src/angular_js.d.ts

@@ -31,2 +31,3 @@ export interface IModule {
     $apply(exp: Function): any;
+    $evalAsync(): any;
     $$childTail: IScope;
@@ -33,0 +34,0 @@ $$childHead: IScope;

esm/src/angular_js.metadata.json

@@ -1,1 +0,1 @@
-{"__symbolic":"module","metadata":{"bootstrap":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"bootstrap"},"module":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"module"},"element":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"element"},"version":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"version"},"resumeBootstrap":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"resumeBootstrap"},"getTestability":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"getTestability"}}}
+{"__symbolic":"module","version":1,"metadata":{"bootstrap":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"bootstrap"},"module":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"module"},"element":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"element"},"version":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"version"},"resumeBootstrap":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"resumeBootstrap"},"getTestability":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"getTestability"}}}

esm/src/constants.js

@@ -14,3 +14,3 @@ export const NG2_COMPILER = 'ng2.Compiler';
 export const NG1_TESTABILITY = '$$testability';
-export const REQUIRE_INJECTOR = '^' + NG2_INJECTOR;
+export const REQUIRE_INJECTOR = '?^' + NG2_INJECTOR;
 //# sourceMappingURL=constants.js.map

esm/src/constants.metadata.json

@@ -1,1 +0,1 @@
-{"__symbolic":"module","metadata":{"NG2_COMPILER":"ng2.Compiler","NG2_INJECTOR":"ng2.Injector","NG2_COMPONENT_FACTORY_REF_MAP":"ng2.ComponentFactoryRefMap","NG2_ZONE":"ng2.NgZone","NG1_CONTROLLER":"$controller","NG1_SCOPE":"$scope","NG1_ROOT_SCOPE":"$rootScope","NG1_COMPILE":"$compile","NG1_HTTP_BACKEND":"$httpBackend","NG1_INJECTOR":"$injector","NG1_PARSE":"$parse","NG1_TEMPLATE_CACHE":"$templateCache","NG1_TESTABILITY":"$$testability","REQUIRE_INJECTOR":"^ng2.Injector"}}
+{"__symbolic":"module","version":1,"metadata":{"NG2_COMPILER":"ng2.Compiler","NG2_INJECTOR":"ng2.Injector","NG2_COMPONENT_FACTORY_REF_MAP":"ng2.ComponentFactoryRefMap","NG2_ZONE":"ng2.NgZone","NG1_CONTROLLER":"$controller","NG1_SCOPE":"$scope","NG1_ROOT_SCOPE":"$rootScope","NG1_COMPILE":"$compile","NG1_HTTP_BACKEND":"$httpBackend","NG1_INJECTOR":"$injector","NG1_PARSE":"$parse","NG1_TEMPLATE_CACHE":"$templateCache","NG1_TESTABILITY":"$$testability","REQUIRE_INJECTOR":"?^ng2.Injector"}}

esm/src/downgrade_ng2_adapter.d.ts

@@ -1,4 +0,4 @@
-import { ChangeDetectorRef, Injector, ComponentFactory, ComponentRef, SimpleChange } from '@angular/core';
+import { ChangeDetectorRef, ComponentFactory, ComponentRef, Injector, SimpleChanges } from '@angular/core';
+import * as angular from './angular_js';
 import { ComponentInfo } from './metadata';
-import * as angular from './angular_js';
 export declare class DowngradeNg2ComponentAdapter {
@@ -15,5 +15,3 @@ private id;
     inputChangeCount: number;
-    inputChanges: {
-        [key: string]: SimpleChange;
-    };
+    inputChanges: SimpleChanges;
     componentRef: ComponentRef<any>;
@@ -20,0 +18,0 @@ changeDetector: ChangeDetectorRef;

esm/src/downgrade_ng2_adapter.js

@@ -1,2 +0,2 @@
-import { provide, ReflectiveInjector } from '@angular/core';
+import { ReflectiveInjector } from '@angular/core';
 import { NG1_SCOPE } from './constants';
@@ -27,6 +27,5 @@ const INITIAL_VALUE = {
     bootstrapNg2() {
-        var childInjector = ReflectiveInjector.resolveAndCreate([provide(NG1_SCOPE, { useValue: this.componentScope })], this.parentInjector);
+        var childInjector = ReflectiveInjector.resolveAndCreate([{ provide: NG1_SCOPE, useValue: this.componentScope }], this.parentInjector);
         this.contentInsertionPoint = document.createComment('ng1 insertion point');
-        this.componentRef =
-            this.componentFactory.create(childInjector, [[this.contentInsertionPoint]], '#' + this.id);
+        this.componentRef = this.componentFactory.create(childInjector, [[this.contentInsertionPoint]], this.element[0]);
         this.changeDetector = this.componentRef.changeDetectorRef;
@@ -42,5 +41,5 @@ this.component = this.componentRef.instance;
             if (attrs.hasOwnProperty(input.attr)) {
-                var observeFn = ((prop) => {
+                var observeFn = ((prop /** TODO #9100 */) => {
                     var prevValue = INITIAL_VALUE;
-                    return (value) => {
+                    return (value /** TODO #9100 */) => {
                         if (this.inputChanges !== null) {
@@ -70,3 +69,3 @@ this.inputChangeCount++;
             if (expr != null) {
-                var watchFn = ((prop) => (value, prevValue) => {
+                var watchFn = ((prop /** TODO #9100 */) => (value /** TODO #9100 */, prevValue /** TODO #9100 */) => {
                     if (this.inputChanges != null) {
@@ -136,4 +135,5 @@ this.inputChangeCount++;
                     emitter.subscribe({
-                        next: assignExpr ? ((setter) => (value) => setter(this.scope, value))(setter) :
-                            ((getter) => (value) => getter(this.scope, { $event: value }))(getter)
+                        next: assignExpr ?
+                            ((setter) => (v /** TODO #9100 */) => setter(this.scope, v))(setter) :
+                            ((getter) => (v /** TODO #9100 */) => getter(this.scope, { $event: v }))(getter)
                     });
@@ -140,0 +140,0 @@ }

esm/src/metadata.js

@@ -11,3 +11,3 @@ import { DirectiveResolver } from '@angular/compiler';
     }
-    var selector = selector.replace(SKEWER_CASE, (all, letter) => letter.toUpperCase());
+    var selector = selector.replace(SKEWER_CASE, (all /** TODO #9100 */, letter) => letter.toUpperCase());
     return {
@@ -14,0 +14,0 @@ type: type,

esm/src/upgrade_adapter.d.ts

@@ -73,6 +73,2 @@ import { ApplicationRef, Injector, Provider, Type } from '@angular/core';
 export declare class UpgradeAdapter {
-    private idPrefix;
-    private upgradedComponents;
-    private downgradedComponents;
-    private providers;
     /**
@@ -277,3 +273,3 @@ * Allows Angular v2 Component to be used from AngularJS v1.
      */
-    addProvider(provider: Type | Provider | any[]): void;
+    addProvider(provider: Type | Provider | any[] | any): void;
     /**
@@ -337,3 +333,2 @@ * Allows AngularJS v1 service to be accessible from Angular v2.
     downgradeNg2Provider(token: any): Function;
-    private compileNg2Components(compiler, componentFactoryRefMap);
 }
@@ -344,3 +339,2 @@ /**
 export declare class UpgradeAdapterRef {
-    private _readyFn;
     ng1RootScope: angular.IRootScopeService;
@@ -350,3 +344,2 @@ ng1Injector: angular.IInjectorService;
     ng2Injector: Injector;
-    private _bootstrapDone(applicationRef, ng1Injector);
     /**
@@ -353,0 +346,0 @@ * Register a callback function which is notified upon successful hybrid AngularJS v1 / Angular v2

esm/src/upgrade_adapter.js

@@ -1,10 +0,10 @@
-import { provide, ApplicationRef, ComponentResolver, NgZone, ReflectiveInjector, Testability } from '@angular/core';
-import { BROWSER_APP_DYNAMIC_PROVIDERS } from '@angular/platform-browser-dynamic';
-import { browserPlatform } from '@angular/platform-browser';
+import { ApplicationRef, ComponentResolver, NgZone, ReflectiveInjector, Testability } from '@angular/core';
+import { BROWSER_APP_PROVIDERS, browserPlatform } from '@angular/platform-browser';
+import { BROWSER_APP_COMPILER_PROVIDERS } from '@angular/platform-browser-dynamic';
+import * as angular from './angular_js';
+import { NG1_COMPILE, NG1_INJECTOR, NG1_PARSE, NG1_ROOT_SCOPE, NG1_TESTABILITY, NG2_COMPILER, NG2_COMPONENT_FACTORY_REF_MAP, NG2_INJECTOR, NG2_ZONE, REQUIRE_INJECTOR } from './constants';
+import { DowngradeNg2ComponentAdapter } from './downgrade_ng2_adapter';
 import { getComponentInfo } from './metadata';
-import { onError, controllerKey } from './util';
-import { NG1_COMPILE, NG1_INJECTOR, NG1_PARSE, NG1_ROOT_SCOPE, NG1_TESTABILITY, NG2_COMPILER, NG2_INJECTOR, NG2_COMPONENT_FACTORY_REF_MAP, NG2_ZONE, REQUIRE_INJECTOR } from './constants';
-import { DowngradeNg2ComponentAdapter } from './downgrade_ng2_adapter';
 import { UpgradeNg1ComponentAdapterBuilder } from './upgrade_ng1_adapter';
-import * as angular from './angular_js';
+import { controllerKey, onError } from './util';
 var upgradeCount = 0;
@@ -268,6 +268,7 @@ /**
         var platformRef = browserPlatform();
-        var applicationRef = ReflectiveInjector.resolveAndCreate([
-            BROWSER_APP_DYNAMIC_PROVIDERS,
-            provide(NG1_INJECTOR, { useFactory: () => ng1Injector }),
-            provide(NG1_COMPILE, { useFactory: () => ng1Injector.get(NG1_COMPILE) }),
+        var applicationRef = ReflectiveInjector
+            .resolveAndCreate([
+            BROWSER_APP_PROVIDERS, BROWSER_APP_COMPILER_PROVIDERS,
+            { provide: NG1_INJECTOR, useFactory: () => ng1Injector },
+            { provide: NG1_COMPILE, useFactory: () => ng1Injector.get(NG1_COMPILE) },
             this.providers
@@ -292,4 +293,4 @@ ], platformRef.injector)
             .config([
-            '$provide',
-                (provide) => {
+            '$provide', '$injector',
+                (provide /** TODO #???? */, ng1Injector /** TODO #???? */) => {
                 provide.decorator(NG1_ROOT_SCOPE, [
@@ -301,6 +302,6 @@ '$delegate',
                             original$applyFn = rootScopePrototype.$apply;
-                            rootScopePrototype.$apply = (exp) => delayApplyExps.push(exp);
+                            rootScopePrototype.$apply = (exp /** TODO #???? */) => delayApplyExps.push(exp);
                         }
                         else {
-                            throw new Error("Failed to find '$apply' on '$rootScope'!");
+                            throw new Error('Failed to find \'$apply\' on \'$rootScope\'!');
                         }
@@ -310,22 +311,24 @@ return rootScope = rootScopeDelegate;
                 ]);
-                provide.decorator(NG1_TESTABILITY, [
-                    '$delegate',
-                    function (testabilityDelegate) {
-                        var ng2Testability = injector.get(Testability);
-                        var origonalWhenStable = testabilityDelegate.whenStable;
-                        var newWhenStable = (callback) => {
-                            var whenStableContext = this;
-                            origonalWhenStable.call(this, function () {
-                                if (ng2Testability.isStable()) {
-                                    callback.apply(this, arguments);
-                                }
-                                else {
-                                    ng2Testability.whenStable(newWhenStable.bind(whenStableContext, callback));
-                                }
-                            });
-                        };
-                        testabilityDelegate.whenStable = newWhenStable;
-                        return testabilityDelegate;
-                    }
-                ]);
+                if (ng1Injector.has(NG1_TESTABILITY)) {
+                    provide.decorator(NG1_TESTABILITY, [
+                        '$delegate',
+                        function (testabilityDelegate) {
+                            var ng2Testability = injector.get(Testability);
+                            var origonalWhenStable = testabilityDelegate.whenStable;
+                            var newWhenStable = (callback) => {
+                                var whenStableContext = this;
+                                origonalWhenStable.call(this, function () {
+                                    if (ng2Testability.isStable()) {
+                                        callback.apply(this, arguments);
+                                    }
+                                    else {
+                                        ng2Testability.whenStable(newWhenStable.bind(whenStableContext, callback));
+                                    }
+                                });
+                            };
+                            testabilityDelegate.whenStable = newWhenStable;
+                            return testabilityDelegate;
+                        }
+                    ]);
+                }
             }
@@ -335,7 +338,8 @@ ]);
             ng1Module.run([
-                '$injector',
-                '$rootScope',
+                '$injector', '$rootScope',
                     (injector, rootScope) => {
                     ng1Injector = injector;
-                    ngZone.onMicrotaskEmpty.subscribe({ next: (_) => ngZone.runOutsideAngular(() => rootScope.$apply()) });
+                    ngZone.onMicrotaskEmpty.subscribe({
+                        next: (_ /** TODO #???? */) => ngZone.runOutsideAngular(() => rootScope.$evalAsync())
+                    });
                     UpgradeNg1ComponentAdapterBuilder.resolve(this.downgradedComponents, injector)
@@ -364,5 +368,5 @@ .then(resolve, reject);
         });
-        Promise.all([
-            this.compileNg2Components(compiler, componentFactoryRefMap),
-            ng1BootstrapPromise,
+        Promise
+            .all([
+            this.compileNg2Components(compiler, componentFactoryRefMap), ng1BootstrapPromise,
             ng1compilePromise
@@ -455,6 +459,7 @@ ])
         var token = options && options.asToken || name;
-        this.providers.push(provide(token, {
+        this.providers.push({
+            provide: token,
             useFactory: (ng1Injector) => ng1Injector.get(name),
             deps: [NG1_INJECTOR]
-        }));
+        });
     }
@@ -505,7 +510,4 @@ /**
 function ng1ComponentDirective(info, idPrefix) {
-    directiveFactory.$inject = [NG2_COMPONENT_FACTORY_REF_MAP, NG1_PARSE];
-    function directiveFactory(componentFactoryRefMap, parse) {
-        var componentFactory = componentFactoryRefMap[info.selector];
-        if (!componentFactory)
-            throw new Error('Expecting ComponentFactory for: ' + info.selector);
+    directiveFactory.$inject = [NG1_INJECTOR, NG2_COMPONENT_FACTORY_REF_MAP, NG1_PARSE];
+    function directiveFactory(ng1Injector, componentFactoryRefMap, parse) {
         var idCount = 0;
@@ -517,3 +519,9 @@ return {
                 post: (scope, element, attrs, parentInjector, transclude) => {
+                    var componentFactory = componentFactoryRefMap[info.selector];
+                    if (!componentFactory)
+                        throw new Error('Expecting ComponentFactory for: ' + info.selector);
                     var domElement = element[0];
+                    if (parentInjector === null) {
+                        parentInjector = ng1Injector.get(NG2_INJECTOR);
+                    }
                     var facade = new DowngradeNg2ComponentAdapter(idPrefix + (idCount++), info, element, attrs, scope, parentInjector, parse, componentFactory);
@@ -520,0 +528,0 @@ facade.setupInputs();

esm/src/upgrade_ng1_adapter.js

 import { Directive, ElementRef, EventEmitter, Inject } from '@angular/core';
-import { NG1_COMPILE, NG1_SCOPE, NG1_HTTP_BACKEND, NG1_TEMPLATE_CACHE, NG1_CONTROLLER } from './constants';
+import * as angular from './angular_js';
+import { NG1_COMPILE, NG1_CONTROLLER, NG1_HTTP_BACKEND, NG1_SCOPE, NG1_TEMPLATE_CACHE } from './constants';
 import { controllerKey } from './util';
-import * as angular from './angular_js';
 const CAMEL_CASE = /([A-Z])/g;
@@ -23,3 +23,3 @@ const INITIAL_VALUE = {
         this.$controller = null;
-        var selector = name.replace(CAMEL_CASE, (all, next) => '-' + next.toLowerCase());
+        var selector = name.replace(CAMEL_CASE, (all /** TODO #9100 */, next) => '-' + next.toLowerCase());
         var self = this;
@@ -30,4 +30,3 @@ this.type =
                 constructor: [
-                    new Inject(NG1_SCOPE),
-                    ElementRef,
+                    new Inject(NG1_SCOPE), ElementRef,
                     function (scope, elementRef) {
@@ -109,6 +108,8 @@ return new UpgradeNg1ComponentAdapter(self.linkFn, scope, self.directive, elementRef, self.$controller, self.inputs, self.outputs, self.propertyOutputs, self.checkProperties, self.propertyMap);
         if (this.directive.template !== undefined) {
-            this.linkFn = compileHtml(this.directive.template);
+            this.linkFn = compileHtml(typeof this.directive.template === 'function' ? this.directive.template() :
+                this.directive.template);
         }
         else if (this.directive.templateUrl) {
-            var url = this.directive.templateUrl;
+            var url = typeof this.directive.templateUrl === 'function' ? this.directive.templateUrl() :
+                this.directive.templateUrl;
             var html = templateCache.get(url);
@@ -120,3 +121,3 @@ if (html !== undefined) {
                 return new Promise((resolve, err) => {
-                    httpBackend('GET', url, null, (status, response) => {
+                    httpBackend('GET', url, null, (status /** TODO #9100 */, response /** TODO #9100 */) => {
                         if (status == 200) {
@@ -136,3 +137,3 @@ resolve(this.linkFn = compileHtml(templateCache.put(url, response)));
         return null;
-        function compileHtml(html) {
+        function compileHtml(html /** TODO #9100 */) {
             var div = document.createElement('div');
@@ -167,2 +168,3 @@ div.innerHTML = html;
         this.directive = directive;
+        this.$controller = $controller;
         this.inputs = inputs;
@@ -175,23 +177,13 @@ this.outputs = outputs;
         this.checkLastValues = [];
+        this.$element = null;
         this.element = elementRef.nativeElement;
         this.componentScope = scope.$new(!!directive.scope);
-        var $element = angular.element(this.element);
+        this.$element = angular.element(this.element);
         var controllerType = directive.controller;
-        var controller = null;
-        if (controllerType) {
-            var locals = { $scope: this.componentScope, $element: $element };
-            controller = $controller(controllerType, locals, null, directive.controllerAs);
-            $element.data(controllerKey(directive.name), controller);
+        if (directive.bindToController && controllerType) {
+            this.destinationObj = this.buildController(controllerType);
         }
-        var link = directive.link;
-        if (typeof link == 'object')
-            link = link.pre;
-        if (link) {
-            var attrs = NOT_SUPPORTED;
-            var transcludeFn = NOT_SUPPORTED;
-            var linkController = this.resolveRequired($element, directive.require);
-            directive.link(this.componentScope, $element, attrs, linkController, transcludeFn);
+        else {
+            this.destinationObj = this.componentScope;
         }
-        this.destinationObj =
-            directive.bindToController && controller ? controller : this.componentScope;
         for (var i = 0; i < inputs.length; i++) {
@@ -202,3 +194,3 @@ this[inputs[i]] = null;
             var emitter = this[outputs[j]] = new EventEmitter();
-            this.setComponentProperty(outputs[j], ((emitter) => (value) => emitter.emit(value))(emitter));
+            this.setComponentProperty(outputs[j], ((emitter /** TODO #9100 */) => (value /** TODO #9100 */) => emitter.emit(value))(emitter));
         }
@@ -211,2 +203,14 @@ for (var k = 0; k < propOuts.length; k++) {
     ngOnInit() {
+        if (!this.directive.bindToController && this.directive.controller) {
+            this.buildController(this.directive.controller);
+        }
+        var link = this.directive.link;
+        if (typeof link == 'object')
+            link = link.pre;
+        if (link) {
+            var attrs = NOT_SUPPORTED;
+            var transcludeFn = NOT_SUPPORTED;
+            var linkController = this.resolveRequired(this.$element, this.directive.require);
+            this.directive.link(this.componentScope, this.$element, attrs, linkController, transcludeFn);
+        }
         var childNodes = [];
@@ -222,3 +226,5 @@ var childNode;
             }
-        }, { parentBoundTranscludeFn: (scope, cloneAttach) => { cloneAttach(childNodes); } });
+        }, {
+            parentBoundTranscludeFn: (scope /** TODO #9100 */, cloneAttach /** TODO #9100 */) => { cloneAttach(childNodes); }
+        });
         if (this.destinationObj.$onInit) {
@@ -258,2 +264,8 @@ this.destinationObj.$onInit();
     }
+    buildController(controllerType /** TODO #9100 */) {
+        var locals = { $scope: this.componentScope, $element: this.$element };
+        var controller = this.$controller(controllerType, locals, null, this.directive.controllerAs);
+        this.$element.data(controllerKey(this.directive.name), controller);
+        return controller;
+    }
     resolveRequired($element, require) {
@@ -260,0 +272,0 @@ if (!require) {

esm/upgrade.js

 /**
-* @module
-* @description
-* Adapter allowing AngularJS v1 and Angular v2 to run side by side in the same application.
-*/
+ * @module
+ * @description
+ * Adapter allowing AngularJS v1 and Angular v2 to run side by side in the same application.
+ */
 export { UpgradeAdapter, UpgradeAdapterRef } from './src/upgrade_adapter';
 //# sourceMappingURL=upgrade.js.map

package.json

 {
   "name": "@angular/upgrade",
-  "version": "2.0.0-rc.1",
+  "version": "2.0.0-rc.2",
   "description": "",
@@ -10,6 +10,10 @@ "main": "upgrade.js",
   "peerDependencies": {
-    "@angular/core": "2.0.0-rc.1",
-    "@angular/compiler": "2.0.0-rc.1",
-    "@angular/platform-browser": "2.0.0-rc.1"
+    "@angular/core": "2.0.0-rc.2",
+    "@angular/compiler": "2.0.0-rc.2",
+    "@angular/platform-browser": "2.0.0-rc.2"
+  },
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/angular/angular.git"
   }
 }

src/angular_js.d.ts

@@ -31,2 +31,3 @@ export interface IModule {
     $apply(exp: Function): any;
+    $evalAsync(): any;
     $$childTail: IScope;
@@ -33,0 +34,0 @@ $$childHead: IScope;

src/angular_js.metadata.json

@@ -1,1 +0,1 @@
-{"__symbolic":"module","metadata":{"bootstrap":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"bootstrap"},"module":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"module"},"element":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"element"},"version":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"version"},"resumeBootstrap":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"resumeBootstrap"},"getTestability":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"getTestability"}}}
+{"__symbolic":"module","version":1,"metadata":{"bootstrap":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"bootstrap"},"module":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"module"},"element":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"element"},"version":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"version"},"resumeBootstrap":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"resumeBootstrap"},"getTestability":{"__symbolic":"select","expression":{"__symbolic":"reference","name":"angular"},"member":"getTestability"}}}

src/constants.js

@@ -15,3 +15,3 @@ "use strict";
 exports.NG1_TESTABILITY = '$$testability';
-exports.REQUIRE_INJECTOR = '^' + exports.NG2_INJECTOR;
+exports.REQUIRE_INJECTOR = '?^' + exports.NG2_INJECTOR;
 //# sourceMappingURL=constants.js.map

src/constants.metadata.json

@@ -1,1 +0,1 @@
-{"__symbolic":"module","metadata":{"NG2_COMPILER":"ng2.Compiler","NG2_INJECTOR":"ng2.Injector","NG2_COMPONENT_FACTORY_REF_MAP":"ng2.ComponentFactoryRefMap","NG2_ZONE":"ng2.NgZone","NG1_CONTROLLER":"$controller","NG1_SCOPE":"$scope","NG1_ROOT_SCOPE":"$rootScope","NG1_COMPILE":"$compile","NG1_HTTP_BACKEND":"$httpBackend","NG1_INJECTOR":"$injector","NG1_PARSE":"$parse","NG1_TEMPLATE_CACHE":"$templateCache","NG1_TESTABILITY":"$$testability","REQUIRE_INJECTOR":"^ng2.Injector"}}
+{"__symbolic":"module","version":1,"metadata":{"NG2_COMPILER":"ng2.Compiler","NG2_INJECTOR":"ng2.Injector","NG2_COMPONENT_FACTORY_REF_MAP":"ng2.ComponentFactoryRefMap","NG2_ZONE":"ng2.NgZone","NG1_CONTROLLER":"$controller","NG1_SCOPE":"$scope","NG1_ROOT_SCOPE":"$rootScope","NG1_COMPILE":"$compile","NG1_HTTP_BACKEND":"$httpBackend","NG1_INJECTOR":"$injector","NG1_PARSE":"$parse","NG1_TEMPLATE_CACHE":"$templateCache","NG1_TESTABILITY":"$$testability","REQUIRE_INJECTOR":"?^ng2.Injector"}}

src/downgrade_ng2_adapter.d.ts

@@ -1,4 +0,4 @@
-import { ChangeDetectorRef, Injector, ComponentFactory, ComponentRef, SimpleChange } from '@angular/core';
+import { ChangeDetectorRef, ComponentFactory, ComponentRef, Injector, SimpleChanges } from '@angular/core';
+import * as angular from './angular_js';
 import { ComponentInfo } from './metadata';
-import * as angular from './angular_js';
 export declare class DowngradeNg2ComponentAdapter {
@@ -15,5 +15,3 @@ private id;
     inputChangeCount: number;
-    inputChanges: {
-        [key: string]: SimpleChange;
-    };
+    inputChanges: SimpleChanges;
     componentRef: ComponentRef<any>;
@@ -20,0 +18,0 @@ changeDetector: ChangeDetectorRef;

src/downgrade_ng2_adapter.js

@@ -28,6 +28,5 @@ "use strict";
     DowngradeNg2ComponentAdapter.prototype.bootstrapNg2 = function () {
-        var childInjector = core_1.ReflectiveInjector.resolveAndCreate([core_1.provide(constants_1.NG1_SCOPE, { useValue: this.componentScope })], this.parentInjector);
+        var childInjector = core_1.ReflectiveInjector.resolveAndCreate([{ provide: constants_1.NG1_SCOPE, useValue: this.componentScope }], this.parentInjector);
         this.contentInsertionPoint = document.createComment('ng1 insertion point');
-        this.componentRef =
-            this.componentFactory.create(childInjector, [[this.contentInsertionPoint]], '#' + this.id);
+        this.componentRef = this.componentFactory.create(childInjector, [[this.contentInsertionPoint]], this.element[0]);
         this.changeDetector = this.componentRef.changeDetectorRef;
@@ -44,5 +43,5 @@ this.component = this.componentRef.instance;
             if (attrs.hasOwnProperty(input.attr)) {
-                var observeFn = (function (prop) {
+                var observeFn = (function (prop /** TODO #9100 */) {
                     var prevValue = INITIAL_VALUE;
-                    return function (value) {
+                    return function (value /** TODO #9100 */) {
                         if (_this.inputChanges !== null) {
@@ -72,9 +71,11 @@ _this.inputChangeCount++;
             if (expr != null) {
-                var watchFn = (function (prop) { return function (value, prevValue) {
-                    if (_this.inputChanges != null) {
-                        _this.inputChangeCount++;
-                        _this.inputChanges[prop] = new Ng1Change(prevValue, value);
-                    }
-                    _this.component[prop] = value;
-                }; })(input.prop);
+                var watchFn = (function (prop /** TODO #9100 */) {
+                    return function (value /** TODO #9100 */, prevValue /** TODO #9100 */) {
+                        if (_this.inputChanges != null) {
+                            _this.inputChangeCount++;
+                            _this.inputChanges[prop] = new Ng1Change(prevValue, value);
+                        }
+                        _this.component[prop] = value;
+                    };
+                })(input.prop);
                 this.componentScope.$watch(expr, watchFn);
@@ -139,4 +140,7 @@ }
                     emitter.subscribe({
-                        next: assignExpr ? (function (setter) { return function (value) { return setter(_this.scope, value); }; })(setter) :
-                            (function (getter) { return function (value) { return getter(_this.scope, { $event: value }); }; })(getter)
+                        next: assignExpr ?
+                            (function (setter) { return function (v /** TODO #9100 */) { return setter(_this.scope, v); }; })(setter) :
+                            (function (getter) { return function (v /** TODO #9100 */) {
+                                return getter(_this.scope, { $event: v });
+                            }; })(getter)
                     });
@@ -143,0 +147,0 @@ }

src/metadata.js

@@ -12,3 +12,3 @@ "use strict";
     }
-    var selector = selector.replace(SKEWER_CASE, function (all, letter) { return letter.toUpperCase(); });
+    var selector = selector.replace(SKEWER_CASE, function (all /** TODO #9100 */, letter) { return letter.toUpperCase(); });
     return {
@@ -15,0 +15,0 @@ type: type,

src/upgrade_adapter.d.ts

@@ -73,6 +73,2 @@ import { ApplicationRef, Injector, Provider, Type } from '@angular/core';
 export declare class UpgradeAdapter {
-    private idPrefix;
-    private upgradedComponents;
-    private downgradedComponents;
-    private providers;
     /**
@@ -277,3 +273,3 @@ * Allows Angular v2 Component to be used from AngularJS v1.
      */
-    addProvider(provider: Type | Provider | any[]): void;
+    addProvider(provider: Type | Provider | any[] | any): void;
     /**
@@ -337,3 +333,2 @@ * Allows AngularJS v1 service to be accessible from Angular v2.
     downgradeNg2Provider(token: any): Function;
-    private compileNg2Components(compiler, componentFactoryRefMap);
 }
@@ -344,3 +339,2 @@ /**
 export declare class UpgradeAdapterRef {
-    private _readyFn;
     ng1RootScope: angular.IRootScopeService;
@@ -350,3 +344,2 @@ ng1Injector: angular.IInjectorService;
     ng2Injector: Injector;
-    private _bootstrapDone(applicationRef, ng1Injector);
     /**
@@ -353,0 +346,0 @@ * Register a callback function which is notified upon successful hybrid AngularJS v1 / Angular v2

src/upgrade_adapter.js

 "use strict";
 var core_1 = require('@angular/core');
+var platform_browser_1 = require('@angular/platform-browser');
 var platform_browser_dynamic_1 = require('@angular/platform-browser-dynamic');
-var platform_browser_1 = require('@angular/platform-browser');
-var metadata_1 = require('./metadata');
-var util_1 = require('./util');
+var angular = require('./angular_js');
 var constants_1 = require('./constants');
 var downgrade_ng2_adapter_1 = require('./downgrade_ng2_adapter');
+var metadata_1 = require('./metadata');
 var upgrade_ng1_adapter_1 = require('./upgrade_ng1_adapter');
-var angular = require('./angular_js');
+var util_1 = require('./util');
 var upgradeCount = 0;
@@ -270,6 +270,7 @@ /**
         var platformRef = platform_browser_1.browserPlatform();
-        var applicationRef = core_1.ReflectiveInjector.resolveAndCreate([
-            platform_browser_dynamic_1.BROWSER_APP_DYNAMIC_PROVIDERS,
-            core_1.provide(constants_1.NG1_INJECTOR, { useFactory: function () { return ng1Injector; } }),
-            core_1.provide(constants_1.NG1_COMPILE, { useFactory: function () { return ng1Injector.get(constants_1.NG1_COMPILE); } }),
+        var applicationRef = core_1.ReflectiveInjector
+            .resolveAndCreate([
+            platform_browser_1.BROWSER_APP_PROVIDERS, platform_browser_dynamic_1.BROWSER_APP_COMPILER_PROVIDERS,
+            { provide: constants_1.NG1_INJECTOR, useFactory: function () { return ng1Injector; } },
+            { provide: constants_1.NG1_COMPILE, useFactory: function () { return ng1Injector.get(constants_1.NG1_COMPILE); } },
             this.providers
@@ -294,4 +295,4 @@ ], platformRef.injector)
             .config([
-            '$provide',
-            function (provide) {
+            '$provide', '$injector',
+            function (provide /** TODO #???? */, ng1Injector /** TODO #???? */) {
                 provide.decorator(constants_1.NG1_ROOT_SCOPE, [
@@ -303,6 +304,8 @@ '$delegate',
                             original$applyFn = rootScopePrototype.$apply;
-                            rootScopePrototype.$apply = function (exp) { return delayApplyExps.push(exp); };
+                            rootScopePrototype.$apply = function (exp /** TODO #???? */) {
+                                return delayApplyExps.push(exp);
+                            };
                         }
                         else {
-                            throw new Error("Failed to find '$apply' on '$rootScope'!");
+                            throw new Error('Failed to find \'$apply\' on \'$rootScope\'!');
                         }
@@ -312,23 +315,25 @@ return rootScope = rootScopeDelegate;
                 ]);
-                provide.decorator(constants_1.NG1_TESTABILITY, [
-                    '$delegate',
-                    function (testabilityDelegate) {
-                        var _this = this;
-                        var ng2Testability = injector.get(core_1.Testability);
-                        var origonalWhenStable = testabilityDelegate.whenStable;
-                        var newWhenStable = function (callback) {
-                            var whenStableContext = _this;
-                            origonalWhenStable.call(_this, function () {
-                                if (ng2Testability.isStable()) {
-                                    callback.apply(this, arguments);
-                                }
-                                else {
-                                    ng2Testability.whenStable(newWhenStable.bind(whenStableContext, callback));
-                                }
-                            });
-                        };
-                        testabilityDelegate.whenStable = newWhenStable;
-                        return testabilityDelegate;
-                    }
-                ]);
+                if (ng1Injector.has(constants_1.NG1_TESTABILITY)) {
+                    provide.decorator(constants_1.NG1_TESTABILITY, [
+                        '$delegate',
+                        function (testabilityDelegate) {
+                            var _this = this;
+                            var ng2Testability = injector.get(core_1.Testability);
+                            var origonalWhenStable = testabilityDelegate.whenStable;
+                            var newWhenStable = function (callback) {
+                                var whenStableContext = _this;
+                                origonalWhenStable.call(_this, function () {
+                                    if (ng2Testability.isStable()) {
+                                        callback.apply(this, arguments);
+                                    }
+                                    else {
+                                        ng2Testability.whenStable(newWhenStable.bind(whenStableContext, callback));
+                                    }
+                                });
+                            };
+                            testabilityDelegate.whenStable = newWhenStable;
+                            return testabilityDelegate;
+                        }
+                    ]);
+                }
             }
@@ -338,7 +343,10 @@ ]);
             ng1Module.run([
-                '$injector',
-                '$rootScope',
+                '$injector', '$rootScope',
                 function (injector, rootScope) {
                     ng1Injector = injector;
-                    ngZone.onMicrotaskEmpty.subscribe({ next: function (_) { return ngZone.runOutsideAngular(function () { return rootScope.$apply(); }); } });
+                    ngZone.onMicrotaskEmpty.subscribe({
+                        next: function (_ /** TODO #???? */) {
+                            return ngZone.runOutsideAngular(function () { return rootScope.$evalAsync(); });
+                        }
+                    });
                     upgrade_ng1_adapter_1.UpgradeNg1ComponentAdapterBuilder.resolve(_this.downgradedComponents, injector)
@@ -367,5 +375,5 @@ .then(resolve, reject);
         });
-        Promise.all([
-            this.compileNg2Components(compiler, componentFactoryRefMap),
-            ng1BootstrapPromise,
+        Promise
+            .all([
+            this.compileNg2Components(compiler, componentFactoryRefMap), ng1BootstrapPromise,
             ng1compilePromise
@@ -458,6 +466,7 @@ ])
         var token = options && options.asToken || name;
-        this.providers.push(core_1.provide(token, {
+        this.providers.push({
+            provide: token,
             useFactory: function (ng1Injector) { return ng1Injector.get(name); },
             deps: [constants_1.NG1_INJECTOR]
-        }));
+        });
     };
@@ -511,7 +520,4 @@ /**
 function ng1ComponentDirective(info, idPrefix) {
-    directiveFactory.$inject = [constants_1.NG2_COMPONENT_FACTORY_REF_MAP, constants_1.NG1_PARSE];
-    function directiveFactory(componentFactoryRefMap, parse) {
-        var componentFactory = componentFactoryRefMap[info.selector];
-        if (!componentFactory)
-            throw new Error('Expecting ComponentFactory for: ' + info.selector);
+    directiveFactory.$inject = [constants_1.NG1_INJECTOR, constants_1.NG2_COMPONENT_FACTORY_REF_MAP, constants_1.NG1_PARSE];
+    function directiveFactory(ng1Injector, componentFactoryRefMap, parse) {
         var idCount = 0;
@@ -523,3 +529,9 @@ return {
                 post: function (scope, element, attrs, parentInjector, transclude) {
+                    var componentFactory = componentFactoryRefMap[info.selector];
+                    if (!componentFactory)
+                        throw new Error('Expecting ComponentFactory for: ' + info.selector);
                     var domElement = element[0];
+                    if (parentInjector === null) {
+                        parentInjector = ng1Injector.get(constants_1.NG2_INJECTOR);
+                    }
                     var facade = new downgrade_ng2_adapter_1.DowngradeNg2ComponentAdapter(idPrefix + (idCount++), info, element, attrs, scope, parentInjector, parse, componentFactory);
@@ -526,0 +538,0 @@ facade.setupInputs();

src/upgrade_ng1_adapter.js

 "use strict";
 var core_1 = require('@angular/core');
+var angular = require('./angular_js');
 var constants_1 = require('./constants');
 var util_1 = require('./util');
-var angular = require('./angular_js');
 var CAMEL_CASE = /([A-Z])/g;
@@ -24,3 +24,3 @@ var INITIAL_VALUE = {
         this.$controller = null;
-        var selector = name.replace(CAMEL_CASE, function (all, next) { return '-' + next.toLowerCase(); });
+        var selector = name.replace(CAMEL_CASE, function (all /** TODO #9100 */, next) { return '-' + next.toLowerCase(); });
         var self = this;
@@ -31,4 +31,3 @@ this.type =
                 constructor: [
-                    new core_1.Inject(constants_1.NG1_SCOPE),
-                    core_1.ElementRef,
+                    new core_1.Inject(constants_1.NG1_SCOPE), core_1.ElementRef,
                     function (scope, elementRef) {
@@ -111,6 +110,8 @@ return new UpgradeNg1ComponentAdapter(self.linkFn, scope, self.directive, elementRef, self.$controller, self.inputs, self.outputs, self.propertyOutputs, self.checkProperties, self.propertyMap);
         if (this.directive.template !== undefined) {
-            this.linkFn = compileHtml(this.directive.template);
+            this.linkFn = compileHtml(typeof this.directive.template === 'function' ? this.directive.template() :
+                this.directive.template);
         }
         else if (this.directive.templateUrl) {
-            var url = this.directive.templateUrl;
+            var url = typeof this.directive.templateUrl === 'function' ? this.directive.templateUrl() :
+                this.directive.templateUrl;
             var html = templateCache.get(url);
@@ -122,3 +123,3 @@ if (html !== undefined) {
                 return new Promise(function (resolve, err) {
-                    httpBackend('GET', url, null, function (status, response) {
+                    httpBackend('GET', url, null, function (status /** TODO #9100 */, response /** TODO #9100 */) {
                         if (status == 200) {
@@ -138,3 +139,3 @@ resolve(_this.linkFn = compileHtml(templateCache.put(url, response)));
         return null;
-        function compileHtml(html) {
+        function compileHtml(html /** TODO #9100 */) {
             var div = document.createElement('div');
@@ -171,2 +172,3 @@ div.innerHTML = html;
         this.directive = directive;
+        this.$controller = $controller;
         this.inputs = inputs;
@@ -179,23 +181,13 @@ this.outputs = outputs;
         this.checkLastValues = [];
+        this.$element = null;
         this.element = elementRef.nativeElement;
         this.componentScope = scope.$new(!!directive.scope);
-        var $element = angular.element(this.element);
+        this.$element = angular.element(this.element);
         var controllerType = directive.controller;
-        var controller = null;
-        if (controllerType) {
-            var locals = { $scope: this.componentScope, $element: $element };
-            controller = $controller(controllerType, locals, null, directive.controllerAs);
-            $element.data(util_1.controllerKey(directive.name), controller);
+        if (directive.bindToController && controllerType) {
+            this.destinationObj = this.buildController(controllerType);
         }
-        var link = directive.link;
-        if (typeof link == 'object')
-            link = link.pre;
-        if (link) {
-            var attrs = NOT_SUPPORTED;
-            var transcludeFn = NOT_SUPPORTED;
-            var linkController = this.resolveRequired($element, directive.require);
-            directive.link(this.componentScope, $element, attrs, linkController, transcludeFn);
+        else {
+            this.destinationObj = this.componentScope;
         }
-        this.destinationObj =
-            directive.bindToController && controller ? controller : this.componentScope;
         for (var i = 0; i < inputs.length; i++) {
@@ -206,3 +198,5 @@ this[inputs[i]] = null;
             var emitter = this[outputs[j]] = new core_1.EventEmitter();
-            this.setComponentProperty(outputs[j], (function (emitter) { return function (value) { return emitter.emit(value); }; })(emitter));
+            this.setComponentProperty(outputs[j], (function (emitter /** TODO #9100 */) { return function (value /** TODO #9100 */) {
+                return emitter.emit(value);
+            }; })(emitter));
         }
@@ -216,2 +210,14 @@ for (var k = 0; k < propOuts.length; k++) {
         var _this = this;
+        if (!this.directive.bindToController && this.directive.controller) {
+            this.buildController(this.directive.controller);
+        }
+        var link = this.directive.link;
+        if (typeof link == 'object')
+            link = link.pre;
+        if (link) {
+            var attrs = NOT_SUPPORTED;
+            var transcludeFn = NOT_SUPPORTED;
+            var linkController = this.resolveRequired(this.$element, this.directive.require);
+            this.directive.link(this.componentScope, this.$element, attrs, linkController, transcludeFn);
+        }
         var childNodes = [];
@@ -227,3 +233,5 @@ var childNode;
             }
-        }, { parentBoundTranscludeFn: function (scope, cloneAttach) { cloneAttach(childNodes); } });
+        }, {
+            parentBoundTranscludeFn: function (scope /** TODO #9100 */, cloneAttach /** TODO #9100 */) { cloneAttach(childNodes); }
+        });
         if (this.destinationObj.$onInit) {
@@ -263,2 +271,8 @@ this.destinationObj.$onInit();
     };
+    UpgradeNg1ComponentAdapter.prototype.buildController = function (controllerType /** TODO #9100 */) {
+        var locals = { $scope: this.componentScope, $element: this.$element };
+        var controller = this.$controller(controllerType, locals, null, this.directive.controllerAs);
+        this.$element.data(util_1.controllerKey(this.directive.name), controller);
+        return controller;
+    };
     UpgradeNg1ComponentAdapter.prototype.resolveRequired = function ($element, require) {
@@ -265,0 +279,0 @@ if (!require) {

upgrade.js

 "use strict";
 /**
-* @module
-* @description
-* Adapter allowing AngularJS v1 and Angular v2 to run side by side in the same application.
-*/
+ * @module
+ * @description
+ * Adapter allowing AngularJS v1 and Angular v2 to run side by side in the same application.
+ */
 var upgrade_adapter_1 = require('./src/upgrade_adapter');
@@ -8,0 +8,0 @@ exports.UpgradeAdapter = upgrade_adapter_1.UpgradeAdapter;

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Minified code

Quality

This package contains minified code. This may be harmless in some cases where minified code is included in packaged libraries, however packages on npm should not minify code.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

No repository

Supply chain risk

Package does not have a linked source code repository. Without this field, a package will have no reference to the location of the source code use to generate the package.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

382460

increased by9.35%

Number of package files

63

increased by5%

Lines of code

4559

increased by1.2%

Worsened metrics

Number of low quality alerts

3

increased by50%

Number of low supply chain risk alerts

12

increased by20%

No dependency changes