fix: related to issue #64

- barrel and circular dependencies -> removed index.ts files
- export all artifacts in public_api, to avoid problems with aot

examples/keycloak-events/package.json

@@ -46,6 +46,6 @@
     "protractor": "~5.3.0",
     "ts-node": "~5.0.1",
     "tslint": "~5.9.1",
-    "typescript": "~2.7.2"
+    "typescript": "~2.4.2"
   }
 }

package.json

@@ -5,11 +5,10 @@
   "scripts": {
     "contributors:add": "all-contributors add",
     "contributors:generate": "all-contributors generate",
-    "copy-files": "npx shx cp -r README.md ./dist/keycloak-angular",
     "ng": "ng",
     "start": "ng serve",
     "build": "ng build",
-    "build:keycloak-angular": "ng build keycloak-angular && npm run copy-files",
+    "build:keycloak-angular": "ng build keycloak-angular",
     "test": "ng test",
     "lint": "ng lint"
   },
@@ -71,7 +70,7 @@
     "tsickle": ">=0.25.5",
     "tslib": "^1.7.1",
     "tslint": "~5.9.1",
-    "typescript": "~2.7.2",
+    "typescript": "~2.4.2",
     "zone.js": "^0.8.26"
   }
 }

projects/keycloak-angular/ng-package.json

@@ -5,8 +5,7 @@
   "lib": {
     "entryFile": "src/public_api.ts",
     "umdModuleIds": {
-      "keycloak-js": "Keycloak",
-      "rxjs": "rxjs"
+      "keycloak-js": "Keycloak"
     }
   },
   "whitelistedNonPeerDependencies": ["keycloak-js"]

projects/keycloak-angular/ng-package.prod.json

@@ -1,12 +1,8 @@
 {
   "$schema": "../../node_modules/ng-packagr/ng-package.schema.json",
-  "dest": "../../dist/lib",
+  "dest": "../../dist/keycloak-angular",
   "deleteDestPath": true,
   "lib": {
-    "entryFile": "src/public_api.ts",
-    "umdModuleIds": {
-      "keycloak-js": "Keycloak",
-      "rxjs": "rxjs"
-    }
+    "entryFile": "src/public_api.ts"
   }
 }

projects/keycloak-angular/src/lib/core/core.module.spec.ts

@@ -5,6 +5,7 @@
  * Use of this source code is governed by a MIT-style license that can be
  * found in the LICENSE file at https://github.com/mauriciovigolo/keycloak-angular/LICENSE
  */
