Update ng-sample project for NG2 RC6

hdeshev · hdeshev · commit 288794236c0e · 2016-09-09T13:13:19.000+03:00
diff --git a/ng-sample/app/app.ts b/ng-sample/app/app.ts
@@ -11,7 +11,7 @@ import { NgModule } from "@angular/core";
 import { Router } from "@angular/router";
 import { NativeScriptRouterModule } from "nativescript-angular/router";
 import { NativeScriptFormsModule } from "nativescript-angular/forms";
-import { HTTP_PROVIDERS } from "@angular/http";
+import { NativeScriptHttpModule } from "nativescript-angular/http";
 import { rendererTraceCategory, routerTraceCategory, listViewTraceCategory } from "nativescript-angular/trace";
 
 import trace = require("trace");
@@ -54,11 +54,13 @@ import { AnimationStatesTest } from "./examples/animation/animation-states-test"
     imports: [
         NativeScriptModule,
         NativeScriptFormsModule,
+        NativeScriptHttpModule,
         NativeScriptRouterModule,
     ],
     exports: [
         NativeScriptModule,
         NativeScriptFormsModule,
+        NativeScriptHttpModule,
         NativeScriptRouterModule,
     ],
     providers: []
@@ -70,6 +72,10 @@ function makeExampleModule(componentType) {
     if (componentType.routes) {
         imports.push(NativeScriptRouterModule.forRoot(componentType.routes))
     }
+    let exports: any[] = [];
+    if (componentType.exports) {
+        exports = componentType.exports
+    }
     let entries = [];
     if (componentType.entries) {
         entries = componentType.entries;
@@ -83,8 +89,12 @@ function makeExampleModule(componentType) {
         bootstrap: [componentType],
         imports: imports,
         entryComponents: entries,
-        declarations: entries,
+        declarations: [
+            ...entries,
+            ...exports,
+        ],
         providers: providers,
+        exports: exports,
     })
     class ExampleModuleForComponent {}
 
@@ -112,7 +122,7 @@ function makeExampleModule(componentType) {
 //platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationStatesTest));
 //platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationNgClassTest));
 //platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationKeyframesTest));
-//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationEnterLeaveTest));
+platformNativeScriptDynamic().bootstrapModule(makeExampleModule(AnimationEnterLeaveTest));
 
 //Livesync test
 var cachedUrl: string;
@@ -134,5 +144,5 @@ onAfterLivesync.subscribe((moduleRef) => {
     }
 });
 
-platformNativeScriptDynamic().bootstrapModule(makeExampleModule(LivesyncApp));
+//platformNativeScriptDynamic().bootstrapModule(makeExampleModule(LivesyncApp));
 console.log("APP RESTART");
diff --git a/ng-sample/app/examples/http/http-test.ts b/ng-sample/app/examples/http/http-test.ts
@@ -1,6 +1,5 @@
 import {Component} from '@angular/core';
 import {Http} from '@angular/http';
-import {NS_HTTP_PROVIDERS} from 'nativescript-angular/http';
 import 'rxjs/add/operator/map';
 
 /* IMPORTANT
@@ -24,7 +23,6 @@ https://blog.nraboy.com/2015/12/fix-ios-9-app-transport-security-issues-in-nativ
         margin-bottom:20;
       }`
     ],
-    providers: [NS_HTTP_PROVIDERS]
 })
 export class HttpTest {
   public title: string;
diff --git a/ng-sample/app/examples/list/list-test-async.ts b/ng-sample/app/examples/list/list-test-async.ts
@@ -1,6 +1,6 @@
 import { Component, Input, ChangeDetectionStrategy } from '@angular/core';
 import * as Rx from 'rxjs/Observable';
-import { combineLatestStatic } from 'rxjs/operator/combineLatest';
+import { combineLatest } from 'rxjs/operator/combineLatest';
 import { BehaviorSubject } from "rxjs/BehaviorSubject";
 import { DataItem, DataService } from "./data.service"
 
@@ -92,7 +92,7 @@ export class ListTestFilterAsync {
 
     constructor(private service: DataService) {
         // Create filteredItems$ by combining the service.items$ and filter$
-        this.filteredItems$ = combineLatestStatic(this.service.items$, this.filter$, (data, filter) => {
+        this.filteredItems$ = combineLatest(this.service.items$, this.filter$, (data, filter) => {
             return filter ? data.filter(v => v.id % 2 === 0) : data;
         });
     }
@@ -114,4 +114,4 @@ export class ListTestFilterAsync {
     public toogleFilter() {
         this.filter$.next(!this.filter$.value);
     }
-}
+}
diff --git a/ng-sample/app/examples/list/list-test.ts b/ng-sample/app/examples/list/list-test.ts
@@ -36,7 +36,6 @@ export class ItemComponent implements AfterViewChecked, DoCheck {
 @Component({
     selector: 'list-test',
     styleUrls: ['examples/list/styles.css'],
-    directives: [ItemComponent],
     changeDetection: ChangeDetectionStrategy.OnPush,
     template: `
         <GridLayout rows="auto * auto">
@@ -85,4 +84,8 @@ export class ListTest {
         this.counter++;
         this.myItems.push(new DataItem(this.counter, "data item " + this.counter));
     }
-}
+
+    public static entries = [
+        ItemComponent
+    ]
+}
diff --git a/ng-sample/app/examples/livesync-test/first/first.component.css b/ng-sample/app/examples/livesync-test/first/first.component.css
@@ -11,4 +11,4 @@ button {
 
 stack-layout {
     background-color: lightgreen;
-}
+}
diff --git a/ng-sample/app/examples/livesync-test/first/first.component.ts b/ng-sample/app/examples/livesync-test/first/first.component.ts
@@ -1,12 +1,9 @@
 import { Component } from "@angular/core";
-import { ROUTER_DIRECTIVES } from '@angular/router';
-import { NS_ROUTER_DIRECTIVES} from "nativescript-angular/router"
 
 @Component({
     selector: "first",
-    directives: [ROUTER_DIRECTIVES, NS_ROUTER_DIRECTIVES],
     styleUrls: ["examples/livesync-test/first/first.component.css"],
     templateUrl: "examples/livesync-test/first/first.component.xml"
 })
 export class FirstComponent {
-}
+}
diff --git a/ng-sample/app/examples/livesync-test/livesync-test-app.ts b/ng-sample/app/examples/livesync-test/livesync-test-app.ts
@@ -1,6 +1,4 @@
 import { Component } from "@angular/core";
-import { RouterConfig } from '@angular/router';
-import { NS_ROUTER_DIRECTIVES, nsProvideRouter} from "nativescript-angular/router"
 
 import {FirstComponent} from "./first/first.component";
 import {SecondComponent} from "./second/second.component";
diff --git a/ng-sample/app/examples/livesync-test/second/second.component.css b/ng-sample/app/examples/livesync-test/second/second.component.css
@@ -11,4 +11,4 @@ button {
 
 stack-layout {
     background-color: lightblue;
-}
+}
diff --git a/ng-sample/app/examples/livesync-test/second/second.component.ts b/ng-sample/app/examples/livesync-test/second/second.component.ts
@@ -1,12 +1,9 @@
 import { Component } from "@angular/core";
-import { ROUTER_DIRECTIVES } from '@angular/router';
-import { NS_ROUTER_DIRECTIVES} from "nativescript-angular/router"
 
 @Component({
     selector: "second",
-    directives: [ROUTER_DIRECTIVES, NS_ROUTER_DIRECTIVES],
     styleUrls: ["examples/livesync-test/second/second.component.css"],
     templateUrl: "examples/livesync-test/second/second.component.xml"
 })
 export class SecondComponent {
-}
+}
diff --git a/ng-sample/app/examples/modal/modal-content.ts b/ng-sample/app/examples/modal/modal-content.ts
@@ -1,4 +1,4 @@
-import {Component} from '@angular/core';
+import {Component, Input} from '@angular/core';
 import {ModalDialogParams} from "nativescript-angular/directives/dialogs";
 
 @Component({
@@ -14,7 +14,7 @@ import {ModalDialogParams} from "nativescript-angular/directives/dialogs";
     `
 })
 export class ModalContent {
-    public prompt: string;
+    @Input() public prompt: string;
     constructor(private params: ModalDialogParams) {
         console.log("ModalContent.constructor: " + JSON.stringify(params))
         this.prompt = params.context.promptMsg;
diff --git a/ng-sample/app/examples/modal/modal-test.ts b/ng-sample/app/examples/modal/modal-test.ts
@@ -5,8 +5,6 @@ import {ModalContent} from "./modal-content";
 
 @Component({
     selector: 'modal-test',
-    directives: [ModalDialogHost],
-    providers: [ModalDialogService],
     template: `
     <GridLayout rows="*, auto" modal-dialog-host>
         <StackLayout verticalAlignment="top" margin="12">
@@ -31,6 +29,14 @@ export class ModalTest {
     constructor(private modal: ModalDialogService) {
     }
 
+    static entries = [
+        ModalContent
+    ];
+
+    static exports = [
+        ModalContent
+    ];
+
     public showModal(fullscreen: boolean) {
         var options: ModalDialogOptions = {
             context: { promptMsg: "This is the prompt message!" },
diff --git a/ng-sample/app/examples/renderer-test.ts b/ng-sample/app/examples/renderer-test.ts
@@ -5,7 +5,6 @@ import {CheckedValueAccessor} from 'nativescript-angular/value-accessors/checked
 
 @Component({
     selector: 'templated-component',
-    directives: [TemplatedComponent],
     templateUrl: 'title.html'
 })
 export class TemplatedComponent {
@@ -16,7 +15,7 @@ export class TemplatedComponent {
 @Directive({
     selector: 'Progress',
 })
-export class ProgressComponent {
+export class ProgressDirective {
     constructor(private element: ElementRef) {
     }
 
@@ -27,7 +26,6 @@ export class ProgressComponent {
 
 @Component({
 	selector: 'renderer-test',
-    directives: [TemplatedComponent, ProgressComponent],
 	templateUrl: './examples/renderer-test.html' 
 })
 export class RendererTest {
@@ -41,6 +39,14 @@ export class RendererTest {
 
     public testModel = { mydate: new Date() };
 
+    static entries = [
+        TemplatedComponent,
+    ];
+
+    static exports = [
+        ProgressDirective
+    ];
+
     constructor() {
         this.buttonText = 'Save...'
         this.showDetails = true;
diff --git a/ng-sample/app/examples/router/clear-history-test.ts b/ng-sample/app/examples/router/clear-history-test.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, OnDestroy, Injectable } from "@angular/core";
-import { RouterConfig, ActivatedRoute, Router, ROUTER_DIRECTIVES, CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot} from '@angular/router';
+import { ActivatedRoute, Router, CanDeactivate, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
 import { Observable } from "rxjs";
-import { NS_ROUTER_DIRECTIVES, nsProvideRouter, RouterExtensions, PageRoute} from "nativescript-angular/router";
+import { RouterExtensions, PageRoute } from "nativescript-angular/router";
 import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
 import { BehaviorSubject} from "rxjs";
 
@@ -50,7 +50,6 @@ export class LocationLog {
 
 @Component({
     selector: "first",
-    directives: [ROUTER_DIRECTIVES, NS_ROUTER_DIRECTIVES, LocationLog],
     templateUrl: "examples/router/clear-history.component.html",
     styleUrls: ["examples/router/styles.css"]
 })
@@ -63,7 +62,6 @@ class FirstComponent implements OnInit, OnDestroy {
 
 @Component({
     selector: "second",
-    directives: [ROUTER_DIRECTIVES, NS_ROUTER_DIRECTIVES, LocationLog],
     templateUrl: "examples/router/clear-history.component.html",
     styleUrls: ["examples/router/styles.css"]
 })
@@ -76,7 +74,6 @@ class SecondComponent implements OnInit, OnDestroy {
 
 @Component({
     selector: "third",
-    directives: [ROUTER_DIRECTIVES, NS_ROUTER_DIRECTIVES, LocationLog],
     templateUrl: "examples/router/clear-history.component.html",
     styleUrls: ["examples/router/styles.css"]
 })
@@ -89,13 +86,12 @@ class ThirdComponent implements OnInit, OnDestroy {
 
 @Component({
     selector: 'navigation-test',
-    directives: [ROUTER_DIRECTIVES, NS_ROUTER_DIRECTIVES],
     providers: [LocationLogService],
     template: `<page-router-outlet></page-router-outlet>`
 })
 export class ClearHistoryAppComponent {
-    static routes: RouterConfig = [
-        { path: "", redirectTo: "/first", terminal: true },
+    static routes = [
+        { path: "", redirectTo: "/first", terminal: true, pathMatch: "full" },
         { path: "first", component: FirstComponent },
         { path: "second", component: SecondComponent },
         { path: "third", component: ThirdComponent },
@@ -105,5 +101,6 @@ export class ClearHistoryAppComponent {
         FirstComponent,
         SecondComponent,
         ThirdComponent,
+        LocationLog,
     ]
 }
diff --git a/ng-sample/app/examples/router/login-test.ts b/ng-sample/app/examples/router/login-test.ts
@@ -1,7 +1,7 @@
 import { Component, OnInit, OnDestroy, Injectable } from "@angular/core";
-import { RouterConfig, Router, CanActivate} from '@angular/router';
+import { Router, CanActivate} from '@angular/router';
 import { Observable } from "rxjs";
-import { NS_ROUTER_DIRECTIVES, nsProvideRouter, RouterExtensions, PageRoute} from "nativescript-angular/router";
+import { RouterExtensions } from "nativescript-angular/router";
 import { NSLocationStrategy } from "nativescript-angular/router/ns-location-strategy";
 import { BehaviorSubject} from "rxjs";
 import * as appSettings from "application-settings"
@@ -116,8 +116,8 @@ class AuthGuard implements CanActivate {
     template: `<page-router-outlet></page-router-outlet>`
 })
 export class LoginAppComponent {
-    static routes: RouterConfig = [
-        { path: "", redirectTo: "/main", terminal: true },
+    static routes = [
+        { path: "", redirectTo: "/main", terminal: true, pathMatch: "full" },
         { path: "main", component: MainComponent, canActivate: [AuthGuard] },
         { path: "login", component: LoginComponent },
     ]
diff --git a/ng-sample/app/examples/router/page-router-outlet-nested-test.ts b/ng-sample/app/examples/router/page-router-outlet-nested-test.ts
@@ -1,15 +1,13 @@
 import { Component, OnInit, OnDestroy } from "@angular/core";
-import { RouterConfig, ActivatedRoute, Router, ROUTER_DIRECTIVES, Event } from '@angular/router';
+import { ActivatedRoute, Router, Event } from '@angular/router';
 import { Observable } from "rxjs";
-import { NS_ROUTER_DIRECTIVES, nsProvideRouter} from "nativescript-angular/router"
 import { Location, LocationStrategy} from '@angular/common';
 import { Page } from "ui/page";
 
 
 @Component({
     selector: "first",
     styleUrls: ["examples/router/styles.css"],
-    directives: [ROUTER_DIRECTIVES, NS_ROUTER_DIRECTIVES],
     template: `
     <StackLayout>
         <Label text="First component" class="title"></Label>
@@ -38,7 +36,6 @@ class FirstComponent implements OnInit, OnDestroy {
 @Component({
     selector: 'master',
     styleUrls: ["examples/router/styles.css"],
-    directives: [NS_ROUTER_DIRECTIVES],
     template: `
     <StackLayout class="master">
         <Label text="Master View" class="subtitle"></Label>
@@ -58,7 +55,6 @@ class MasterComponent {
 @Component({
     selector: 'detail',
     styleUrls: ["examples/router/styles.css"],
-    directives: [NS_ROUTER_DIRECTIVES],
     template: `
     <StackLayout class="detail">
         <Label text="Detail View" class="subtitle"></Label>
@@ -80,7 +76,6 @@ class DetailComponent {
 @Component({
     selector: "second",
     styleUrls: ["examples/router/styles.css"],
-    directives: [ROUTER_DIRECTIVES, NS_ROUTER_DIRECTIVES],
     template: `
     <StackLayout>
         <Label [text]="'Second component: ' + (depth$ | async)" class="title"></Label>
@@ -121,11 +116,10 @@ class SecondComponent implements OnInit, OnDestroy {
 
 @Component({
     selector: 'navigation-test',
-    directives: [ROUTER_DIRECTIVES, NS_ROUTER_DIRECTIVES],
     template: `<page-router-outlet></page-router-outlet>`
 })
 export class PageRouterOutletNestedAppComponent {
-    static routes: RouterConfig = [
+    static routes = [
         { path: "", component: FirstComponent },
         {
             path: "second/:depth", component: SecondComponent,
diff --git a/ng-sample/app/examples/router/page-router-outlet-test.ts b/ng-sample/app/examples/router/page-router-outlet-test.ts
diff --git a/ng-sample/app/examples/router/router-outlet-test.ts b/ng-sample/app/examples/router/router-outlet-test.ts
diff --git a/ng-sample/app/performance/benchmark.ts b/ng-sample/app/performance/benchmark.ts
diff --git a/ng-sample/package.json b/ng-sample/package.json
diff --git a/ng-sample/tsconfig.json b/ng-sample/tsconfig.json
diff --git a/tests/app/tests/style-properties.ts b/tests/app/tests/style-properties.ts
