fix(*): Move YaReadyEvent and YaEvent from event manager in separated…

… file to export them
ddubrava · May 18, 2021 · 4401ba1 · 4401ba1
1 parent 246e5ce
commit 4401ba1
Show file tree

Hide file tree

Showing 18 changed files with 56 additions and 32 deletions.
diff --git a/projects/angular8-yandex-maps/src/lib/components/ya-clusterer/ya-clusterer.component.spec.ts b/projects/angular8-yandex-maps/src/lib/components/ya-clusterer/ya-clusterer.component.spec.ts
@@ -14,7 +14,7 @@ import {
   createPlacemarkConstructorSpy,
   createPlacemarkSpy,
 } from '../../testing/fake-ymaps-utils';
-import { YaReadyEvent } from '../../utils/event-manager';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
 
 @Component({
   template: `

diff --git a/projects/angular8-yandex-maps/src/lib/components/ya-clusterer/ya-clusterer.component.ts b/projects/angular8-yandex-maps/src/lib/components/ya-clusterer/ya-clusterer.component.ts
@@ -16,7 +16,9 @@ import { Observable, Subscription } from 'rxjs';
 import { YaGeoObjectDirective } from '../ya-geoobject/ya-geoobject.directive';
 import { YaMapComponent } from '../ya-map/ya-map.component';
 import { YaPlacemarkDirective } from '../ya-placemark/ya-placemark.directive';
-import { EventManager, YaEvent, YaReadyEvent } from '../../utils/event-manager';
+import { EventManager } from '../../utils/event-manager';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
+import { YaEvent } from '../../typings/ya-event';
 
 /**
  * The `ya-clusterer` component wraps `ymaps.Clusterer` class from the Yandex Maps API.

diff --git a/projects/angular8-yandex-maps/src/lib/components/ya-control/ya-control.directive.spec.ts b/projects/angular8-yandex-maps/src/lib/components/ya-control/ya-control.directive.spec.ts
@@ -8,7 +8,7 @@ import {
   createRoutePanelSpy,
 } from '../../testing/fake-ymaps-utils';
 import { YaMapComponent } from '../ya-map/ya-map.component';
-import { YaReadyEvent } from '../../utils/event-manager';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
 
 @Component({
   template: '<ya-control [type]="type" [parameters]="parameters"></ya-control>',

diff --git a/projects/angular8-yandex-maps/src/lib/components/ya-control/ya-control.directive.ts b/projects/angular8-yandex-maps/src/lib/components/ya-control/ya-control.directive.ts
@@ -9,8 +9,8 @@ import {
   Output,
 } from '@angular/core';
 import { Subscription } from 'rxjs';
-import { YaReadyEvent } from '../../utils/event-manager';
 import { YaMapComponent } from '../ya-map/ya-map.component';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
 
 export type YaControlType =
   | 'Button'

diff --git a/projects/angular8-yandex-maps/src/lib/components/ya-geoobject/ya-geoobject.directive.spec.ts b/projects/angular8-yandex-maps/src/lib/components/ya-geoobject/ya-geoobject.directive.spec.ts
@@ -8,7 +8,7 @@ import {
   createGeoObjectSpy,
   createMapSpy,
 } from '../../testing/fake-ymaps-utils';
-import { YaReadyEvent } from '../../utils/event-manager';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
 
 @Component({
   template: `

diff --git a/projects/angular8-yandex-maps/src/lib/components/ya-geoobject/ya-geoobject.directive.ts b/projects/angular8-yandex-maps/src/lib/components/ya-geoobject/ya-geoobject.directive.ts
@@ -10,8 +10,10 @@ import {
   SimpleChanges,
 } from '@angular/core';
 import { Observable, Subscription } from 'rxjs';
-import { EventManager, YaEvent, YaReadyEvent } from '../../utils/event-manager';
+import { EventManager } from '../../utils/event-manager';
 import { YaMapComponent } from '../ya-map/ya-map.component';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
+import { YaEvent } from '../../typings/ya-event';
 
 /**
  * The `ya-geoobject` component wraps `ymaps.GeoObject` class from the Yandex Maps API.

diff --git a/projects/angular8-yandex-maps/src/lib/components/ya-map/ya-map.component.spec.ts b/projects/angular8-yandex-maps/src/lib/components/ya-map/ya-map.component.spec.ts
@@ -3,12 +3,12 @@ import { Component, ViewChild } from '@angular/core';
 
 import * as GenerateRandomIdModule from '../../utils/generate-random-id';
 import { YaMapComponent } from './ya-map.component';
-import { YaReadyEvent } from '../../utils/event-manager';
 import {
   createMapConstructorSpy,
   createMapSpy,
   createReadySpy,
 } from '../../testing/fake-ymaps-utils';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
 
 @Component({
   template: `

diff --git a/projects/angular8-yandex-maps/src/lib/components/ya-map/ya-map.component.ts b/projects/angular8-yandex-maps/src/lib/components/ya-map/ya-map.component.ts
@@ -16,9 +16,11 @@ import {
 } from '@angular/core';
 import { isPlatformBrowser } from '@angular/common';
 import { BehaviorSubject, Observable, Subscription } from 'rxjs';
-import { EventManager, YaEvent, YaReadyEvent } from '../../utils/event-manager';
+import { EventManager } from '../../utils/event-manager';
 import { generateRandomId } from '../../utils/generate-random-id';
 import { YaApiLoaderService } from '../../services/ya-api-loader/ya-api-loader.service';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
+import { YaEvent } from '../../typings/ya-event';
 
 /**
  * The `ya-map` component wraps `ymaps.Map` class from the Yandex Maps API.

diff --git a/...cts/angular8-yandex-maps/src/lib/components/ya-multiroute/ya-multiroute.directive.spec.ts b/...cts/angular8-yandex-maps/src/lib/components/ya-multiroute/ya-multiroute.directive.spec.ts
@@ -8,7 +8,7 @@ import {
   createMultirouteConstructorSpy,
   createMultirouteSpy,
 } from '../../testing/fake-ymaps-utils';
-import { YaReadyEvent } from '../../utils/event-manager';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
 
 @Component({
   template: `

diff --git a/projects/angular8-yandex-maps/src/lib/components/ya-multiroute/ya-multiroute.directive.ts b/projects/angular8-yandex-maps/src/lib/components/ya-multiroute/ya-multiroute.directive.ts
@@ -10,8 +10,10 @@ import {
   SimpleChanges,
 } from '@angular/core';
 import { Observable, Subscription } from 'rxjs';
-import { EventManager, YaEvent, YaReadyEvent } from '../../utils/event-manager';
+import { EventManager } from '../../utils/event-manager';
 import { YaMapComponent } from '../ya-map/ya-map.component';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
+import { YaEvent } from '../../typings/ya-event';
 
 /**
  * @internal

diff --git a/projects/angular8-yandex-maps/src/lib/components/ya-panorama/ya-panorama.directive.spec.ts b/projects/angular8-yandex-maps/src/lib/components/ya-panorama/ya-panorama.directive.spec.ts
@@ -8,7 +8,7 @@ import {
   createPlayerSpy,
 } from '../../testing/fake-ymaps-utils';
 import { YaMapComponent } from '../ya-map/ya-map.component';
-import { YaReadyEvent } from '../../utils/event-manager';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
 
 @Component({
   template: `

diff --git a/projects/angular8-yandex-maps/src/lib/components/ya-panorama/ya-panorama.directive.ts b/projects/angular8-yandex-maps/src/lib/components/ya-panorama/ya-panorama.directive.ts
@@ -11,8 +11,10 @@ import {
 } from '@angular/core';
 import { from, Observable, Subscription } from 'rxjs';
 import { filter, map, switchMap } from 'rxjs/operators';
-import { EventManager, YaEvent, YaReadyEvent } from '../../utils/event-manager';
+import { EventManager } from '../../utils/event-manager';
 import { YaMapComponent } from '../ya-map/ya-map.component';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
+import { YaEvent } from '../../typings/ya-event';
 
 /**
  * The `ya-panorama` component wraps `ymaps.panorama.Player` class from the Yandex Maps API.

diff --git a/projects/angular8-yandex-maps/src/lib/components/ya-placemark/ya-placemark.directive.spec.ts b/projects/angular8-yandex-maps/src/lib/components/ya-placemark/ya-placemark.directive.spec.ts
@@ -8,7 +8,7 @@ import {
   createPlacemarkSpy,
 } from '../../testing/fake-ymaps-utils';
 import { YaMapComponent } from '../ya-map/ya-map.component';
-import { YaReadyEvent } from '../../utils/event-manager';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
 
 @Component({
   template: `

diff --git a/projects/angular8-yandex-maps/src/lib/components/ya-placemark/ya-placemark.directive.ts b/projects/angular8-yandex-maps/src/lib/components/ya-placemark/ya-placemark.directive.ts
@@ -11,7 +11,9 @@ import {
 } from '@angular/core';
 import { Observable, Subscription } from 'rxjs';
 import { YaMapComponent } from '../ya-map/ya-map.component';
-import { EventManager, YaEvent, YaReadyEvent } from '../../utils/event-manager';
+import { EventManager } from '../../utils/event-manager';
+import { YaReadyEvent } from '../../typings/ya-ready-event';
+import { YaEvent } from '../../typings/ya-event';
 
 /**
  * The `ya-placemark` directive wraps `ymaps.Placemark` class from the Yandex Maps API.

diff --git a/projects/angular8-yandex-maps/src/lib/typings/ya-event.ts b/projects/angular8-yandex-maps/src/lib/typings/ya-event.ts
@@ -0,0 +1,15 @@
+export interface YaEvent<T = any> {
+  /**
+   * Instance of target
+   */
+  target: T;
+  /**
+   * API global object
+   */
+  ymaps: typeof ymaps;
+  /**
+   * Provides methods for accessing the originalObject object's fields and methods, with the possibility for redefining them.
+   * {@link https://yandex.com/dev/maps/jsapi/doc/2.1/ref/reference/Event.html/}
+   */
+  event: ymaps.Event<any, T>;
+}
diff --git a/projects/angular8-yandex-maps/src/lib/typings/ya-ready-event.ts b/projects/angular8-yandex-maps/src/lib/typings/ya-ready-event.ts
@@ -0,0 +1,10 @@
+export interface YaReadyEvent<T = any> {
+  /**
+   * Instance of target
+   */
+  target: T;
+  /**
+   * API global object
+   */
+  ymaps: typeof ymaps;
+}
diff --git a/projects/angular8-yandex-maps/src/lib/utils/event-manager.ts b/projects/angular8-yandex-maps/src/lib/utils/event-manager.ts
@@ -6,24 +6,7 @@
 import { NgZone } from '@angular/core';
 import { BehaviorSubject, Observable, Subscriber } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-
-export interface YaEvent<T = any> {
-  /**
-   * Instance of target
-   */
-  target: T;
-  /**
-   * API global object
-   */
-  ymaps: typeof ymaps;
-  /**
-   * Provides methods for accessing the originalObject object's fields and methods, with the possibility for redefining them.
-   * {@link https://yandex.com/dev/maps/jsapi/doc/2.1/ref/reference/Event.html/}
-   */
-  event: ymaps.Event<any, T>;
-}
-
-export type YaReadyEvent<T = any> = Omit<YaEvent<T>, 'event'>;
+import { YaEvent } from '../typings/ya-event';
 
 /**
  * @internal

diff --git a/projects/angular8-yandex-maps/src/public-api.ts b/projects/angular8-yandex-maps/src/public-api.ts
@@ -11,6 +11,10 @@ export * from './lib/angular-yandex-maps.module';
 export * from './lib/services/ya-api-loader/ya-api-loader.service';
 export * from './lib/services/ya-geocoder/ya-geocoder.service';
 
+// Interfaces
+export * from './lib/typings/ya-event';
+export * from './lib/typings/ya-ready-event';
+
 // Components
 export * from './lib/components/ya-clusterer/ya-clusterer.component';
 export * from './lib/components/ya-control/ya-control.directive';