Updated with new @tubular packages to get rid of CommonJS warnings, as well as getting rid of most dependencies on lodash (the remainder of which are now supported by lodash-es).

Author: kshetline

angular.json

@@ -22,7 +22,7 @@
               "src/favicon.ico",
               {
                 "glob": "**/*",
-                "input": "node_modules/ks-astronomy/dist/resources",
+                "input": "node_modules/@tubular/astronomy/dist/resources",
                 "output": "/assets/resources"
               }
             ],
@@ -101,7 +101,7 @@
               "src/favicon.ico",
               {
                 "glob": "**/*",
-                "input": "node_modules/ks-astronomy/dist/resources",
+                "input": "node_modules/@tubular/astronomy/dist/resources",
                 "output": "/assets/resources"
               }
             ]

package-lock.json

@@ -25,14 +25,14 @@
     "@angular/platform-browser-dynamic": "^10.2.3",
     "@angular/router": "^10.2.3",
     "@fortawesome/fontawesome-free": "^5.15.1",
+    "@tubular/astronomy": "^2.0.5",
+    "@tubular/math": "^2.1.3",
+    "@tubular/time": "^2.3.0",
+    "@tubular/util": "^3.1.3",
     "array-buffer-reader": "^1.0.4",
     "core-js": "^2.6.12",
     "detect-resize": "^0.1.5",
-    "ks-astronomy": "^1.3.2",
-    "ks-date-time-zone": "^1.9.0",
-    "ks-math": "^1.2.1",
-    "ks-util": "^1.11.3",
-    "lodash": "^4.17.20",
+    "lodash-es": "^4.17.20",
     "ng-busy": "^10.0.0",
     "primeicons": "^4.1.0",
     "primeng": "^10.0.3",
@@ -48,7 +48,7 @@
     "@types/googlemaps": "^3.40.3",
     "@types/jasmine": "^3.6.2",
     "@types/jasminewd2": "^2.0.8",
-    "@types/lodash": "^4.14.165",
+    "@types/lodash-es": "^4.17.4",
     "codelyzer": "^5.1.2",
     "jasmine-core": "~3.5.0",
     "jasmine-spec-reporter": "~5.0.0",

package.json

@@ -28,12 +28,12 @@ <h2>Sky View Café NP</h2>
             <button pButton type="button" (click)="setToNow()" [disabled]="trackTime" label="Now"></button>
           </div>
           <div class="time-panel-item">
-            <svc-time-editor [(ngModel)]="time" [timeZone]="timeZone" [viewOnly]="trackTime" [gregorianChangeDate]="gcDate"
+            <svc-time-editor [(ngModel)]="time" [timezone]="timezone" [viewOnly]="trackTime" [gregorianChangeDate]="gcDate"
               [nativeDateTime]="nativeDateTime"></svc-time-editor>
           </div>
           <div class="time-panel-item">
             <p-overlayPanel #calendarPopup class="calendar-popup">
-              <ks-calendar [(ngModel)]="date" [timeZone]="timeZone" [gregorianChangeDate]="gcDate" [showDst]="true" [minYear]="-6000" [maxYear]="9999"
+              <ks-calendar [(ngModel)]="date" [timezone]="timezone" [gregorianChangeDate]="gcDate" [showDst]="true" [minYear]="-6000" [maxYear]="9999"
                            (dayClick)="calendarPopup.hide()"></ks-calendar>
             </p-overlayPanel>
             <ks-icon-button [disabled]="trackTime" icon="far fa-calendar-alt" (click)="calendarPopup.toggle($event)"></ks-icon-button>&nbsp;

src/app/app.component.html

@@ -22,9 +22,9 @@
 
 import { AfterViewInit, Component, HostListener, OnDestroy } from '@angular/core';
 import { Router } from '@angular/router';
