fix service injection

gevgeny · Feb 11, 2017 · ed92928 · ed92928
1 parent 0342471
commit ed92928
Show file tree

Hide file tree

Showing 14 changed files with 69 additions and 45 deletions.
diff --git a/dist/HighchartsService.d.ts b/dist/HighchartsService.d.ts
@@ -1,3 +1,7 @@
+export declare class HighchartsStatic {
+}
 export declare class HighchartsService {
- getHighchartsStatic(): Object;
+ _highchartsStatice: HighchartsStatic;
+ constructor(highchartsStatic: HighchartsStatic);
+ getHighchartsStatic(): HighchartsStatic;
 }
diff --git a/dist/HighchartsService.js b/dist/HighchartsService.js
diff --git a/dist/HighchartsService.js.map b/dist/HighchartsService.js.map
diff --git a/dist/HighchartsService.metadata.json b/dist/HighchartsService.metadata.json
@@ -1 +1 @@
-[{"__symbolic":"module","version":3,"metadata":{"HighchartsService":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable"}}],"members":{"getHighchartsStatic":[{"__symbolic":"method"}]}}}},{"__symbolic":"module","version":1,"metadata":{"HighchartsService":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable"}}],"members":{"getHighchartsStatic":[{"__symbolic":"method"}]}}}}]
+[{"__symbolic":"module","version":3,"metadata":{"HighchartsStatic":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable"}}]},"HighchartsService":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable"}}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"HighchartsStatic"}]}],"getHighchartsStatic":[{"__symbolic":"method"}]}}}},{"__symbolic":"module","version":1,"metadata":{"HighchartsStatic":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable"}}]},"HighchartsService":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"Injectable"}}],"members":{"__ctor__":[{"__symbolic":"constructor","parameters":[{"__symbolic":"reference","name":"HighchartsStatic"}]}],"getHighchartsStatic":[{"__symbolic":"method"}]}}}}]
diff --git a/dist/index.d.ts b/dist/index.d.ts
@@ -4,8 +4,8 @@ import { ChartSeriesComponent } from './ChartSeriesComponent';
 import { ChartPointComponent } from './ChartPointComponent';
 import { ChartXAxisComponent } from './ChartXAxisComponent';
 import { ChartYAxisComponent } from './ChartYAxisComponent';
-export declare function getHighchartsStatic(): Object;
+import { HighchartsStatic } from './HighchartsService';
 export declare class ChartModule {
- static forRoot(highchartsStatic: Object, ...highchartsModules: any[]): ModuleWithProviders;
+ static forRoot(highchartsStatic: HighchartsStatic, ...highchartsModules: Array<Function>): ModuleWithProviders;
 }
 export { ChartComponent, ChartSeriesComponent, ChartPointComponent, ChartXAxisComponent, ChartYAxisComponent };
diff --git a/dist/index.js b/dist/index.js
diff --git a/dist/index.js.map b/dist/index.js.map
diff --git a/dist/index.metadata.json b/dist/index.metadata.json
@@ -1 +1 @@
-[{"__symbolic":"module","version":3,"metadata":{"getHighchartsStatic":{"__symbolic":"function","parameters":[],"value":{"__symbolic":"error","message":"Reference to a local symbol","line":8,"character":4,"context":{"name":"_highchartsStatic"}}},"ChartModule":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"NgModule"},"arguments":[{"declarations":[[{"__symbolic":"reference","module":"./ChartComponent","name":"ChartComponent"},{"__symbolic":"reference","module":"./ChartSeriesComponent","name":"ChartSeriesComponent"},{"__symbolic":"reference","module":"./ChartPointComponent","name":"ChartPointComponent"},{"__symbolic":"reference","module":"./ChartXAxisComponent","name":"ChartXAxisComponent"},{"__symbolic":"reference","module":"./ChartYAxisComponent","name":"ChartYAxisComponent"}]],"exports":[[{"__symbolic":"reference","module":"./ChartComponent","name":"ChartComponent"},{"__symbolic":"reference","module":"./ChartSeriesComponent","name":"ChartSeriesComponent"},{"__symbolic":"reference","module":"./ChartPointComponent","name":"ChartPointComponent"},{"__symbolic":"reference","module":"./ChartXAxisComponent","name":"ChartXAxisComponent"},{"__symbolic":"reference","module":"./ChartYAxisComponent","name":"ChartYAxisComponent"}]]}]}]},"ChartComponent":{"__symbolic":"reference","module":"./ChartComponent","name":"ChartComponent"},"ChartSeriesComponent":{"__symbolic":"reference","module":"./ChartSeriesComponent","name":"ChartSeriesComponent"},"ChartPointComponent":{"__symbolic":"reference","module":"./ChartPointComponent","name":"ChartPointComponent"},"ChartXAxisComponent":{"__symbolic":"reference","module":"./ChartXAxisComponent","name":"ChartXAxisComponent"},"ChartYAxisComponent":{"__symbolic":"reference","module":"./ChartYAxisComponent","name":"ChartYAxisComponent"}}},{"__symbolic":"module","version":1,"metadata":{"getHighchartsStatic":{"__symbolic":"function","parameters":[],"value":{"__symbolic":"error","message":"Reference to a local symbol","line":8,"character":4,"context":{"name":"_highchartsStatic"}}},"ChartModule":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"NgModule"},"arguments":[{"declarations":[[{"__symbolic":"reference","module":"./ChartComponent","name":"ChartComponent"},{"__symbolic":"reference","module":"./ChartSeriesComponent","name":"ChartSeriesComponent"},{"__symbolic":"reference","module":"./ChartPointComponent","name":"ChartPointComponent"},{"__symbolic":"reference","module":"./ChartXAxisComponent","name":"ChartXAxisComponent"},{"__symbolic":"reference","module":"./ChartYAxisComponent","name":"ChartYAxisComponent"}]],"exports":[[{"__symbolic":"reference","module":"./ChartComponent","name":"ChartComponent"},{"__symbolic":"reference","module":"./ChartSeriesComponent","name":"ChartSeriesComponent"},{"__symbolic":"reference","module":"./ChartPointComponent","name":"ChartPointComponent"},{"__symbolic":"reference","module":"./ChartXAxisComponent","name":"ChartXAxisComponent"},{"__symbolic":"reference","module":"./ChartYAxisComponent","name":"ChartYAxisComponent"}]]}]}]},"ChartComponent":{"__symbolic":"reference","module":"./ChartComponent","name":"ChartComponent"},"ChartSeriesComponent":{"__symbolic":"reference","module":"./ChartSeriesComponent","name":"ChartSeriesComponent"},"ChartPointComponent":{"__symbolic":"reference","module":"./ChartPointComponent","name":"ChartPointComponent"},"ChartXAxisComponent":{"__symbolic":"reference","module":"./ChartXAxisComponent","name":"ChartXAxisComponent"},"ChartYAxisComponent":{"__symbolic":"reference","module":"./ChartYAxisComponent","name":"ChartYAxisComponent"}}}]
+[{"__symbolic":"module","version":3,"metadata":{"ChartModule":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"NgModule"},"arguments":[{"declarations":[[{"__symbolic":"reference","module":"./ChartComponent","name":"ChartComponent"},{"__symbolic":"reference","module":"./ChartSeriesComponent","name":"ChartSeriesComponent"},{"__symbolic":"reference","module":"./ChartPointComponent","name":"ChartPointComponent"},{"__symbolic":"reference","module":"./ChartXAxisComponent","name":"ChartXAxisComponent"},{"__symbolic":"reference","module":"./ChartYAxisComponent","name":"ChartYAxisComponent"}]],"exports":[[{"__symbolic":"reference","module":"./ChartComponent","name":"ChartComponent"},{"__symbolic":"reference","module":"./ChartSeriesComponent","name":"ChartSeriesComponent"},{"__symbolic":"reference","module":"./ChartPointComponent","name":"ChartPointComponent"},{"__symbolic":"reference","module":"./ChartXAxisComponent","name":"ChartXAxisComponent"},{"__symbolic":"reference","module":"./ChartYAxisComponent","name":"ChartYAxisComponent"}]]}]}]},"ChartComponent":{"__symbolic":"reference","module":"./ChartComponent","name":"ChartComponent"},"ChartSeriesComponent":{"__symbolic":"reference","module":"./ChartSeriesComponent","name":"ChartSeriesComponent"},"ChartPointComponent":{"__symbolic":"reference","module":"./ChartPointComponent","name":"ChartPointComponent"},"ChartXAxisComponent":{"__symbolic":"reference","module":"./ChartXAxisComponent","name":"ChartXAxisComponent"},"ChartYAxisComponent":{"__symbolic":"reference","module":"./ChartYAxisComponent","name":"ChartYAxisComponent"}}},{"__symbolic":"module","version":1,"metadata":{"ChartModule":{"__symbolic":"class","decorators":[{"__symbolic":"call","expression":{"__symbolic":"reference","module":"@angular/core","name":"NgModule"},"arguments":[{"declarations":[[{"__symbolic":"reference","module":"./ChartComponent","name":"ChartComponent"},{"__symbolic":"reference","module":"./ChartSeriesComponent","name":"ChartSeriesComponent"},{"__symbolic":"reference","module":"./ChartPointComponent","name":"ChartPointComponent"},{"__symbolic":"reference","module":"./ChartXAxisComponent","name":"ChartXAxisComponent"},{"__symbolic":"reference","module":"./ChartYAxisComponent","name":"ChartYAxisComponent"}]],"exports":[[{"__symbolic":"reference","module":"./ChartComponent","name":"ChartComponent"},{"__symbolic":"reference","module":"./ChartSeriesComponent","name":"ChartSeriesComponent"},{"__symbolic":"reference","module":"./ChartPointComponent","name":"ChartPointComponent"},{"__symbolic":"reference","module":"./ChartXAxisComponent","name":"ChartXAxisComponent"},{"__symbolic":"reference","module":"./ChartYAxisComponent","name":"ChartYAxisComponent"}]]}]}]},"ChartComponent":{"__symbolic":"reference","module":"./ChartComponent","name":"ChartComponent"},"ChartSeriesComponent":{"__symbolic":"reference","module":"./ChartSeriesComponent","name":"ChartSeriesComponent"},"ChartPointComponent":{"__symbolic":"reference","module":"./ChartPointComponent","name":"ChartPointComponent"},"ChartXAxisComponent":{"__symbolic":"reference","module":"./ChartXAxisComponent","name":"ChartXAxisComponent"},"ChartYAxisComponent":{"__symbolic":"reference","module":"./ChartYAxisComponent","name":"ChartYAxisComponent"}}}]
diff --git a/examples/angular-cli/package.json b/examples/angular-cli/package.json
@@ -24,7 +24,7 @@
  "rxjs": "^5.0.1",
  "ts-helpers": "^1.1.1",
  "zone.js": "^0.7.2",
