Aot compatible... again!

Author: shprink

.gitignore

@@ -31,3 +31,4 @@ www/
 config.json
 dist/
 aot/
+angular2-webpack-starter/

src/Parent.ts

@@ -1,4 +1,4 @@
-import { Injectable } from '@angular/core';
+import { Injectable, Inject } from '@angular/core';
 import { Http } from '@angular/http';
 
 // Need to import interfaces dependencies
@@ -8,6 +8,8 @@ import { RequestOptionsArgs } from '@angular/http/src/interfaces';
 import { Response } from '@angular/http/src/static_response';
 
 import { WpApiAppConfig } from './wp-api-angular';
+import { stripTrailingSlash } from './utils';
+import { WpApiConfig } from './tokens';
 
 export interface IParent {
   httpGet(url: string, options?: RequestOptionsArgs): Observable<Response>;
@@ -21,12 +23,12 @@ export interface IParent {
 @Injectable()
 export class WpApiParent implements IParent {
   constructor(
-    public config: WpApiAppConfig,
+    @Inject(WpApiConfig) public config: WpApiAppConfig,
     public http: Http
   ) { }
 
   getFullUrl(postfix: string): string {
-    return `${this.config.baseUrl}${this.config.namespace}${postfix}`;
+    return `${stripTrailingSlash(this.config.baseUrl)}${this.config.namespace || '/wp/v2'}${postfix}`;
   }
   httpGet(url: string, options = {}) {
     return this.http.get(this.getFullUrl(url), options);

src/wp-api-angular.ts

@@ -6,7 +6,6 @@ import {
 import 'rxjs';
 import { Http, HttpModule } from '@angular/http';
 
-import { stripTrailingSlash } from './utils';
 import { WpApiApp, WpApiConfig } from './tokens';
 
 import { WpApiPosts } from './Posts';
@@ -20,16 +19,16 @@ import { WpApiStatuses } from './Statuses';
 import { WpApiTerms } from './Terms';
 import { WpApiCustom } from './Custom';
 
-export * from './Posts';
-export * from './Pages';
-export * from './Comments';
-export * from './Types';
-export * from './Media';
-export * from './Users';
-export * from './Taxonomies';
-export * from './Statuses';
-export * from './Terms';
-export * from './Custom';
+export { WpApiPosts } from './Posts';
+export { WpApiPages } from './Pages';
+export { WpApiComments } from './Comments';
+export { WpApiTypes } from './Types';
+export { WpApiMedia } from './Media';
+export { WpApiUsers } from './Users';
+export { WpApiTaxonomies } from './Taxonomies';
+export { WpApiStatuses } from './Statuses';
+export { WpApiTerms } from './Terms';
+export { WpApiCustom } from './Custom';
 
 export interface WpApiAppConfig {
   baseUrl: string;
@@ -42,37 +41,27 @@ export interface WpApiAppConfig {
   ],
   exports: [
     HttpModule
+  ],
+  providers: [
+    WpApiPosts,
+    WpApiPages,
+    WpApiComments,
+    WpApiTypes,
+    WpApiMedia,
+    WpApiUsers,
+    WpApiTaxonomies,
+    WpApiStatuses,
+    WpApiTerms,
+    WpApiCustom
   ]
 })
 export class WpApiModule {
   static initializeApp(config: WpApiAppConfig): ModuleWithProviders {
-    config.baseUrl = stripTrailingSlash(config.baseUrl);
-    config.namespace = config.namespace || '/wp/v2';
-
     return {
       ngModule: WpApiModule,
       providers: [
-        { provide: WpApiConfig, useValue: config },
-        createProvider(WpApiPosts),
-        createProvider(WpApiPages),
-        createProvider(WpApiComments),
-        createProvider(WpApiTypes),
-        createProvider(WpApiMedia),
-        createProvider(WpApiUsers),
-        createProvider(WpApiTaxonomies),
-        createProvider(WpApiStatuses),
-        createProvider(WpApiTerms),
-        createProvider(WpApiCustom)
+        { provide: WpApiConfig, useValue: config }
       ]
     };
   }
 }
-
-function createProvider(service) {
-  return {
-    provide: service,
-    useFactory: (config: WpApiAppConfig, http: Http) => new service(config, http),
-    deps: [WpApiConfig, Http]
-  }
-}
-

tsconfig.json

@@ -20,6 +20,7 @@
   "angularCompilerOptions": {
     "skipTemplateCodegen": true,
     "strictMetadataEmit": true,
-    "debug": true
+    "debug": false,
+    "genDir": "compiled"
   }
 }