-import { KsDateTime, KsTimeZone, YMDDate } from 'ks-date-time-zone';
-import { toggleFullScreen } from 'ks-util';
-import { debounce } from 'lodash';
+import { DateTime, Timezone, YMDDate } from '@tubular/time';
+import { toggleFullScreen } from '@tubular/util';
+import { debounce } from 'lodash-es';
 import { MenuItem, MessageService } from 'primeng/api';
 import { Subscription, timer } from 'rxjs';
 import { AppService, currentMinuteMillis, CurrentTab, PROPERTY_GREGORIAN_CHANGE_DATE, PROPERTY_NATIVE_DATE_TIME,
@@ -41,10 +41,10 @@ const MIN_APP_HEIGHT = 640;
   providers: [AppService, MessageService]
 })
 export class AppComponent implements AfterViewInit, OnDestroy {
-  private dateTime = new KsDateTime(null, KsTimeZone.OS_ZONE);
+  private dateTime = new DateTime(null, Timezone.OS_ZONE);
   private _date = <YMDDate> {};
   private debouncedResize: () => void;
-  private _timeZone: KsTimeZone = KsTimeZone.OS_ZONE;
+  private _timeZone: Timezone = Timezone.OS_ZONE;
   private _time: number = this.dateTime.utcTimeMillis;
   private _trackTime = false;
   private timer: Subscription;
@@ -125,7 +125,7 @@ export class AppComponent implements AfterViewInit, OnDestroy {
     }
   }
 
