fix: fixed aot error with forRoot method

xivapi · Sep 25, 2018 · f251299 · f251299
1 parent e5ca0f1
commit f251299
Show file tree

Hide file tree

Showing 9 changed files with 50 additions and 47 deletions.
diff --git a/index.ts b/index.ts
diff --git a/package.json b/package.json
@@ -18,7 +18,7 @@
     "docs:generate": "npm run docs:clean && typedoc --out docs --excludePrivate --mode file --exclude \"**/*+(index|spec|entry).ts\" ./src",
     "docs:clean": "del-cli docs/"
   },
-  "typings": "./angular-client.d.ts",
+  "typings": "./xivapi-client.d.ts",
   "author": "Supamiu",
   "repository": {
     "type": "git",

diff --git a/public_api.ts b/public_api.ts
@@ -1 +1,2 @@
-export * from './index';
+// Public classes.
+export * from './src/xivapi-client';
diff --git a/src/xivapi-client.module.ts b/src/xivapi-client.module.ts
@@ -1,12 +1,8 @@
-import { InjectionToken, ModuleWithProviders, NgModule } from '@angular/core';
+import { ModuleWithProviders, NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { XivapiService } from './xivapi.service';
-import { HttpClientModule } from '@angular/common/http';
-
-/**
- * @hidden
- */
-export const XIVAPI_KEY: InjectionToken<string> = new InjectionToken('XIVAPI_KEY');
+import { HttpClient, HttpClientModule } from '@angular/common/http';
+import { XivapiServiceFactory } from './xivapi-service-factory';
 
 @NgModule({
     imports: [
@@ -21,8 +17,11 @@ export class XivapiClientModule {
         return {
             ngModule: XivapiClientModule,
             providers: [
-                XivapiService,
-                {provide: XIVAPI_KEY, useValue: key}
+                {
+                    provide: XivapiService,
+                    useFactory: XivapiServiceFactory,
+                    deps: [key, HttpClient]
+                }
             ]
         };
     }

diff --git a/src/index.ts → src/xivapi-client.ts b/src/index.ts → src/xivapi-client.ts
@@ -1,3 +1,3 @@
-export { XivapiClientModule, XIVAPI_KEY } from './xivapi-client.module';
+export { XivapiClientModule } from './xivapi-client.module';
 export { XivapiService } from './xivapi.service';
 export * from './model/index';
diff --git a/src/xivapi-service-factory.ts b/src/xivapi-service-factory.ts
@@ -0,0 +1,6 @@
+import { XivapiService } from './xivapi.service';
+import { HttpClient } from '@angular/common/http';
+
+export function XivapiServiceFactory(key: string, http: HttpClient): XivapiService {
+    return new XivapiService(key, http);
+}
diff --git a/src/xivapi.service.ts b/src/xivapi.service.ts
@@ -1,4 +1,4 @@
-import { Inject, Injectable } from '@angular/core';
+import { Inject, Injectable, Optional } from '@angular/core';
 import { HttpClient, HttpParams } from '@angular/common/http';
 import { Observable } from 'rxjs';
 import {
@@ -11,7 +11,6 @@ import {
     XivapiRequestOptions,
     XivapiSearchOptions
 } from './model';
-import { XIVAPI_KEY } from './xivapi-client.module';
 import { CharacterResponse, CharacterVerification } from './model/schema/character';
 
 @Injectable()
@@ -22,7 +21,7 @@ export class XivapiService {
      */
     public static readonly API_BASE_URL: string = 'https://xivapi.com';
 
-    constructor(@Inject(XIVAPI_KEY) protected readonly apiKey: string, private http: HttpClient) {
+    constructor(@Inject('XIVAPI_KEY') protected readonly apiKey: string, private http: HttpClient) {
     }
 
     /**

diff --git a/test/xivapi.service.spec.ts b/test/xivapi.service.spec.ts
@@ -1,5 +1,5 @@
 import { TestBed } from '@angular/core/testing';
-import { SearchIndex, XivapiService } from '../src';
+import { SearchIndex, XivapiService } from '../src/xivapi-client';
 import { HttpClientTestingModule, HttpTestingController, TestRequest } from '@angular/common/http/testing';
 import { HttpClient } from '@angular/common/http';
 

diff --git a/tsconfig-build.json b/tsconfig-build.json
@@ -1,31 +1,31 @@
 {
-    "compilerOptions": {
-        "baseUrl": ".",
-        "declaration": true,
-        "experimentalDecorators": true,
-        "strict": true,
-        "module": "es2015",
-        "moduleResolution": "node",
-        "outDir": "dist",
-        "rootDir": ".",
-        "sourceMap": true,
-        "inlineSources": true,
-        "target": "es2015",
-        "skipLibCheck": true,
-        "lib": [
-            "es2015",
-            "dom"
-        ]
-    },
-    "files": [
-        "public_api.ts",
-        "node_modules/zone.js/dist/zone.js.d.ts"
-    ],
-    "angularCompilerOptions": {
-        "skipTemplateCodegen": true,
-        "annotateForClosureCompiler": true,
-        "strictMetadataEmit": true,
-        "flatModuleOutFile": "xivapi-client.js",
-        "flatModuleId": "@xivapi/angular-client"
-    }
+  "compilerOptions": {
+    "baseUrl": ".",
+    "declaration": true,
+    "experimentalDecorators": true,
+    "strict": true,
+    "module": "es2015",
+    "moduleResolution": "node",
+    "outDir": "dist",
+    "rootDir": ".",
+    "sourceMap": true,
+    "inlineSources": true,
+    "target": "es2015",
+    "skipLibCheck": true,
+    "lib": [
+      "es2015",
+      "dom"
+    ]
+  },
+  "files": [
+    "public_api.ts",
+    "node_modules/zone.js/dist/zone.js.d.ts"
+  ],
+  "angularCompilerOptions": {
+    "skipTemplateCodegen": true,
+    "annotateForClosureCompiler": true,
+    "strictMetadataEmit": true,
+    "flatModuleOutFile": "xivapi-client.js",
+    "flatModuleId": "@xivapi/angular-client"
+  }
 }