ES2015 compatible imports

Author: vakrilov

.gitignore

@@ -2,6 +2,7 @@ bin/dist
 node_modules
 tags
 **/*.js.map
+**/*.metadata.json
 
 /hooks
 

nativescript-angular/animation-driver.ts

@@ -1,7 +1,7 @@
-import { AnimationPlayer, AnimationStyles, AnimationKeyframe  } from "./private_import_core";
+import { AnimationPlayer, AnimationStyles, AnimationKeyframe } from "./private_import_core";
 import { NativeScriptAnimationPlayer } from './animation-player';
-import {View} from "ui/core/view";
-import styleProperty = require('ui/styling/style-property');
+import { View } from "ui/core/view";
+import { getPropertyByCssName } from 'ui/styling/style-property';
 
 export abstract class AnimationDriver {
     abstract animate(
@@ -12,7 +12,7 @@ export abstract class AnimationDriver {
 export class NativeScriptAnimationDriver implements AnimationDriver {
 
     computeStyle(element: any, prop: string): string {
-        return (<View>element).style._getValue(styleProperty.getPropertyByCssName(prop));
+        return (<View>element).style._getValue(getPropertyByCssName(prop));
     }
 
     animate(element: any, startingStyles: AnimationStyles, keyframes: AnimationKeyframe[], duration: number, delay: number, easing: string): AnimationPlayer {

nativescript-angular/animation-player.ts

@@ -1,10 +1,10 @@
-import { AnimationPlayer, AnimationKeyframe  } from "./private_import_core";
+import { AnimationPlayer, AnimationKeyframe } from "./private_import_core";
 import { KeyframeAnimation, KeyframeAnimationInfo, KeyframeInfo, KeyframeDeclaration } from 'ui/animation/keyframe-animation';
 import { View } from "ui/core/view";
-import enums = require("ui/enums");
-import styleProperty = require('ui/styling/style-property');
-import observable = require('ui/core/dependency-observable');
-import types = require("utils/types");
+import { AnimationCurve } from "ui/enums";
+import { ValueSource } from 'ui/core/dependency-observable';
+import { isString } from "utils/types";
+import * as styleProperty from 'ui/styling/style-property';
 
 export class NativeScriptAnimationPlayer implements AnimationPlayer {
 
@@ -35,7 +35,7 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
         keyframeAnimationInfo.duration = duration;
         keyframeAnimationInfo.delay = delay;
         keyframeAnimationInfo.iterations = 1;
-        keyframeAnimationInfo.curve = easing ? NativeScriptAnimationPlayer.animationTimingFunctionConverter(easing) : enums.AnimationCurve.ease;
+        keyframeAnimationInfo.curve = easing ? NativeScriptAnimationPlayer.animationTimingFunctionConverter(easing) : AnimationCurve.ease;
         keyframeAnimationInfo.keyframes = new Array<KeyframeInfo>();
         keyframeAnimationInfo.isForwards = true;
 
@@ -61,7 +61,7 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
             keyframeAnimationInfo.keyframes.push(keyframeInfo);
         }
 
-        this.animation = KeyframeAnimation.keyframeAnimationFromInfo(keyframeAnimationInfo, observable.ValueSource.VisualState);
+        this.animation = KeyframeAnimation.keyframeAnimationFromInfo(keyframeAnimationInfo, ValueSource.VisualState);
     }
 
     init(): void {
@@ -136,24 +136,24 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
     static animationTimingFunctionConverter(value): any {
         switch (value) {
             case "ease":
-                return enums.AnimationCurve.ease;
+                return AnimationCurve.ease;
             case "linear":
-                return enums.AnimationCurve.linear;
+                return AnimationCurve.linear;
             case "ease-in":
-                return enums.AnimationCurve.easeIn;
+                return AnimationCurve.easeIn;
             case "ease-out":
-                return enums.AnimationCurve.easeOut;
+                return AnimationCurve.easeOut;
             case "ease-in-out":
-                return enums.AnimationCurve.easeInOut;
+                return AnimationCurve.easeInOut;
             case "spring":
-                return enums.AnimationCurve.spring;
+                return AnimationCurve.spring;
             default:
                 if (value.indexOf("cubic-bezier(") === 0) {
                     let bezierArr = value.substring(13).split(/[,]+/);
                     if (bezierArr.length !== 4) {
                         throw new Error("Invalid value for animation: " + value);
                     }
-                    return enums.AnimationCurve.cubicBezier(
+                    return AnimationCurve.cubicBezier(
                         NativeScriptAnimationPlayer.bezieArgumentConverter(bezierArr[0]),
                         NativeScriptAnimationPlayer.bezieArgumentConverter(bezierArr[1]),
                         NativeScriptAnimationPlayer.bezieArgumentConverter(bezierArr[2]),
@@ -178,7 +178,7 @@ export class NativeScriptAnimationPlayer implements AnimationPlayer {
             operations[value] = value;
             return operations;
         }
-        else if (types.isString(value)) {
+        else if (isString(value)) {
             let operations = {};
             let operator = "";
             let pos = 0;

nativescript-angular/common/detached-loader.ts

@@ -1,9 +1,8 @@
 import {
     ComponentRef, ComponentFactory, ViewContainerRef,
-    Component, Type, ViewChild, Compiler,
-    ComponentFactoryResolver, ChangeDetectorRef, Host
+    Component, Type, ComponentFactoryResolver, ChangeDetectorRef
 } from '@angular/core';
-import trace = require("trace");
+import * as trace from "trace";
 
 type AnyComponentRef = ComponentRef<any>;
 interface PendingLoadEntry {

nativescript-angular/directives/action-bar.ts

@@ -1,9 +1,9 @@
-import {Directive, Component, ContentChildren, ElementRef, Optional} from '@angular/core';
-import {ActionItem, ActionBar, NavigationButton} from "ui/action-bar";
-import {isBlank} from "../lang-facade";
+import { Directive, Component, ElementRef, Optional } from '@angular/core';
+import { ActionItem, ActionBar, NavigationButton } from "ui/action-bar";
+import { isBlank } from "../lang-facade";
 import {Page} from "ui/page";
-import {View} from 'ui/core/view';
-import {registerElement, ViewClassMeta, NgView } from '../element-registry';
+import { View } from 'ui/core/view';
+import { registerElement, ViewClassMeta, NgView } from '../element-registry';
 
 var actionBarMeta: ViewClassMeta = {
     skipAddToDom: true,
@@ -95,7 +95,7 @@ export class ActionItemDirective {
             this.ownerScope.onActionInit(this);
         }
     }
-    
+
     ngOnDestroy() {
         if (this.ownerScope) {
             this.ownerScope.onActionDestroy(this);

nativescript-angular/http.ts

@@ -1,21 +1,25 @@
 import {
-    Http, XHRBackend, RequestOptions 
+    Http, XHRBackend, RequestOptions
 } from '@angular/http';
 import { NSXSRFStrategy, NSHttp } from "./http/ns-http";
 import { NSFileSystem } from "./file-system/ns-file-system";
 
 import { NgModule } from "@angular/core";
 import { HttpModule, XSRFStrategy } from "@angular/http";
 
+export function nsHttpFactory(backend, options, nsFileSystem) {
+    return new NSHttp(backend, options, nsFileSystem);
+};
+
+export function nsXSRFStrategyFactory() {
+    return new NSXSRFStrategy();
+};
+
 @NgModule({
     providers: [
-      { provide: XSRFStrategy, useValue: new NSXSRFStrategy() },
-      NSFileSystem,
-      {
-        provide: Http, useFactory: (backend, options, nsFileSystem) => {
-          return new NSHttp(backend, options, nsFileSystem);
-        }, deps: [XHRBackend, RequestOptions, NSFileSystem]
-      }
+        { provide: XSRFStrategy, useFactory: nsXSRFStrategyFactory },
+        NSFileSystem,
+        { provide: Http, useFactory: nsHttpFactory, deps: [XHRBackend, RequestOptions, NSFileSystem] }
     ],
     imports: [
         HttpModule,

nativescript-angular/index.ts

@@ -0,0 +1,6 @@
+export * from "./platform";
+export * from "./router";
+export * from "./forms";
+export * from "./http";
+export * from "./directives";
+export * from "./common/detached-loader";

nativescript-angular/nativescript.module.ts

@@ -1,5 +1,5 @@
 import 'globals';
-import "./zone.js/dist/zone-nativescript";
+import './zone.js/dist/zone-nativescript';
 
 import 'reflect-metadata';
 import './polyfills/array';
@@ -15,7 +15,7 @@ import {
     Renderer,
     RootRenderer,
     Sanitizer,
-    NgModule
+    NgModule, NO_ERRORS_SCHEMA, CUSTOM_ELEMENTS_SCHEMA
 } from '@angular/core';
 import {
     defaultPageProvider, defaultFrameProvider, defaultDeviceProvider
@@ -26,13 +26,7 @@ import { NS_DIRECTIVES } from './directives';
 import * as nativescriptIntl from "nativescript-intl";
 global.Intl = nativescriptIntl;
 
-export interface AppOptions {
-    bootInExistingPage: boolean,
-    cssFile?: string;
-    startPageActionBarHidden?: boolean;
-}
-
-export const errorHandlerFactory = () => {
+export function errorHandlerFactory() {
     return new ErrorHandler(true);
 };
 
@@ -67,7 +61,8 @@ export const errorHandlerFactory = () => {
         DetachedLoader,
         ModalDialogHost,
         ...NS_DIRECTIVES,
-    ]
+    ],
+    schemas: [NO_ERRORS_SCHEMA]
 })
 export class NativeScriptModule {
 }

nativescript-angular/package.json

@@ -15,7 +15,9 @@
   },
   "scripts": {
     "postinstall": "node postinstall.js",
-    "prepublish": "tsc"
+    "ngc": "ngc -p tsconfig.json",
+    "tsc": "tsc -p tsconfig.json",
+    "prepublish": "npm run tsc && npm run ngc"
   },
   "dependencies": {
     "nativescript-intl": "~0.0.4",
@@ -37,7 +39,8 @@
   "devDependencies": {
     "tns-core-modules": ">=2.2.0 || >=2.2.0-2016",
     "zone.js": "^0.6.21",
-    "typescript": "^1.8.10"
+    "typescript": "^2.0.2",
+    "@angular/compiler-cli": "2.1.0"
   },
   "nativescript": {}
 }

nativescript-angular/platform-providers.ts

@@ -1,13 +1,12 @@
-import {topmost, Frame} from 'ui/frame';
-import {Page} from 'ui/page';
-import {Provider, OpaqueToken} from '@angular/core';
-import {device, Device} from "platform";
-import {NativeScriptAnimationDriver} from './animation-driver';
+import { topmost, Frame } from 'ui/frame';
+import { Page } from 'ui/page';
+import { OpaqueToken } from '@angular/core';
+import { device, Device } from "platform";
 
 export const APP_ROOT_VIEW = new OpaqueToken('App Root View');
 export const DEVICE = new OpaqueToken('platfrom device');
 
-export const defaultPageProvider = {provide: Page, useFactory: getDefaultPage};
+export const defaultPageProvider = { provide: Page, useFactory: getDefaultPage };
 
 export function getDefaultPage(): Page {
     const frame = topmost();
@@ -18,6 +17,6 @@ export function getDefaultPage(): Page {
     }
 }
 
-export const defaultFrameProvider = {provide: Frame, useFactory: topmost};
+export const defaultFrameProvider = { provide: Frame, useFactory: topmost };
 
-export const defaultDeviceProvider = {provide: DEVICE, useValue: device};
+export const defaultDeviceProvider = { provide: DEVICE, useValue: device };

nativescript-angular/platform.ts

@@ -1,5 +1,5 @@
 import 'globals';
-import "./zone.js/dist/zone-nativescript";
+import './zone.js/dist/zone-nativescript';
 
 import 'reflect-metadata';
 import './polyfills/array';
@@ -11,7 +11,7 @@ import {
     COMPILER_PROVIDERS,
     platformCoreDynamic
 } from '@angular/compiler';
-import { Provider } from '@angular/core';
+import { Provider, platformCore } from '@angular/core';
 import {
     Type,
     Injector,
@@ -60,6 +60,9 @@ export const NS_COMPILER_PROVIDERS = [
     }
 ];
 
+export const onBeforeLivesync = new EventEmitter<NgModuleRef<any>>();
+export const onAfterLivesync = new EventEmitter<NgModuleRef<any>>();
+
 type BootstrapperAction = () => Promise<NgModuleRef<any>>;
 
 let lastBootstrappedModule: WeakRef<NgModuleRef<any>>;
@@ -69,26 +72,34 @@ interface BootstrapParams {
 }
 
 class NativeScriptPlatformRef extends PlatformRef {
+    private _bootstrapper: BootstrapperAction;
+
     constructor(private platform: PlatformRef, private appOptions?: AppOptions) {
         super();
     }
 
     bootstrapModuleFactory<M>(moduleFactory: NgModuleFactory<M>): Promise<NgModuleRef<M>> {
-        throw new Error("Not implemented.");
+        this._bootstrapper = () => this.platform.bootstrapModuleFactory(moduleFactory);
+        
+        this.bootstrapApp();
+        
+        return null; //Make the compiler happy
     }
 
-    private _bootstrapper: BootstrapperAction;
-
     bootstrapModule<M>(moduleType: Type<M>, compilerOptions: CompilerOptions | CompilerOptions[] = []): Promise<NgModuleRef<M>> {
         this._bootstrapper = () => this.platform.bootstrapModule(moduleType, compilerOptions);
-        // Patch livesync
+
+        this.bootstrapApp();
+
+        return null; //Make the compiler happy
+    }
+
+    private bootstrapApp() {
         global.__onLiveSyncCore = () => this.livesyncModule();
 
         const mainPageEntry = this.createNavigationEntry(this._bootstrapper);
 
         application.start(mainPageEntry);
-
-        return null; //Make the compiler happy
     }
 
     livesyncModule(): void {
@@ -186,6 +197,7 @@ class NativeScriptPlatformRef extends PlatformRef {
     }
 }
 
+// Dynamic platfrom 
 const _platformNativeScriptDynamic: PlatformFactory = createPlatformFactory(
     platformCoreDynamic, 'nativeScriptDynamic', NS_COMPILER_PROVIDERS);
 
@@ -198,6 +210,15 @@ export function platformNativeScriptDynamic(options?: AppOptions, extraProviders
     }
 }
 
-export const onBeforeLivesync = new EventEmitter<NgModuleRef<any>>();
-export const onAfterLivesync = new EventEmitter<NgModuleRef<any>>();
+// "Static" platform
+const _platformNativeScript: PlatformFactory = createPlatformFactory(
+    platformCore, 'nativeScript');
 
+export function platformNativeScript(options?: AppOptions, extraProviders?: any[]): PlatformRef {
+    //Return raw platform to advanced users only if explicitly requested
+    if (options && options.bootInExistingPage === true) {
+        return _platformNativeScript(extraProviders);
+    } else {
+        return new NativeScriptPlatformRef(_platformNativeScript(extraProviders), options);
+    }
+}