-  get timeZone(): KsTimeZone { return this._timeZone; }
+  get timezone(): Timezone { return this._timeZone; }
 
   get date(): YMDDate {
     const wt = this.dateTime.wallTime;
@@ -168,8 +168,8 @@ export class AppComponent implements AfterViewInit, OnDestroy {
   }
 
   private updateTimeZone(): void {
-    this._timeZone = KsTimeZone.getTimeZone(this.app.location.zone, this.app.location.longitude);
-    this.dateTime.timeZone = this._timeZone;
+    this._timeZone = Timezone.getTimezone(this.app.location.zone, this.app.location.longitude);
+    this.dateTime.timezone = this._timeZone;
 
     if (this._timeZone.error)
       this.messageService.add({key: 'general', severity: 'error', summary: 'Failed to retrieve time zone',

src/app/app.component.ts

@@ -24,9 +24,9 @@ import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
 import { DomSanitizer } from '@angular/platform-browser';
 import { NavigationEnd, Router } from '@angular/router';
-import { SolarSystem, StarCatalog } from 'ks-astronomy';
-import { KsCalendar } from 'ks-date-time-zone';
-import { clone, compact, debounce, forEach, isEqual, isString, sortedIndexBy } from 'lodash';
+import { SolarSystem, StarCatalog } from '@tubular/astronomy';
+import { Calendar } from '@tubular/time';
+import { clone, compact, debounce, forEach, isEqual, isString, sortedIndexBy } from 'lodash-es';
 import { BehaviorSubject, Observable, Subject, Subscription } from 'rxjs';
 import { AstroDataService } from './astronomy/astro-data.service';
 
@@ -211,7 +211,7 @@ export class AppService {
   }
   sendAppEvent(appEventOrName: AppEvent | string, value?: any): void {
     if (isString(appEventOrName))
-      this._appEvent.next({name: appEventOrName, value: value});
+      this._appEvent.next({ name: appEventOrName, value: value });
     else
       this._appEvent.next(appEventOrName);
   }
@@ -256,8 +256,8 @@ export class AppService {
     }
   }
 
-  get timeZone(): string { return this._location.getValue().zone; }
-  set timeZone(newZone: string) {
+  get timezone(): string { return this._location.getValue().zone; }
+  set timezone(newZone: string) {
     if (this._location.getValue().zone !== newZone) {
       const newLocation = clone(this._location.getValue());
 
@@ -395,7 +395,7 @@ export class AppService {
       return CalendarSetting.CUSTOM_GCD;
   }
 
-  applyCalendarType(dateTime: KsCalendar): void {
+  applyCalendarType(dateTime: Calendar): void {
     if (dateTime)
       dateTime.setGregorianChange(this._gcDate);
   }

src/app/app.service.ts

@@ -19,7 +19,7 @@
 
 import { HttpClient } from '@angular/common/http';
 import { Injectable } from '@angular/core';
-import { AsteroidCometInfo, IAstroDataService } from 'ks-astronomy';
+import { AsteroidCometInfo, IAstroDataService } from '@tubular/astronomy';
 
 @Injectable()
 export class AstroDataService implements IAstroDataService {

src/app/astronomy/astro-data.service.ts

@@ -21,16 +21,16 @@
 */
 
 import { AfterViewInit, Directive } from '@angular/core';
-import * as C_ from 'ks-astronomy';
+import * as C_ from '@tubular/astronomy';
 import {
   ABERRATION, EARTH, Ecliptic, KM_PER_AU, MOON, MOON_SHADOW, NEPTUNE, NO_MATCH, NO_SELECTION, NUTATION, PlanetaryMoons, PLUTO,
   SolarSystem, SUN, TOPOCENTRIC, UNKNOWN_MAGNITUDE, URANUS
-} from 'ks-astronomy';
+} from '@tubular/astronomy';
 import {
   abs, Angle, cos_deg, floor, FMT_MINS, FMT_SECS, intersects, max, min, mod2, Point, Rectangle, round, sin_deg, SphericalPosition,
   SphericalPosition3D, sqrt, TWO_PI, union
-} from 'ks-math';
-import { getTextWidth, toDefaultLocaleFixed } from 'ks-util';
+} from '@tubular/math';
+import { getTextWidth, toDefaultLocaleFixed } from '@tubular/util';
 import { AppService, CurrentTab, PROPERTY_NORTH_AZIMUTH, UserSetting, VIEW_APP } from '../app.service';
 import { DrawingContext, GenericViewDirective } from './generic-view.directive';
 

src/app/svc/generic-planetary-view.directive.ts

@@ -21,10 +21,10 @@
 */
 
 import { AfterViewInit, Directive } from '@angular/core';
-import { LABEL_ANCHOR, LINE_BREAK, NO_MATCH, REFRACTION } from 'ks-astronomy';
-import { max, min, Point, pow, round, SphericalPosition, SphericalPosition3D } from 'ks-math';
-import { strokeEllipse } from 'ks-util';
-import { reverse, sortBy } from 'lodash';
+import { LABEL_ANCHOR, LINE_BREAK, NO_MATCH, REFRACTION } from '@tubular/astronomy';
+import { max, min, Point, pow, round, SphericalPosition, SphericalPosition3D } from '@tubular/math';
+import { strokeEllipse } from '@tubular/util';
+import { reverse, sortBy } from 'lodash-es';
 import { AppService, CurrentTab } from '../app.service';
 import {
   DrawingContextPlanetary, FAR_AWAY, GenericPlanetaryViewDirective, highlightedStarColor, LABEL_TYPE, NONPLANET, SELECTION_TYPE,

src/app/svc/generic-sky-view.directive.ts

@@ -25,11 +25,11 @@ import { SafeStyle } from '@angular/platform-browser';
 import {
   ASTEROID_BASE, COMET_BASE, EARTH, FIRST_PLANET, HALF_MINUTE, ISkyObserver, LAST_PLANET, NO_MATCH, SkyObserver, SolarSystem,
   StarCatalog, UT_to_TDB
-} from 'ks-astronomy';
-import { KsDateTime } from 'ks-date-time-zone';
-import { ceil, max, round, sqrt } from 'ks-math';
-import { FontMetrics, getFontMetrics, isSafari, padLeft } from 'ks-util';
-import { clone, debounce, isString, throttle } from 'lodash';
+} from '@tubular/astronomy';
+import { DateTime } from '@tubular/time';
+import { ceil, max, round, sqrt } from '@tubular/math';
+import { FontMetrics, getFontMetrics, isSafari, padLeft } from '@tubular/util';
+import { clone, debounce, isString, throttle } from 'lodash-es';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
 import { AppService, CurrentTab } from '../app.service';
 import { getXYForTouchEvent } from '../util/ks-touch-events';
@@ -458,7 +458,7 @@ export abstract class GenericViewDirective implements AfterViewInit {
     dc.ss = this.appService.solarSystem;
     dc.skyObserver = new SkyObserver(this.appService.longitude, this.appService.latitude);
     // Bias time half a minute ahead of the clock time for rounding to the middle of the selected minute.
-    dc.jdu = KsDateTime.julianDay(this.time) + HALF_MINUTE;
+    dc.jdu = DateTime.julianDay(this.time) + HALF_MINUTE;
     dc.jde = UT_to_TDB(dc.jdu);
     dc.inkSaver = GenericViewDirective.printing && this.appService.inkSaver;