- "angular2-highcharts": "git:https://github.com/gevgeny/angular2-highcharts.git#a1452f7777fe6f0fd38c78aece21430812f9f289"
+ "angular2-highcharts": "git:https://github.com/gevgeny/angular2-highcharts.git#034247135c96165ce7c6415e3c07375a179e914e"
  },
  "devDependencies": {
  "@angular/cli": "1.0.0-beta.31",

diff --git a/examples/angular-cli/src/app/app.module.ts b/examples/angular-cli/src/app/app.module.ts
@@ -8,7 +8,7 @@ import { AppComponent } from './app.component';
 import { ChartModule } from 'angular2-highcharts';
 
 const highstock: Object = require('highcharts/highstock');
-const chartModule: any = ChartModule.init(highstock);
+const chartModule: any = ChartModule.forRoot(highstock);
 
 @NgModule({
  declarations: [

diff --git a/examples/webpack/src/app.ts b/examples/webpack/src/app.ts
@@ -40,7 +40,7 @@ declare var require: any;
  JsonpModule,
  ChartModule.forRoot(
  require('../../../node_modules/highcharts/highstock.src'),
- require('../../../node_modules/highcharts/highcharts-3d.js')
+ require('../../../node_modules/highcharts/highcharts-3d.src.js')
  )
  ],
  declarations: [

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "angular2-highcharts",
- "version": "0.5.1",
+ "version": "0.5.2",
  "description": "Highcharts for your Angular2 project",
  "scripts": {
  "watch": "ntsc -w",

diff --git a/src/HighchartsService.ts b/src/HighchartsService.ts
@@ -1,9 +1,19 @@
-import { getHighchartsStatic } from './index';
 import { Injectable } from '@angular/core';
 
+@Injectable()
+export class HighchartsStatic {
+
+}
+
 @Injectable()
 export class HighchartsService {
+ _highchartsStatice: HighchartsStatic
+
+ constructor(highchartsStatic: HighchartsStatic) {
+ this._highchartsStatice = highchartsStatic;
+ }
+
  getHighchartsStatic() {
- return getHighchartsStatic();
+ return this._highchartsStatice;
  }
 }
diff --git a/src/index.ts b/src/index.ts
@@ -5,8 +5,7 @@ import { ChartSeriesComponent } from './ChartSeriesComponent';
 import { ChartPointComponent } from './ChartPointComponent';
 import { ChartXAxisComponent } from './ChartXAxisComponent';
 import { ChartYAxisComponent } from './ChartYAxisComponent';
-
-let _highchartsStatic: Object;
+import { HighchartsStatic } from './HighchartsService'
 
 const CHART_DIRECTIVES: any[] = [
  ChartComponent,
@@ -16,26 +15,23 @@ const CHART_DIRECTIVES: any[] = [
  ChartYAxisComponent
 ];
 
-export function getHighchartsStatic() {
- return _highchartsStatic;
-}
-
-@NgModule({ declarations: [CHART_DIRECTIVES], exports: [CHART_DIRECTIVES] })
+@NgModule({
+ declarations: [CHART_DIRECTIVES],
+ exports: [CHART_DIRECTIVES]
+})
 export class ChartModule {
- static forRoot(highchartsStatic: Object, ...highchartsModules): ModuleWithProviders {
- if (!highchartsStatic) {
- throw new Error('Highcharts module cannot be empty.')
- }
-
- // Save Highcharts/Highstock/Highmaps static
- _highchartsStatic = highchartsStatic;
-
+ static forRoot(highchartsStatic: HighchartsStatic, ...highchartsModules: Array<Function>): ModuleWithProviders {
  // Plug highcharts modules
  highchartsModules.forEach((module) => {
- module(_highchartsStatic)
+ module(highchartsStatic)
  });
 
- return { ngModule: ChartModule }
+ return {
+ ngModule: ChartModule,
+ providers: [
+ { provide: HighchartsStatic, useValue: highchartsStatic }
+ ]
+ }
  }
 }