misc: refactor code base in preparation for AoT support

.gitignore

@@ -32,3 +32,4 @@ node_modules
 /build
 /dist
 .idea
+/compiled

gulp/bundle.js

@@ -17,7 +17,7 @@ function prepareCommands(pluginName) {
   const rollupRoot = pluginName ? path.join(config.PATHS.pluginDir, pluginName) : '';
 
   return {
-    ts: `./node_modules/.bin/tsc --out ${path.join(config.PATHS.dist.bundles, filename)} --target es5 --allowJs ${path.join(config.PATHS.tmp, filename)}`,
+    ts: `./node_modules/.bin/ngc -p tsconfig.json --out ${path.join(config.PATHS.dist.bundles, filename)} --target es5 --allowJs ${path.join(config.PATHS.tmp, filename)}`,
     rollup: `./node_modules/.bin/rollup -c ${path.join(rollupRoot, ROLLUP_CONFIG)}`
   }
 }

package.json

@@ -36,17 +36,19 @@
     "start": "npm run server:dev"
   },
   "dependencies": {
-    "@angular/common": "2.0.0",
-    "@angular/compiler": "2.0.0",
-    "@angular/core": "2.0.0",
-    "@angular/forms": "2.0.0",
-    "@angular/platform-browser": "2.0.0",
-    "@angular/platform-browser-dynamic": "2.0.0",
-    "@angular/router": "3.0.0",
+    "@angular/common": "2.0.1",
+    "@angular/compiler": "2.0.1",
+    "@angular/core": "2.0.1",
+    "@angular/forms": "2.0.1",
+    "@angular/platform-browser": "2.0.1",
+    "@angular/platform-browser-dynamic": "2.0.1",
+    "@angular/router": "3.0.1",
     "rxjs": "5.0.0-beta.12",
     "zone.js": "^0.6.21"
   },
   "devDependencies": {
+    "@angular/compiler-cli": "^0.6.3",
+    "@angular/platform-server": "^2.0.1",
     "@types/core-js": "^0.9.28",
     "@types/hammerjs": "^2.0.28",
     "@types/node": "^4.0.29",

src/components/angular2-modal/components/css-backdrop.ts

@@ -20,6 +20,8 @@ import { BaseDynamicComponent } from './base-dynamic-component';
   template: ``
 })
 export class CSSBackdrop extends BaseDynamicComponent {
+  public cssClass: string;
+  public styleStr: string;
 
   constructor(el: ElementRef, renderer: Renderer) {
     super(el, renderer);

src/components/angular2-modal/framework/createComponent.ts

@@ -25,5 +25,3 @@ function getInjector(viewContainer: ViewContainerRef, bindings: ResolvedReflecti
     ReflectiveInjector.fromResolvedProviders(bindings, ctxInjector) : ctxInjector;
 
 }
-
-export default createComponent;

src/components/angular2-modal/overlay/overlay.component.ts

@@ -43,8 +43,8 @@ export interface EmbedComponentConfig {
 })
 export class ModalOverlay extends BaseDynamicComponent {
   private beforeDestroyHandlers: Array<() => Promise<void>>;
-  @ViewChild('innerView', {read: ViewContainerRef}) private innerVcr: ViewContainerRef;
-  @ViewChild('template') private template: TemplateRef<any>;
+  @ViewChild('innerView', {read: ViewContainerRef}) public innerVcr: ViewContainerRef;
+  @ViewChild('template') public template: TemplateRef<any>;
 
   constructor(private dialogRef: DialogRef<any>,
               private vcr: ViewContainerRef,

src/components/angular2-modal/plugins/bootstrap/bootstrap.module.ts

@@ -12,12 +12,10 @@ import {
   BSModalFooter
 } from './message-modal.component';
 
-function getProviders(): any[] {
-  return [
-    { provide: BaseModal, useClass: Modal },
-    { provide: Modal, useClass: Modal }
-  ];
-}
+export const providers: any[] = [
+  { provide: BaseModal, useClass: Modal },
+  { provide: Modal, useClass: Modal }
+];
 
 @NgModule({
   imports: [ ModalModule, CommonModule ],
@@ -28,15 +26,15 @@ function getProviders(): any[] {
     BSMessageModal,
     BSModalContainer
   ],
-  providers: getProviders(),
+  providers,
   entryComponents: [
     BSModalContainer,
     BSMessageModal
   ]
 })
 export class BootstrapModalModule {
   static getProviders(): any[] {
-    return getProviders();
+    return providers;
   }
 }
 

src/components/angular2-modal/plugins/bootstrap/index.ts

@@ -24,4 +24,4 @@ export {
 } from './presets/two-button-preset';
 export { Modal } from './modal';
 
-export { BootstrapModalModule } from './bootstrap.module';
+export { BootstrapModalModule, providers } from './bootstrap.module';

src/components/angular2-modal/plugins/bootstrap/message-modal.component.ts

@@ -62,7 +62,7 @@ export class BSMessageModalTitle {
 `
 })
 export class BSMessageModalBody {
-  private context: MessageModalPreset;
+  public context: MessageModalPreset;
 
   constructor(public dialog: DialogRef<MessageModalPreset>) {
     this.context = dialog.context;

src/components/angular2-modal/plugins/bootstrap/presets/message-modal-preset.ts

@@ -83,6 +83,7 @@ export interface MessageModalPreset extends BSModalContext {
   footerClass: string;
 
   buttons: BSMessageModalButtonConfig[];
+  showInput?: any;
 }
 
 /**

src/components/angular2-modal/plugins/js-native/index.ts

@@ -8,4 +8,4 @@ export {
 export { JSNativeModalRenderer } from './js-native-modal-renderer';
 export { JSNativePresetBuilder } from './presets/js-native-preset';
 
-export { JSNativeModalModule } from './js-native.module';
+export { JSNativeModalModule, providers } from './js-native.module';

src/components/angular2-modal/plugins/js-native/js-native.module.ts

@@ -4,20 +4,18 @@ import { Modal as BaseModal } from '../../../../components/angular2-modal';
 
 import { Modal } from './modal';
 
-function getProviders(): any[] {
-  return [
-    { provide: BaseModal, useClass: Modal },
-    { provide: Modal, useClass: Modal }
-  ];
-}
+export const providers: any[] = [
+  { provide: BaseModal, useClass: Modal },
+  { provide: Modal, useClass: Modal }
+];
 
 @NgModule({
-  providers: getProviders()
+  providers
 })
 export class JSNativeModalModule {
 
   static getProviders(): any[] {
-    return getProviders();
+    return providers;
   }
 
 }

src/components/angular2-modal/plugins/vex/dialog-form-modal.ts

@@ -78,7 +78,7 @@ export class VEXDialogButtons {
 </form>`
 })
 export class DialogFormModal implements ModalComponent<DialogPreset> {
-  private context: DialogPreset;
+  public context: DialogPreset;
 
   constructor(public dialog: DialogRef<DialogPreset>) {
     this.context = dialog.context;
@@ -108,7 +108,7 @@ export class DialogFormModal implements ModalComponent<DialogPreset> {
       (click)="dialog.dismiss()"></div>`
 })
 export class FormDropIn implements ModalComponent<DropInPreset> {
-  private context: DropInPreset;
+  public context: DropInPreset;
 
   constructor(public dialog: DialogRef<DropInPreset>) {
     this.context = dialog.context;

src/components/angular2-modal/plugins/vex/index.ts

@@ -12,5 +12,5 @@ export {
 export { DialogPreset, DialogPresetBuilder } from './presets/dialog-preset';
 
 
-export { VexModalModule } from './vex.module';
+export { VexModalModule, providers } from './vex.module';
 

src/components/angular2-modal/plugins/vex/presets/dialog-preset.ts

@@ -25,6 +25,7 @@ export class DialogPreset extends VEXModalContext {
   defaultResult: any;
   content: Type<any>;
   buttons: VEXButtonConfig[];
+  showInput: any;
 }
 
 /**

src/components/angular2-modal/plugins/vex/vex.module.ts

@@ -6,12 +6,10 @@ import { ModalModule, Modal as BaseModal } from '../../../../components/angular2
 import { Modal } from './modal';
 import { DialogFormModal, FormDropIn, VEXDialogButtons } from './dialog-form-modal';
 
-function getProviders(): any[] {
-  return [
-    { provide: BaseModal, useClass: Modal },
-    { provide: Modal, useClass: Modal }
-  ];
-}
+export const providers: any[] = [
+  { provide: BaseModal, useClass: Modal },
+  { provide: Modal, useClass: Modal }
+];
 
 @NgModule({
   imports: [ ModalModule, CommonModule ],
@@ -20,7 +18,7 @@ function getProviders(): any[] {
     FormDropIn,
     DialogFormModal
   ],
-  providers: getProviders(),
+  providers,
   entryComponents: [
     DialogFormModal,
     FormDropIn
@@ -29,7 +27,7 @@ function getProviders(): any[] {
 export class VexModalModule {
 
   static getProviders(): any[] {
-    return getProviders();
+    return providers;
   }
 
 }

src/components/angular2-modal/providers/dom-modal-renderer.ts

@@ -6,7 +6,7 @@ import {
   ReflectiveInjector
 } from '@angular/core';
 
-import createComponent from '../framework/createComponent';
+import { createComponent } from '../framework/createComponent';
 import { DialogRef } from '../models/dialog-ref';
 import { OverlayRenderer } from '../models/tokens';
 import { ModalOverlay } from '../overlay/index';

src/demo/app/bootstrap-demo/bootstrap-demo-page/bootstrap-demo-page.ts

@@ -15,7 +15,7 @@ import * as presets from '../presets';
 })
 export class BootstrapDemoPage {
   modalCommands: ModalCommandDescriptor[];
-  @ViewChild('templateRef') private templateRef: TemplateRef<any>;
+  @ViewChild('templateRef') public templateRef: TemplateRef<any>;
 
   constructor(public modal: Modal) {
     this.modalCommands = [

src/demo/app/bootstrap-demo/bootstrap-demo-page/custom-modal-sample.ts

@@ -53,6 +53,7 @@ export class CustomModal implements CloseGuard, ModalComponent<CustomModalContex
   context: CustomModalContext;
 
   public wrongAnswer: boolean;
+  public shouldUseMyClass: boolean;
 
   constructor(public dialog: DialogRef<CustomModalContext>) {
     this.context = dialog.context;

src/demo/app/bootstrap-demo/bootstrap-demo.ts

@@ -1,5 +1,5 @@
 import { Component, ViewEncapsulation } from '@angular/core';
-import { BootstrapModalModule } from '../../../components/angular2-modal/plugins/bootstrap';
+import { providers } from '../../../components/angular2-modal/plugins/bootstrap';
 
 
 @Component({
@@ -8,7 +8,7 @@ import { BootstrapModalModule } from '../../../components/angular2-modal/plugins
   // We override providers set by the Module since this app is using multiple module plugins
   // (js-native, vex, bootstrap) which messes up the provider tree (last plugin wins)
   // usually an app will use one plugin and this line is not needed.
-  providers: BootstrapModalModule.getProviders(),
+  providers: providers,
   encapsulation: ViewEncapsulation.None
 })
 export class BootstrapDemo {

src/demo/app/bootstrap-demo/modal-customisation-wizard/modal-customisation-wizard.ts

@@ -43,6 +43,10 @@ export class ModalCustomisationWizard {
         fluent.open();
     }
 
+    public logForm(value: any) {
+        // do something
+    }
+
     get code(): string {
         let p = this.preset,
             code = `modal.${this.type}()\n`;

src/demo/app/home/home.ts

@@ -9,7 +9,7 @@ import { InAppModalModule, Modal } from './in-app-plugin/index';
   encapsulation: ViewEncapsulation.None
 })
 export class Home {
-  @ViewChild('myTemplate', {read: TemplateRef}) private myTemplate: TemplateRef<any>;
+  @ViewChild('myTemplate', {read: TemplateRef}) public myTemplate: TemplateRef<any>;
 
   constructor(private modal: Modal) {
   }

src/demo/app/home/in-app-plugin/index.ts

@@ -9,7 +9,7 @@ export { Modal } from './modal';
 export { InAppModalContext, InAppModalContextBuilder } from './modal-context';
 
 
-function getProviders(): any[] {
+export function getProviders(): any[] {
   return [
     { provide: Modal_, useClass: InAppModal },
     InAppModal

src/demo/app/home/in-app-plugin/modal-backdrop.ts

@@ -82,8 +82,8 @@ article .content {
 </div>`
 })
 export class InAppModalBackdrop {
-  private zoomState: 'in' | 'out' = 'in';
+  public zoomState: 'in' | 'out' = 'in';
 
-  constructor(private dialog: DialogRef<InAppModalContext>) {
+  constructor(public dialog: DialogRef<InAppModalContext>) {
   }
 }

src/demo/app/js-native-demo/js-native-demo.ts

@@ -1,6 +1,6 @@
 import { Component, ViewEncapsulation } from '@angular/core';
 
-import { Modal, JSNativeModalModule } from '../../../components/angular2-modal/plugins/js-native';
+import { Modal, JSNativeModalModule, providers } from '../../../components/angular2-modal/plugins/js-native';
 import { ModalCommandDescriptor } from '../demo-head/index';
 import * as presets from './presets';
 
@@ -10,7 +10,7 @@ import * as presets from './presets';
     // We override providers set by the Module since this app is using multiple module plugins
     // (js-native, vex, bootstrap) which messes up the provider tree (last plugin wins)
     // usually an app will use one plugin and this line is not needed.
-    providers: JSNativeModalModule.getProviders(),
+    providers: providers,
     encapsulation: ViewEncapsulation.None
 })
 export class JSNativeDemo {

src/demo/app/vex-demo/login-dialog.ts

@@ -23,7 +23,7 @@ import {
 })
 
 export class LoginDialog implements ModalComponent<DialogPreset> {
-  private context: DialogPreset;
+  public context: DialogPreset;
 
   constructor(public dialog: DialogRef<DialogPreset>) {
     this.context = dialog.context;

src/demo/app/vex-demo/vex-demo.ts

@@ -8,7 +8,8 @@ import {
   DialogFormModal,
   DialogPresetBuilder,
   VEXModalContext,
-  VexModalModule
+  VexModalModule,
+  providers
 } from '../../../components/angular2-modal/plugins/vex';
 
 import { DemoHead, ModalCommandDescriptor } from '../demo-head/index';
@@ -31,14 +32,14 @@ import { LoginDialog } from './login-dialog';
   // We override providers set by the Module since this app is using multiple module plugins
   // (js-native, vex, bootstrap) which messes up the provider tree (last plugin wins)
   // usually an app will use one plugin and this line is not needed.
-  providers: VexModalModule.getProviders(),
+  providers: providers,
   encapsulation: ViewEncapsulation.None
 })
 export class VexDemo {
   modalCommands: ModalCommandDescriptor[];
   theme: VEXBuiltInThemes = <VEXBuiltInThemes>'default';
-  @ViewChild(DemoHead) private demoHead: DemoHead;
-  @ViewChild('templateRef') private templateRef: TemplateRef<any>;
+  @ViewChild(DemoHead) public demoHead: DemoHead;
+  @ViewChild('templateRef') public templateRef: TemplateRef<any>;
 
   constructor(public modal: Modal) {
 

tsconfig.json

@@ -26,5 +26,8 @@
     "dist",
     "gulp",
     "typings"
-  ]
+  ],
+  "angularCompilerOptions": {
+    "genDir": "compiled"
+  }
 }