fix(abdtp-component): aot build was failing because _model is private

dalelotts · dalelotts · commit 5fb34a6672bb · 2018-03-07T18:07:53.000-06:00
remove private modifier from _model, added aot build to npm test, and optimized class imports fixes #425
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -21,7 +21,7 @@
     "lint": "ng lint",
     "ng": "ng",
     "start": "ng serve",
-    "test": "ng lint && ng test --single-run --code-coverage && npm run build:lib ",
+    "test": "ng lint && ng test --single-run --code-coverage && ng build --prod && npm run build:lib ",
     "test:tdd": "ng test",
     "semantic-release": "semantic-release",
     "travis-deploy-once": "travis-deploy-once"
@@ -52,18 +52,18 @@
     "zone.js": ">=0.8.18"
   },
   "devDependencies": {
-    "@angular/animations": "^5.2.4",
-    "@angular/cli": "^1.6.8",
-    "@angular/common": "^5.2.4",
-    "@angular/compiler": "^5.2.4",
-    "@angular/compiler-cli": "^5.2.4",
-    "@angular/core": "^5.2.4",
-    "@angular/forms": "^5.2.4",
-    "@angular/http": "^5.2.4",
-    "@angular/language-service": "^5.2.4",
-    "@angular/platform-browser": "^5.2.4",
-    "@angular/platform-browser-dynamic": "^5.2.4",
-    "@angular/router": "^5.2.4",
+    "@angular/animations": "^5.2.7",
+    "@angular/cli": "^1.7.2",
+    "@angular/common": "^5.2.7",
+    "@angular/compiler": "^5.2.7",
+    "@angular/compiler-cli": "^5.2.7",
+    "@angular/core": "^5.2.7",
+    "@angular/forms": "^5.2.7",
+    "@angular/http": "^5.2.7",
+    "@angular/language-service": "^5.2.7",
+    "@angular/platform-browser": "^5.2.7",
+    "@angular/platform-browser-dynamic": "^5.2.7",
+    "@angular/router": "^5.2.7",
     "@compodoc/compodoc": "^1.0.8",
     "@types/jasmine": "~2.8.6",
     "@types/jasminewd2": "~2.0.3",
@@ -77,16 +77,16 @@
     "karma": "^2.0.0",
     "karma-chrome-launcher": "^2.2.0",
     "karma-cli": "^1.0.1",
-    "karma-coverage-istanbul-reporter": "^1.4.1",
+    "karma-coverage-istanbul-reporter": "^1.4.2",
     "karma-jasmine": "^1.1.1",
     "karma-jasmine-html-reporter": "^0.2.2",
-    "moment": "^2.20.1",
-    "ng-packagr": "^2.1.0",
+    "moment": "^2.21.0",
+    "ng-packagr": "^2.2.0",
     "open-iconic": "^1.1.1",
     "protractor": "^5.3.0",
     "rxjs": "^5.5.6",
     "scss-bundle": "^2.1.2",
-    "semantic-release": "^12.4.1",
+    "semantic-release": "^15.0.0",
     "stylelint": "^9.1.1",
     "ts-node": "^5.0.1",
     "tslint": "^5.9.1",
@@ -110,12 +110,6 @@
           "dist"
         ]
       }