+
 import { CoreModule } from './core.module';
 
 describe('CoreModule', () => {

projects/keycloak-angular/src/lib/core/core.module.ts

@@ -5,17 +5,18 @@
  * Use of this source code is governed by a MIT-style license that can be
  * found in the LICENSE file at https://github.com/mauriciovigolo/keycloak-angular/LICENSE
  */
+
 import { NgModule } from '@angular/core';
 import { CommonModule } from '@angular/common';
 import { HTTP_INTERCEPTORS } from '@angular/common/http';
 
-import { CORE_SERVICES } from './services';
-import { KeycloakBearerInterceptor } from './interceptors';
+import { KeycloakService } from './services/keycloak.service';
+import { KeycloakBearerInterceptor } from './interceptors/keycloak-bearer.interceptor';
 
 @NgModule({
   imports: [CommonModule],
   providers: [
-    CORE_SERVICES,
+    KeycloakService,
     {
       provide: HTTP_INTERCEPTORS,
       useClass: KeycloakBearerInterceptor,

projects/keycloak-angular/src/lib/core/interceptors/keycloak-bearer.interceptor.spec.ts

@@ -5,6 +5,7 @@
  * Use of this source code is governed by a MIT-style license that can be
  * found in the LICENSE file at https://github.com/mauriciovigolo/keycloak-angular/LICENSE
  */
+
 import { TestBed, inject } from '@angular/core/testing';
 
 import { KeycloakBearerInterceptor } from './keycloak-bearer.interceptor';

projects/keycloak-angular/src/lib/core/interceptors/keycloak-bearer.interceptor.ts

@@ -5,6 +5,7 @@
  * Use of this source code is governed by a MIT-style license that can be
  * found in the LICENSE file at https://github.com/mauriciovigolo/keycloak-angular/LICENSE
  */
+
 import { Injectable } from '@angular/core';
 import {
   HttpInterceptor,
@@ -14,10 +15,10 @@ import {
   HttpHeaders
 } from '@angular/common/http';
 
-import { Observable } from 'rxjs';
-import { mergeMap } from 'rxjs/operators';
+import { Observable } from 'rxjs/Observable';
+import { mergeMap } from 'rxjs/operators/mergeMap';
 
-import { KeycloakService } from '../services';
+import { KeycloakService } from '../services/keycloak.service';
 
 /**
  * This interceptor includes the bearer by default in all HttpClient requests.

projects/keycloak-angular/src/lib/core/interfaces/keycloak-init-options.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Mauricio Gemelli Vigolo and contributors.
+ *
+ * Use of this source code is governed by a MIT-style license that can be
+ * found in the LICENSE file at https://github.com/mauriciovigolo/keycloak-angular/LICENSE
+ */
+
 /**
  * Keycloak onload options: 'login-required' or 'check-sso'
  */

projects/keycloak-angular/src/lib/core/interfaces/keycloak-options.ts

@@ -5,6 +5,7 @@
  * Use of this source code is governed by a MIT-style license that can be
  * found in the LICENSE file at https://github.com/mauriciovigolo/keycloak-angular/LICENSE
  */
+
 import { KeycloakInitOptions } from './keycloak-init-options';
 import { KeycloakConfig } from './keycloak-config';
 

projects/keycloak-angular/src/lib/core/services/keycloak-auth-guard.ts

@@ -5,7 +5,9 @@
  * Use of this source code is governed by a MIT-style license that can be
  * found in the LICENSE file at https://github.com/mauriciovigolo/keycloak-angular/LICENSE
  */
+
 import { CanActivate, Router, ActivatedRouteSnapshot, RouterStateSnapshot } from '@angular/router';
+
 import { KeycloakService } from './keycloak.service';
 
 /**
@@ -24,7 +26,7 @@ export abstract class KeycloakAuthGuard implements CanActivate {
    */
   protected roles: string[];
 
-  constructor(protected router: Router, protected keycloakAngular: KeycloakService) { }
+  constructor(protected router: Router, protected keycloakAngular: KeycloakService) {}
 
   /**
    * CanActivate checks if the user is logged in and get the full list of roles (REALM + CLIENT)
@@ -58,4 +60,4 @@ export abstract class KeycloakAuthGuard implements CanActivate {
     route: ActivatedRouteSnapshot,
     state: RouterStateSnapshot
   ): Promise<boolean>;
-}
+}

projects/keycloak-angular/src/lib/core/services/keycloak.service.spec.ts

@@ -5,6 +5,7 @@
  * Use of this source code is governed by a MIT-style license that can be
  * found in the LICENSE file at https://github.com/mauriciovigolo/keycloak-angular/LICENSE
  */
+
 import { TestBed, inject } from '@angular/core/testing';
 
 import { KeycloakService } from './keycloak.service';

projects/keycloak-angular/src/lib/core/services/keycloak.service.ts

@@ -5,16 +5,21 @@
  * Use of this source code is governed by a MIT-style license that can be
  * found in the LICENSE file at https://github.com/mauriciovigolo/keycloak-angular/LICENSE
  */
+
 import { Injectable } from '@angular/core';
+
 import { HttpHeaders } from '@angular/common/http';
 
 // Workaround for rollup library behaviour, as pointed out on issue #1267 (https://github.com/rollup/rollup/issues/1267).
 import * as Keycloak_ from 'keycloak-js';
 export const Keycloak = Keycloak_;
 
-import { Observable, Observer, Subject } from 'rxjs';
+import { Observable } from 'rxjs/Observable';
+import { Observer } from 'rxjs/Observer';
+import { Subject } from 'rxjs/Subject';
 
-import { KeycloakOptions, KeycloakEvent, KeycloakEventType } from '../interfaces';
+import { KeycloakOptions } from '../interfaces/keycloak-options';
+import { KeycloakEvent, KeycloakEventType } from '../interfaces/keycloak-event';
 
 /**
  * Service to expose existent methods from the Keycloak JS adapter, adding new

projects/keycloak-angular/src/lib/keycloak-angular.module.ts

@@ -5,11 +5,12 @@
  * Use of this source code is governed by a MIT-style license that can be
  * found in the LICENSE file at https://github.com/mauriciovigolo/keycloak-angular/LICENSE
  */
+
 import { NgModule } from '@angular/core';
 
 import { CoreModule } from './core/core.module';
 
 @NgModule({
   imports: [CoreModule]
 })
-export class KeycloakAngularModule { }
+export class KeycloakAngularModule {}

projects/keycloak-angular/src/public_api.ts

@@ -5,7 +5,13 @@
  * Use of this source code is governed by a MIT-style license that can be
  * found in the LICENSE file at https://github.com/mauriciovigolo/keycloak-angular/LICENSE
  */
-export * from './lib/core/interceptors';
-export * from './lib/core/interfaces';
-export * from './lib/core/services';
-export * from './lib/keycloak-angular.module';
+
+export { KeycloakConfig } from './lib/core/interfaces/keycloak-config';
+export { KeycloakEvent, KeycloakEventType } from './lib/core/interfaces/keycloak-event';
+export { KeycloakInitOptions } from './lib/core/interfaces/keycloak-init-options';
+export { KeycloakOptions } from './lib/core/interfaces/keycloak-options';
+export { KeycloakAuthGuard } from './lib/core/services/keycloak-auth-guard';
+export { KeycloakService, Keycloak } from './lib/core/services/keycloak.service';
+export { KeycloakBearerInterceptor } from './lib/core/interceptors/keycloak-bearer.interceptor';
+export { CoreModule } from './lib/core/core.module';
+export { KeycloakAngularModule } from './lib/keycloak-angular.module';

projects/keycloak-angular/src/test.ts

@@ -1,3 +1,11 @@
+/**
+ * @license
+ * Copyright Mauricio Gemelli Vigolo and contributors.
+ *
+ * Use of this source code is governed by a MIT-style license that can be
+ * found in the LICENSE file at https://github.com/mauriciovigolo/keycloak-angular/LICENSE
+ */
+
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
 import 'core-js/es7/reflect';
@@ -12,10 +20,7 @@ import {
 declare const require: any;
 
 // First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
-);
+getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);
 // And load the modules.

projects/keycloak-angular/tsconfig.lib.json

@@ -1,7 +1,6 @@
 {
   "extends": "../../tsconfig.json",
   "compilerOptions": {
-    "outDir": "../../out-tsc/lib",
     "target": "es2015",
     "module": "es2015",
     "moduleResolution": "node",
@@ -12,10 +11,7 @@
     "experimentalDecorators": true,
     "importHelpers": true,
     "types": [],
-    "lib": [
-      "dom",
-      "es2015"
-    ]
+    "lib": ["dom", "es2015"]
   },
   "angularCompilerOptions": {
     "annotateForClosureCompiler": true,
@@ -26,8 +22,5 @@
     "flatModuleId": "AUTOGENERATED",
     "flatModuleOutFile": "AUTOGENERATED"
   },
-  "exclude": [
-    "src/test.ts",
-    "**/*.spec.ts"
-  ]
+  "exclude": ["src/test.ts", "**/*.spec.ts"]
 }

tsconfig.json

@@ -4,7 +4,7 @@
     "baseUrl": "./",
     "outDir": "./dist/out-tsc",
     "sourceMap": true,
-    "declaration": false,
+    "declaration": true,
     "moduleResolution": "node",
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,