-    ],
-    "success": [
-      "@semantic-release/github"
-    ],
-    "fail": [
-      "@semantic-release/github"
     ]
   },
   "dependencies": {
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
@@ -7,10 +7,9 @@
  * found in the LICENSE file at https://github.com/dalelotts/angular-bootstrap-datetimepicker/blob/master/LICENSE
  */
 
-import {Component, ViewChild} from '@angular/core';
-import {DlDateTimePickerComponent} from '../lib/dl-date-time-picker';
+import {Component} from '@angular/core';
 import {DateButton} from '../lib/dl-date-time-picker';
-import moment = require('moment');
+import * as moment from 'moment';
 import {unitOfTime} from 'moment';
 
 @Component({
diff --git a/src/lib/dl-date-time-picker/dl-date-time-picker.component.ts b/src/lib/dl-date-time-picker/dl-date-time-picker.component.ts
@@ -221,7 +221,7 @@ export class DlDateTimePickerComponent<D> implements OnChanges, OnInit, ControlV
    *
    * @internal
    **/
-  private _model: DlDateTimePickerModel;
+  _model: DlDateTimePickerModel;
 
   /**
    * Maps view name to the next view (the view for the next smallest increment of time).
diff --git a/src/lib/dl-date-time-picker/dl-model-provider-day.ts b/src/lib/dl-date-time-picker/dl-model-provider-day.ts
@@ -9,7 +9,7 @@
 
 import {DlModelProvider} from './dl-model-provider';
 import {DlDateTimePickerModel} from './dl-date-time-picker-model';
-import {Component, SimpleChanges} from '@angular/core';
+import {SimpleChanges} from '@angular/core';
 import * as _moment from 'moment';
 
 /**
diff --git a/src/lib/dl-date-time-picker/dl-model-provider-hour.ts b/src/lib/dl-date-time-picker/dl-model-provider-hour.ts
@@ -9,8 +9,9 @@
 
 import {DlModelProvider} from './dl-model-provider';
 import {DlDateTimePickerModel} from './dl-date-time-picker-model';
-import {Component, SimpleChanges} from '@angular/core';
+import {SimpleChanges} from '@angular/core';
 import * as _moment from 'moment';
+
 /**
  * Work around for moment namespace conflict when used with webpack and rollup.
  * See https://github.com/dherges/ng-packagr/issues/163
diff --git a/src/lib/dl-date-time-picker/dl-model-provider-minute.ts b/src/lib/dl-date-time-picker/dl-model-provider-minute.ts
@@ -9,8 +9,9 @@
 
 import {DlModelProvider} from './dl-model-provider';
 import {DlDateTimePickerModel} from './dl-date-time-picker-model';
-import {Component, SimpleChanges} from '@angular/core';
+import {SimpleChanges} from '@angular/core';
 import * as _moment from 'moment';
+
 /**
  * Work around for moment namespace conflict when used with webpack and rollup.
  * See https://github.com/dherges/ng-packagr/issues/163
diff --git a/src/lib/dl-date-time-picker/dl-model-provider-month.ts b/src/lib/dl-date-time-picker/dl-model-provider-month.ts
@@ -9,8 +9,9 @@
 
 import {DlModelProvider} from './dl-model-provider';
 import {DlDateTimePickerModel} from './dl-date-time-picker-model';
-import {Component, SimpleChanges} from '@angular/core';
+import {SimpleChanges} from '@angular/core';
 import * as _moment from 'moment';
+
 /**
  * Work around for moment namespace conflict when used with webpack and rollup.
  * See https://github.com/dherges/ng-packagr/issues/163
diff --git a/src/lib/dl-date-time-picker/dl-model-provider-year.ts b/src/lib/dl-date-time-picker/dl-model-provider-year.ts
@@ -9,9 +9,10 @@
 
 import {DlModelProvider} from './dl-model-provider';
 import {DlDateTimePickerModel} from './dl-date-time-picker-model';
-import {Component, SimpleChanges} from '@angular/core';
+import {SimpleChanges} from '@angular/core';
 import * as _moment from 'moment';
 import {Moment} from 'moment';
+
 /**
  * Work around for moment namespace conflict when used with webpack and rollup.
  * See https://github.com/dherges/ng-packagr/issues/163
diff --git a/src/lib/dl-date-time-picker/specs/start-view/day-view.spec.ts b/src/lib/dl-date-time-picker/specs/start-view/day-view.spec.ts
@@ -150,7 +150,7 @@ describe('DlDateTimePickerComponent startView=day', () => {
       // I think it is related to https://github.com/angular/angular/issues/10816
       const activeElement = debugElement.query(By.css('.dl-abdtp-active')).nativeElement;
       activeElement.focus();
-      dispatchKeyboardEvent(activeElement, 'keydown', RIGHT_ARROW);
+      dispatchKeyboardEvent(activeElement, 'keydown', HOME);
       fixture.detectChanges();
 
       const selectedElements = fixture.debugElement.queryAll(By.css('.dl-abdtp-selected'));
diff --git a/src/lib/dl-date-time-picker/specs/start-view/hour-view.spec.ts b/src/lib/dl-date-time-picker/specs/start-view/hour-view.spec.ts
@@ -132,7 +132,7 @@ describe('DlDateTimePickerComponent startView=hour', () => {
       expect(tabIndexElements.length).toBe(1);
     });
 
-    it('should contain 1 .dl-abdtp-selectedelement for the current value', () => {
+    it('should contain 1 .dl-abdtp-selected element for the current value', () => {
       component.picker.value = moment().startOf('hour').valueOf();
       fixture.detectChanges();
 
@@ -141,7 +141,7 @@ describe('DlDateTimePickerComponent startView=hour', () => {
       // I think it is related to https://github.com/angular/angular/issues/10816
       const activeElement = debugElement.query(By.css('.dl-abdtp-active')).nativeElement;
       activeElement.focus();
-      dispatchKeyboardEvent(activeElement, 'keydown', RIGHT_ARROW);
+      dispatchKeyboardEvent(activeElement, 'keydown', HOME);
       fixture.detectChanges();
 
       const currentElements = fixture.debugElement.queryAll(By.css('.dl-abdtp-selected'));
diff --git a/src/lib/dl-date-time-picker/specs/start-view/minute-view.spec.ts b/src/lib/dl-date-time-picker/specs/start-view/minute-view.spec.ts
@@ -151,7 +151,7 @@ describe('DlDateTimePickerComponent startView=minute', () => {
       expect(currentElements[0].nativeElement.classList).toContain(currentMoment.valueOf().toString());
     });
 
-    it('should contain 1 .dl-abdtp-selectedelement for the current minute', () => {
+    it('should contain 1 .dl-abdtp-selected element for the current minute', () => {
       const currentElements = fixture.debugElement.queryAll(By.css('.dl-abdtp-active'));
       expect(currentElements.length).toBe(1);
 
diff --git a/src/lib/dl-date-time-picker/specs/start-view/month-view.spec.ts b/src/lib/dl-date-time-picker/specs/start-view/month-view.spec.ts
@@ -130,7 +130,7 @@ describe('DlDateTimePickerComponent startView=month', () => {
       expect(currentElements[0].nativeElement.classList).toContain(moment().startOf('month').valueOf().toString());
     });
 
-    it('should contain 1 .dl-abdtp-selectedelement for the current month', () => {
+    it('should contain 1 .dl-abdtp-selected element for the current month', () => {
       component.picker.value = moment().startOf('month').valueOf();
       fixture.detectChanges();
 
@@ -139,7 +139,7 @@ describe('DlDateTimePickerComponent startView=month', () => {
       // I think it is related to https://github.com/angular/angular/issues/10816
       const activeElement = debugElement.query(By.css('.dl-abdtp-active')).nativeElement;
       activeElement.focus();
-      dispatchKeyboardEvent(activeElement, 'keydown', RIGHT_ARROW);
+      dispatchKeyboardEvent(activeElement, 'keydown', HOME);
       fixture.detectChanges();
 
       const selectedElements = fixture.debugElement.queryAll(By.css('.dl-abdtp-selected'));
diff --git a/src/lib/dl-date-time-picker/specs/start-view/year-view.spec.ts b/src/lib/dl-date-time-picker/specs/start-view/year-view.spec.ts
@@ -137,7 +137,7 @@ describe('DlDateTimePickerComponent', () => {
       expect(activeElements[0].nativeElement.classList).toContain(moment().startOf('year').valueOf().toString());
     });
 
-    it('should contain 1 .dl-abdtp-selectedelement for the current year', () => {
+    it('should contain 1 .dl-abdtp-selected element for the current year', () => {
       component.picker.value = moment().startOf('year').valueOf();
       fixture.detectChanges();
 
@@ -146,7 +146,7 @@ describe('DlDateTimePickerComponent', () => {
       // I think it is related to https://github.com/angular/angular/issues/10816
       const activeElement = debugElement.query(By.css('.dl-abdtp-active')).nativeElement;
       activeElement.focus();
-      dispatchKeyboardEvent(activeElement, 'keydown', RIGHT_ARROW);
+      dispatchKeyboardEvent(activeElement, 'keydown', HOME);
       fixture.detectChanges();
 
       const selectedElements = fixture.debugElement.queryAll(By.css('.dl-abdtp-selected'));
diff --git a/src/main.ts b/src/main.ts
@@ -7,11 +7,11 @@
  * found in the LICENSE file at https://github.com/dalelotts/angular-bootstrap-datetimepicker/blob/master/LICENSE
  */
 
-import { enableProdMode } from '@angular/core';
-import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
+import {enableProdMode} from '@angular/core';
+import {platformBrowserDynamic} from '@angular/platform-browser-dynamic';
 
-import { AppModule } from './app/app.module';
-import { environment } from './environments/environment';
+import {AppModule} from './app/app.module';
+import {environment} from './environments/environment';
 
 if (environment.production) {
   enableProdMode();
diff --git a/src/polyfills.ts b/src/polyfills.ts
@@ -44,6 +44,10 @@
 /** Evergreen browsers require these. **/
 // Used for reflect-metadata in JIT. If you use AOT (and only Angular decorators), you can remove.
 import 'core-js/es7/reflect';
+/***************************************************************************************************
+ * Zone JS is required by Angular itself.
+ */
+import 'zone.js/dist/zone'; // Included with Angular CLI.
 
 
 /**
@@ -54,13 +58,6 @@ import 'core-js/es7/reflect';
 
 
 
-/***************************************************************************************************
- * Zone JS is required by Angular itself.
- */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
-
-
-
 /***************************************************************************************************
  * APPLICATION IMPORTS
  */
diff --git a/src/test.ts b/src/test.ts
@@ -15,11 +15,8 @@ import 'zone.js/dist/sync-test';
 import 'zone.js/dist/jasmine-patch';
 import 'zone.js/dist/async-test';
 import 'zone.js/dist/fake-async-test';
-import { getTestBed } from '@angular/core/testing';
-import {
-  BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting
-} from '@angular/platform-browser-dynamic/testing';
+import {getTestBed} from '@angular/core/testing';
+import {BrowserDynamicTestingModule, platformBrowserDynamicTesting} from '@angular/platform-browser-dynamic/testing';
 
 // Unfortunately there's no typing for the `__karma__` variable. Just declare it as any.
 declare const __karma__: any;

Original file line number	Diff line number	Diff line change
`@@ -221,7 +221,7 @@ export class DlDateTimePickerComponent<D> implements OnChanges, OnInit, ControlV`
`221`	`221`	`*`
`222`	`222`	`* @internal`
`223`	`223`	`**/`
`224`		`- private _model: DlDateTimePickerModel;`
	`224`	`+ _model: DlDateTimePickerModel;`
`225`	`225`
`226`	`226`	`/**`
`227`	`227`	`* Maps view name to the next view (the view for the next smallest increment of time).`