diff --git a/projects/ngx-metadata/general-metadata/index.ts b/projects/ngx-metadata/general-metadata/index.ts new file mode 100644 index 00000000..3d5a0170 --- /dev/null +++ b/projects/ngx-metadata/general-metadata/index.ts @@ -0,0 +1 @@ +export * from './public-api' diff --git a/projects/ngx-metadata/general-metadata/ng-package.json b/projects/ngx-metadata/general-metadata/ng-package.json new file mode 100644 index 00000000..ed278942 --- /dev/null +++ b/projects/ngx-metadata/general-metadata/ng-package.json @@ -0,0 +1,6 @@ +{ + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/projects/ngx-metadata/general-metadata/public-api.ts b/projects/ngx-metadata/general-metadata/public-api.ts new file mode 100644 index 00000000..be30809a --- /dev/null +++ b/projects/ngx-metadata/general-metadata/public-api.ts @@ -0,0 +1,7 @@ +export { GeneralMetadataModule as NgxMetadataGeneralModule } from './src/general-metadata.module' +export * from './src/routing/default-general-metadata-route-data' +export { GeneralMetadataRouteDataService as _GeneralMetadataRouteDataService } from './src/routing/general-metadata-route-data.service' +export * from './src/general-metadata.service' +export { GeneralMetadataAppliersService as _GeneralMetadataAppliersService } from './src/general-metadata-appliers.service' +export * from './src/general-metadata' +export * from './src/general-metadata-image' diff --git a/projects/ngx-metadata/src/lib/general-metadata/general-metadata-applier.service.spec.ts b/projects/ngx-metadata/general-metadata/src/general-metadata-applier.service.spec.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/general-metadata-applier.service.spec.ts rename to projects/ngx-metadata/general-metadata/src/general-metadata-applier.service.spec.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/general-metadata-applier.service.ts b/projects/ngx-metadata/general-metadata/src/general-metadata-applier.service.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/general-metadata-applier.service.ts rename to projects/ngx-metadata/general-metadata/src/general-metadata-applier.service.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/general-metadata-appliers.service.spec.ts b/projects/ngx-metadata/general-metadata/src/general-metadata-appliers.service.spec.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/general-metadata-appliers.service.spec.ts rename to projects/ngx-metadata/general-metadata/src/general-metadata-appliers.service.spec.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/general-metadata-appliers.service.ts b/projects/ngx-metadata/general-metadata/src/general-metadata-appliers.service.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/general-metadata-appliers.service.ts rename to projects/ngx-metadata/general-metadata/src/general-metadata-appliers.service.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/general-metadata-defaults-token.ts b/projects/ngx-metadata/general-metadata/src/general-metadata-defaults-token.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/general-metadata-defaults-token.ts rename to projects/ngx-metadata/general-metadata/src/general-metadata-defaults-token.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/general-metadata-defaults.ts b/projects/ngx-metadata/general-metadata/src/general-metadata-defaults.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/general-metadata-defaults.ts rename to projects/ngx-metadata/general-metadata/src/general-metadata-defaults.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/general-metadata-image.ts b/projects/ngx-metadata/general-metadata/src/general-metadata-image.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/general-metadata-image.ts rename to projects/ngx-metadata/general-metadata/src/general-metadata-image.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/general-metadata.module.ts b/projects/ngx-metadata/general-metadata/src/general-metadata.module.ts similarity index 94% rename from projects/ngx-metadata/src/lib/general-metadata/general-metadata.module.ts rename to projects/ngx-metadata/general-metadata/src/general-metadata.module.ts index 8266c970..e68e168f 100644 --- a/projects/ngx-metadata/src/lib/general-metadata/general-metadata.module.ts +++ b/projects/ngx-metadata/general-metadata/src/general-metadata.module.ts @@ -2,7 +2,7 @@ import { Inject, ModuleWithProviders, NgModule, Optional } from '@angular/core' import { GeneralMetadataService } from './general-metadata.service' import { HtmlLangAttributeService } from './html-lang-attribute/html-lang-attribute.service' import { DefaultGeneralMetadataRouteStrategy } from './routing/default-general-metadata-route-strategy' -import { MetadataRouteStrategy } from '../routing/metadata-route-strategy' +import { _MetadataRouteStrategy } from 'ngx-metadata/routing' import { GeneralMetadataAppliersService } from './general-metadata-appliers.service' import { GeneralMetadataApplierService } from './general-metadata-applier.service' import { GeneralMetadataRouteDataService } from './routing/general-metadata-route-data.service' @@ -48,7 +48,7 @@ export class GeneralMetadataModule { useClass: DefaultGeneralMetadataRouteStrategy, }, { - provide: MetadataRouteStrategy, + provide: _MetadataRouteStrategy, useExisting: GeneralMetadataRouteStrategy, multi: true, }, diff --git a/projects/ngx-metadata/src/lib/general-metadata/general-metadata.service.spec.ts b/projects/ngx-metadata/general-metadata/src/general-metadata.service.spec.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/general-metadata.service.spec.ts rename to projects/ngx-metadata/general-metadata/src/general-metadata.service.spec.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/general-metadata.service.ts b/projects/ngx-metadata/general-metadata/src/general-metadata.service.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/general-metadata.service.ts rename to projects/ngx-metadata/general-metadata/src/general-metadata.service.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/general-metadata.ts b/projects/ngx-metadata/general-metadata/src/general-metadata.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/general-metadata.ts rename to projects/ngx-metadata/general-metadata/src/general-metadata.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/html-lang-attribute/__tests__/html-lang-attribute-harness.ts b/projects/ngx-metadata/general-metadata/src/html-lang-attribute/__tests__/html-lang-attribute-harness.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/html-lang-attribute/__tests__/html-lang-attribute-harness.ts rename to projects/ngx-metadata/general-metadata/src/html-lang-attribute/__tests__/html-lang-attribute-harness.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/html-lang-attribute/html-lang-attribute.service.spec.ts b/projects/ngx-metadata/general-metadata/src/html-lang-attribute/html-lang-attribute.service.spec.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/html-lang-attribute/html-lang-attribute.service.spec.ts rename to projects/ngx-metadata/general-metadata/src/html-lang-attribute/html-lang-attribute.service.spec.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/html-lang-attribute/html-lang-attribute.service.ts b/projects/ngx-metadata/general-metadata/src/html-lang-attribute/html-lang-attribute.service.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/html-lang-attribute/html-lang-attribute.service.ts rename to projects/ngx-metadata/general-metadata/src/html-lang-attribute/html-lang-attribute.service.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/link-rel-canonical/__tests__/link-rel-canonical-harness.ts b/projects/ngx-metadata/general-metadata/src/link-rel-canonical/__tests__/link-rel-canonical-harness.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/link-rel-canonical/__tests__/link-rel-canonical-harness.ts rename to projects/ngx-metadata/general-metadata/src/link-rel-canonical/__tests__/link-rel-canonical-harness.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/link-rel-canonical/link-rel-canonical.service.spec.ts b/projects/ngx-metadata/general-metadata/src/link-rel-canonical/link-rel-canonical.service.spec.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/link-rel-canonical/link-rel-canonical.service.spec.ts rename to projects/ngx-metadata/general-metadata/src/link-rel-canonical/link-rel-canonical.service.spec.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/link-rel-canonical/link-rel-canonical.service.ts b/projects/ngx-metadata/general-metadata/src/link-rel-canonical/link-rel-canonical.service.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/link-rel-canonical/link-rel-canonical.service.ts rename to projects/ngx-metadata/general-metadata/src/link-rel-canonical/link-rel-canonical.service.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/routing/default-general-metadata-route-data.ts b/projects/ngx-metadata/general-metadata/src/routing/default-general-metadata-route-data.ts similarity index 66% rename from projects/ngx-metadata/src/lib/general-metadata/routing/default-general-metadata-route-data.ts rename to projects/ngx-metadata/general-metadata/src/routing/default-general-metadata-route-data.ts index 9497b6d9..2d0c5260 100644 --- a/projects/ngx-metadata/src/lib/general-metadata/routing/default-general-metadata-route-data.ts +++ b/projects/ngx-metadata/general-metadata/src/routing/default-general-metadata-route-data.ts @@ -1,9 +1,9 @@ -import { MAIN_KEY } from '../../routing/current-route-data-key-path-metadata-strategy' +import { _MAIN_KEY } from 'ngx-metadata/routing' import { KEY } from './default-general-metadata-route-strategy' import { GeneralMetadata } from '../general-metadata' export interface DefaultGeneralMetadataRouteData { - [MAIN_KEY]: { + [_MAIN_KEY]: { [KEY]: GeneralMetadata } } diff --git a/projects/ngx-metadata/src/lib/general-metadata/routing/default-general-metadata-route-strategy.ts b/projects/ngx-metadata/general-metadata/src/routing/default-general-metadata-route-strategy.ts similarity index 79% rename from projects/ngx-metadata/src/lib/general-metadata/routing/default-general-metadata-route-strategy.ts rename to projects/ngx-metadata/general-metadata/src/routing/default-general-metadata-route-strategy.ts index db35d817..18d3a5b0 100644 --- a/projects/ngx-metadata/src/lib/general-metadata/routing/default-general-metadata-route-strategy.ts +++ b/projects/ngx-metadata/general-metadata/src/routing/default-general-metadata-route-strategy.ts @@ -3,7 +3,7 @@ import { GeneralMetadata } from '../general-metadata' import { GeneralMetadataService } from '../general-metadata.service' import { GeneralMetadataRouteStrategy } from './general-metadata-route-strategy' import { ActivatedRouteSnapshot } from '@angular/router' -import { CurrentRouteDataKeyPathMetadataStrategy } from '../../routing/current-route-data-key-path-metadata-strategy' +import { _CurrentRouteDataKeyPathMetadataStrategy } from 'ngx-metadata/routing' export const KEY = 'general' @@ -12,7 +12,7 @@ export class DefaultGeneralMetadataRouteStrategy implements GeneralMetadataRouteStrategy { constructor( - private readonly currentRouteDataKeyPathMetadataStrategy: CurrentRouteDataKeyPathMetadataStrategy, + private readonly currentRouteDataKeyPathMetadataStrategy: _CurrentRouteDataKeyPathMetadataStrategy, private readonly generalMetadataService: GeneralMetadataService, ) {} diff --git a/projects/ngx-metadata/src/lib/general-metadata/routing/general-metadata-route-data.service.spec.ts b/projects/ngx-metadata/general-metadata/src/routing/general-metadata-route-data.service.spec.ts similarity index 94% rename from projects/ngx-metadata/src/lib/general-metadata/routing/general-metadata-route-data.service.spec.ts rename to projects/ngx-metadata/general-metadata/src/routing/general-metadata-route-data.service.spec.ts index e242df27..6e7c99f4 100644 --- a/projects/ngx-metadata/src/lib/general-metadata/routing/general-metadata-route-data.service.spec.ts +++ b/projects/ngx-metadata/general-metadata/src/routing/general-metadata-route-data.service.spec.ts @@ -5,7 +5,7 @@ import { MockProvider } from 'ng-mocks' import { GeneralMetadata } from '../general-metadata' import { GENERAL_METADATA_DEFAULTS_TOKEN } from '../general-metadata-defaults-token' import { Provider } from '@angular/core' -import { MetadataRouteStrategy } from '../../routing/metadata-route-strategy' +import { _MetadataRouteStrategy } from 'ngx-metadata/routing' import { ActivatedRouteSnapshot } from '@angular/router' import { DefaultGeneralMetadataRouteStrategy } from './default-general-metadata-route-strategy' import { GeneralMetadataRouteStrategy } from './general-metadata-route-strategy' @@ -27,7 +27,7 @@ describe('GeneralMetadataRouteDataService', () => { sut = makeSut() generalMetadataRouteStrategy = TestBed.inject( GeneralMetadataRouteStrategy, - ) as jasmine.SpyObj> + ) as jasmine.SpyObj<_MetadataRouteStrategy> }) describe('when no data has been resolved for route', () => { @@ -63,7 +63,7 @@ describe('GeneralMetadataRouteDataService', () => { sut = makeSut({ defaults }) generalMetadataRouteStrategy = TestBed.inject( GeneralMetadataRouteStrategy, - ) as jasmine.SpyObj> + ) as jasmine.SpyObj<_MetadataRouteStrategy> defaultsService = TestBed.inject( _DefaultsService, ) as jasmine.SpyObj<_DefaultsService> diff --git a/projects/ngx-metadata/src/lib/general-metadata/routing/general-metadata-route-data.service.ts b/projects/ngx-metadata/general-metadata/src/routing/general-metadata-route-data.service.ts similarity index 87% rename from projects/ngx-metadata/src/lib/general-metadata/routing/general-metadata-route-data.service.ts rename to projects/ngx-metadata/general-metadata/src/routing/general-metadata-route-data.service.ts index 7f2418ab..49052ee5 100644 --- a/projects/ngx-metadata/src/lib/general-metadata/routing/general-metadata-route-data.service.ts +++ b/projects/ngx-metadata/general-metadata/src/routing/general-metadata-route-data.service.ts @@ -1,5 +1,5 @@ import { Inject, Injectable, Optional } from '@angular/core' -import { MetadataRouteStrategy } from '../../routing/metadata-route-strategy' +import { _MetadataRouteStrategy } from 'ngx-metadata/routing' import { GeneralMetadata } from '../general-metadata' import { ActivatedRouteSnapshot } from '@angular/router' import { GENERAL_METADATA_DEFAULTS_TOKEN } from '../general-metadata-defaults-token' @@ -8,7 +8,7 @@ import { _DefaultsService } from 'ngx-metadata/common' @Injectable() export class GeneralMetadataRouteDataService - implements Pick, 'resolve'> + implements Pick<_MetadataRouteStrategy, 'resolve'> { constructor( private readonly generalMetadataRouteStrategy: GeneralMetadataRouteStrategy, diff --git a/projects/ngx-metadata/general-metadata/src/routing/general-metadata-route-strategy.ts b/projects/ngx-metadata/general-metadata/src/routing/general-metadata-route-strategy.ts new file mode 100644 index 00000000..407427d0 --- /dev/null +++ b/projects/ngx-metadata/general-metadata/src/routing/general-metadata-route-strategy.ts @@ -0,0 +1,4 @@ +import { _MetadataRouteStrategy } from 'ngx-metadata/routing' +import { GeneralMetadata } from '../general-metadata' + +export abstract class GeneralMetadataRouteStrategy extends _MetadataRouteStrategy {} diff --git a/projects/ngx-metadata/src/lib/general-metadata/standard-meta-property.ts b/projects/ngx-metadata/general-metadata/src/standard-meta-property.ts similarity index 100% rename from projects/ngx-metadata/src/lib/general-metadata/standard-meta-property.ts rename to projects/ngx-metadata/general-metadata/src/standard-meta-property.ts diff --git a/projects/ngx-metadata/public-api.ts b/projects/ngx-metadata/public-api.ts index cff33de6..216acf73 100644 --- a/projects/ngx-metadata/public-api.ts +++ b/projects/ngx-metadata/public-api.ts @@ -2,8 +2,6 @@ * Public API Surface of ngx-metadata */ -export * from './src/lib/general-metadata' export * from './src/lib/open-graph' export * from './src/lib/open-graph-profile' -export * from './src/lib/routing' export * from './src/lib/twitter-card' diff --git a/projects/ngx-metadata/routing/index.ts b/projects/ngx-metadata/routing/index.ts new file mode 100644 index 00000000..3d5a0170 --- /dev/null +++ b/projects/ngx-metadata/routing/index.ts @@ -0,0 +1 @@ +export * from './public-api' diff --git a/projects/ngx-metadata/routing/ng-package.json b/projects/ngx-metadata/routing/ng-package.json new file mode 100644 index 00000000..ed278942 --- /dev/null +++ b/projects/ngx-metadata/routing/ng-package.json @@ -0,0 +1,6 @@ +{ + "$schema": "../../../node_modules/ng-packagr/ng-package.schema.json", + "lib": { + "entryFile": "public-api.ts" + } +} diff --git a/projects/ngx-metadata/routing/public-api.ts b/projects/ngx-metadata/routing/public-api.ts new file mode 100644 index 00000000..42cfabbd --- /dev/null +++ b/projects/ngx-metadata/routing/public-api.ts @@ -0,0 +1,7 @@ +export { RoutingModule as NgxMetadataRoutingModule } from './src/routing.module' +export { MetadataRouteStrategy as _MetadataRouteStrategy } from './src/metadata-route-strategy' +export { CurrentRouteDataKeyPathMetadataStrategy as _CurrentRouteDataKeyPathMetadataStrategy } from './src/current-route-data-key-path-metadata-strategy' +export { + MAIN_KEY as _MAIN_KEY, + KEY_PATH_SEPARATOR as _KEY_PATH_SEPARATOR, +} from './src/current-route-data-key-path-metadata-strategy' diff --git a/projects/ngx-metadata/src/lib/routing/current-route-data-key-path-metadata-strategy.spec.ts b/projects/ngx-metadata/routing/src/current-route-data-key-path-metadata-strategy.spec.ts similarity index 100% rename from projects/ngx-metadata/src/lib/routing/current-route-data-key-path-metadata-strategy.spec.ts rename to projects/ngx-metadata/routing/src/current-route-data-key-path-metadata-strategy.spec.ts diff --git a/projects/ngx-metadata/src/lib/routing/current-route-data-key-path-metadata-strategy.ts b/projects/ngx-metadata/routing/src/current-route-data-key-path-metadata-strategy.ts similarity index 100% rename from projects/ngx-metadata/src/lib/routing/current-route-data-key-path-metadata-strategy.ts rename to projects/ngx-metadata/routing/src/current-route-data-key-path-metadata-strategy.ts diff --git a/projects/ngx-metadata/src/lib/routing/get-current-snapshot-from-root-snapshot.spec.ts b/projects/ngx-metadata/routing/src/get-current-snapshot-from-root-snapshot.spec.ts similarity index 100% rename from projects/ngx-metadata/src/lib/routing/get-current-snapshot-from-root-snapshot.spec.ts rename to projects/ngx-metadata/routing/src/get-current-snapshot-from-root-snapshot.spec.ts diff --git a/projects/ngx-metadata/src/lib/routing/get-current-snapshot-from-root-snapshot.ts b/projects/ngx-metadata/routing/src/get-current-snapshot-from-root-snapshot.ts similarity index 100% rename from projects/ngx-metadata/src/lib/routing/get-current-snapshot-from-root-snapshot.ts rename to projects/ngx-metadata/routing/src/get-current-snapshot-from-root-snapshot.ts diff --git a/projects/ngx-metadata/src/lib/routing/metadata-route-strategy.ts b/projects/ngx-metadata/routing/src/metadata-route-strategy.ts similarity index 100% rename from projects/ngx-metadata/src/lib/routing/metadata-route-strategy.ts rename to projects/ngx-metadata/routing/src/metadata-route-strategy.ts diff --git a/projects/ngx-metadata/src/lib/routing/router-listener.service.spec.ts b/projects/ngx-metadata/routing/src/router-listener.service.spec.ts similarity index 100% rename from projects/ngx-metadata/src/lib/routing/router-listener.service.spec.ts rename to projects/ngx-metadata/routing/src/router-listener.service.spec.ts diff --git a/projects/ngx-metadata/src/lib/routing/router-listener.service.ts b/projects/ngx-metadata/routing/src/router-listener.service.ts similarity index 100% rename from projects/ngx-metadata/src/lib/routing/router-listener.service.ts rename to projects/ngx-metadata/routing/src/router-listener.service.ts diff --git a/projects/ngx-metadata/src/lib/routing/routing.module.ts b/projects/ngx-metadata/routing/src/routing.module.ts similarity index 100% rename from projects/ngx-metadata/src/lib/routing/routing.module.ts rename to projects/ngx-metadata/routing/src/routing.module.ts diff --git a/projects/ngx-metadata/src/lib/general-metadata/index.ts b/projects/ngx-metadata/src/lib/general-metadata/index.ts deleted file mode 100644 index e5d97746..00000000 --- a/projects/ngx-metadata/src/lib/general-metadata/index.ts +++ /dev/null @@ -1,5 +0,0 @@ -export { GeneralMetadataModule } from './general-metadata.module' -export { GeneralMetadataService } from './general-metadata.service' -export { DefaultGeneralMetadataRouteData } from './routing/default-general-metadata-route-data' -export { GeneralMetadata } from './general-metadata' -export { GeneralMetadataImage } from './general-metadata-image' diff --git a/projects/ngx-metadata/src/lib/general-metadata/routing/general-metadata-route-strategy.ts b/projects/ngx-metadata/src/lib/general-metadata/routing/general-metadata-route-strategy.ts deleted file mode 100644 index 832f50dc..00000000 --- a/projects/ngx-metadata/src/lib/general-metadata/routing/general-metadata-route-strategy.ts +++ /dev/null @@ -1,4 +0,0 @@ -import { MetadataRouteStrategy } from '../../routing/metadata-route-strategy' -import { GeneralMetadata } from '../general-metadata' - -export abstract class GeneralMetadataRouteStrategy extends MetadataRouteStrategy {} diff --git a/projects/ngx-metadata/src/lib/open-graph-profile/open-graph-profile.module.ts b/projects/ngx-metadata/src/lib/open-graph-profile/open-graph-profile.module.ts index 389cc63b..06bbf309 100644 --- a/projects/ngx-metadata/src/lib/open-graph-profile/open-graph-profile.module.ts +++ b/projects/ngx-metadata/src/lib/open-graph-profile/open-graph-profile.module.ts @@ -6,7 +6,7 @@ import { Optional, } from '@angular/core' import { OpenGraphProfileApplierService } from './open-graph-profile-applier.service' -import { MetadataRouteStrategy } from '../routing/metadata-route-strategy' +import { _MetadataRouteStrategy } from 'ngx-metadata/routing' import { OpenGraphProfileRouteStrategy } from './routing/open-graph-profile-route-strategy' import { OpenGraphProfile } from './open-graph-profile' import { OPEN_GRAPH_PROFILE_DEFAULTS_TOKEN } from './open-graph-profile-defaults-token' @@ -49,7 +49,7 @@ export class OpenGraphProfileModule { useClass: DefaultOpenGraphProfileRouteStrategy, }, { - provide: MetadataRouteStrategy, + provide: _MetadataRouteStrategy, useExisting: OpenGraphProfileRouteStrategy, multi: true, }, diff --git a/projects/ngx-metadata/src/lib/open-graph-profile/routing/default-open-graph-profile-route-data.ts b/projects/ngx-metadata/src/lib/open-graph-profile/routing/default-open-graph-profile-route-data.ts index c857b35c..4c2ce8ec 100644 --- a/projects/ngx-metadata/src/lib/open-graph-profile/routing/default-open-graph-profile-route-data.ts +++ b/projects/ngx-metadata/src/lib/open-graph-profile/routing/default-open-graph-profile-route-data.ts @@ -1,10 +1,10 @@ import { OpenGraphProfile } from '../open-graph-profile' -import { MAIN_KEY } from '../../routing/current-route-data-key-path-metadata-strategy' +import { _MAIN_KEY } from 'ngx-metadata/routing' import { KEY as OPEN_GRAPH_KEY } from '../../open-graph/routing/default-open-graph-route-strategy' import { KEY } from './default-open-graph-profile-route-strategy' export interface DefaultOpenGraphProfileRouteData { - [MAIN_KEY]: { + [_MAIN_KEY]: { [OPEN_GRAPH_KEY]: { [KEY]: OpenGraphProfile } diff --git a/projects/ngx-metadata/src/lib/open-graph-profile/routing/default-open-graph-profile-route-strategy.ts b/projects/ngx-metadata/src/lib/open-graph-profile/routing/default-open-graph-profile-route-strategy.ts index 6be2cffa..41a27824 100644 --- a/projects/ngx-metadata/src/lib/open-graph-profile/routing/default-open-graph-profile-route-strategy.ts +++ b/projects/ngx-metadata/src/lib/open-graph-profile/routing/default-open-graph-profile-route-strategy.ts @@ -2,22 +2,22 @@ import { Injectable } from '@angular/core' import { OpenGraphProfile } from '../open-graph-profile' import { ActivatedRouteSnapshot } from '@angular/router' import { OpenGraphProfileRouteStrategy } from './open-graph-profile-route-strategy' -import { - CurrentRouteDataKeyPathMetadataStrategy, - KEY_PATH_SEPARATOR, -} from '../../routing/current-route-data-key-path-metadata-strategy' import { OpenGraphProfileService } from '../open-graph-profile.service' import { KEY as OPEN_GRAPH_KEY } from '../../open-graph/routing/default-open-graph-route-strategy' +import { + _CurrentRouteDataKeyPathMetadataStrategy, + _KEY_PATH_SEPARATOR, +} from 'ngx-metadata/routing' export const KEY = 'profile' -export const KEY_PATH = `${OPEN_GRAPH_KEY}${KEY_PATH_SEPARATOR}${KEY}` +export const KEY_PATH = `${OPEN_GRAPH_KEY}${_KEY_PATH_SEPARATOR}${KEY}` @Injectable() export class DefaultOpenGraphProfileRouteStrategy implements OpenGraphProfileRouteStrategy { constructor( - private readonly currentRouteDataKeyPathMetadataStrategy: CurrentRouteDataKeyPathMetadataStrategy, + private readonly currentRouteDataKeyPathMetadataStrategy: _CurrentRouteDataKeyPathMetadataStrategy, private readonly openGraphProfileService: OpenGraphProfileService, ) {} diff --git a/projects/ngx-metadata/src/lib/open-graph-profile/routing/open-graph-profile-route-strategy.ts b/projects/ngx-metadata/src/lib/open-graph-profile/routing/open-graph-profile-route-strategy.ts index 72cd5317..ba76a9be 100644 --- a/projects/ngx-metadata/src/lib/open-graph-profile/routing/open-graph-profile-route-strategy.ts +++ b/projects/ngx-metadata/src/lib/open-graph-profile/routing/open-graph-profile-route-strategy.ts @@ -1,4 +1,4 @@ -import { MetadataRouteStrategy } from '../../routing/metadata-route-strategy' +import { _MetadataRouteStrategy } from 'ngx-metadata/routing' import { OpenGraphProfile } from '../open-graph-profile' -export abstract class OpenGraphProfileRouteStrategy extends MetadataRouteStrategy {} +export abstract class OpenGraphProfileRouteStrategy extends _MetadataRouteStrategy {} diff --git a/projects/ngx-metadata/src/lib/open-graph/open-graph-general-metadata-listener.service.spec.ts b/projects/ngx-metadata/src/lib/open-graph/open-graph-general-metadata-listener.service.spec.ts index 3a8e5baf..0d1f0e68 100644 --- a/projects/ngx-metadata/src/lib/open-graph/open-graph-general-metadata-listener.service.spec.ts +++ b/projects/ngx-metadata/src/lib/open-graph/open-graph-general-metadata-listener.service.spec.ts @@ -2,9 +2,12 @@ import { TestBed } from '@angular/core/testing' import { OpenGraphGeneralMetadataListenerService } from './open-graph-general-metadata-listener.service' import { EventEmitter, Provider } from '@angular/core' -import { GeneralMetadata, GeneralMetadataImage } from '../general-metadata' +import { + _GeneralMetadataAppliersService, + GeneralMetadata, + GeneralMetadataImage, +} from 'ngx-metadata/general-metadata' import { MockProvider } from 'ng-mocks' -import { GeneralMetadataAppliersService } from '../general-metadata/general-metadata-appliers.service' import { OpenGraphAppliersService } from './open-graph-appliers.service' import { enableAutoSpy } from 'ngx-metadata/__tests__/enable-auto-spy' @@ -150,7 +153,7 @@ function makeSut( if (!opts.generalMetadataUnavailable) { providers.push( - MockProvider(GeneralMetadataAppliersService, { + MockProvider(_GeneralMetadataAppliersService, { changes$: opts.changes$ ?? new EventEmitter(), }), ) diff --git a/projects/ngx-metadata/src/lib/open-graph/open-graph-general-metadata-listener.service.ts b/projects/ngx-metadata/src/lib/open-graph/open-graph-general-metadata-listener.service.ts index faa1dc7a..75bbf1a3 100644 --- a/projects/ngx-metadata/src/lib/open-graph/open-graph-general-metadata-listener.service.ts +++ b/projects/ngx-metadata/src/lib/open-graph/open-graph-general-metadata-listener.service.ts @@ -1,7 +1,9 @@ import { Injectable, OnDestroy, Optional } from '@angular/core' import { Subscription } from 'rxjs' -import { GeneralMetadataAppliersService } from '../general-metadata/general-metadata-appliers.service' -import { GeneralMetadata } from '../general-metadata' +import { + _GeneralMetadataAppliersService, + GeneralMetadata, +} from 'ngx-metadata/general-metadata' import { OpenGraphAppliersService } from './open-graph-appliers.service' @Injectable() @@ -10,7 +12,7 @@ export class OpenGraphGeneralMetadataListenerService implements OnDestroy { constructor( @Optional() - private readonly generalMetadataAppliersService: GeneralMetadataAppliersService | null, + private readonly generalMetadataAppliersService: _GeneralMetadataAppliersService | null, private readonly appliers: OpenGraphAppliersService, ) {} diff --git a/projects/ngx-metadata/src/lib/open-graph/open-graph.module.ts b/projects/ngx-metadata/src/lib/open-graph/open-graph.module.ts index b8d5a483..4bb5d90f 100644 --- a/projects/ngx-metadata/src/lib/open-graph/open-graph.module.ts +++ b/projects/ngx-metadata/src/lib/open-graph/open-graph.module.ts @@ -2,7 +2,7 @@ import { Inject, ModuleWithProviders, NgModule, Optional } from '@angular/core' import { OpenGraphService } from './open-graph.service' import { OpenGraphApplierService } from './open-graph-applier.service' import { OpenGraphAppliersService } from './open-graph-appliers.service' -import { MetadataRouteStrategy } from '../routing/metadata-route-strategy' +import { _MetadataRouteStrategy } from 'ngx-metadata/routing' import { DefaultOpenGraphRouteStrategy } from './routing/default-open-graph-route-strategy' import { OpenGraphGeneralMetadataListenerService } from './open-graph-general-metadata-listener.service' import { OpenGraphRouteStrategy } from './routing/open-graph-route-strategy' @@ -48,7 +48,7 @@ export class OpenGraphModule { useClass: DefaultOpenGraphRouteStrategy, }, { - provide: MetadataRouteStrategy, + provide: _MetadataRouteStrategy, useExisting: OpenGraphRouteStrategy, multi: true, }, diff --git a/projects/ngx-metadata/src/lib/open-graph/routing/default-open-graph-route-data.ts b/projects/ngx-metadata/src/lib/open-graph/routing/default-open-graph-route-data.ts index c2017dee..b0bb65ae 100644 --- a/projects/ngx-metadata/src/lib/open-graph/routing/default-open-graph-route-data.ts +++ b/projects/ngx-metadata/src/lib/open-graph/routing/default-open-graph-route-data.ts @@ -1,9 +1,9 @@ import { OpenGraph } from '../open-graph' -import { MAIN_KEY } from '../../routing/current-route-data-key-path-metadata-strategy' +import { _MAIN_KEY } from 'ngx-metadata/routing' import { KEY } from './default-open-graph-route-strategy' export interface DefaultOpenGraphRouteData { - [MAIN_KEY]: { + [_MAIN_KEY]: { [KEY]: OpenGraph } } diff --git a/projects/ngx-metadata/src/lib/open-graph/routing/default-open-graph-route-strategy.spec.ts b/projects/ngx-metadata/src/lib/open-graph/routing/default-open-graph-route-strategy.spec.ts index 19ce7f0b..737b52ca 100644 --- a/projects/ngx-metadata/src/lib/open-graph/routing/default-open-graph-route-strategy.spec.ts +++ b/projects/ngx-metadata/src/lib/open-graph/routing/default-open-graph-route-strategy.spec.ts @@ -4,11 +4,13 @@ import { MockProvider, MockService } from 'ng-mocks' import { OpenGraph } from '../open-graph' import { OpenGraphType } from '../open-graph-type' import { ActivatedRouteSnapshot } from '@angular/router' -import { GeneralMetadataRouteDataService } from '../../general-metadata/routing/general-metadata-route-data.service' +import { + _GeneralMetadataRouteDataService, + GeneralMetadata, +} from 'ngx-metadata/general-metadata' import { Provider } from '@angular/core' -import { GeneralMetadata } from '../../general-metadata' import { _DefaultsService } from 'ngx-metadata/common' -import { CurrentRouteDataKeyPathMetadataStrategy } from '../../routing/current-route-data-key-path-metadata-strategy' +import { _CurrentRouteDataKeyPathMetadataStrategy } from 'ngx-metadata/routing' import { OpenGraphService } from '../open-graph.service' import { enableAutoSpy } from 'ngx-metadata/__tests__/enable-auto-spy' @@ -28,8 +30,8 @@ describe('DefaultOpenGraphRouteStrategy', () => { it('should resolve route data using proper key path', () => { const sut = makeSut() const currentRouteDataKeyPathMetadataStrategy = TestBed.inject( - CurrentRouteDataKeyPathMetadataStrategy, - ) as jasmine.SpyObj + _CurrentRouteDataKeyPathMetadataStrategy, + ) as jasmine.SpyObj<_CurrentRouteDataKeyPathMetadataStrategy> currentRouteDataKeyPathMetadataStrategy.resolve.and.returnValue( dummyMetadata, ) @@ -45,8 +47,8 @@ describe('DefaultOpenGraphRouteStrategy', () => { it('should return metadata from route using simple strategy', () => { const sut = makeSut() const currentRouteDataKeyPathMetadataStrategy = TestBed.inject( - CurrentRouteDataKeyPathMetadataStrategy, - ) as jasmine.SpyObj + _CurrentRouteDataKeyPathMetadataStrategy, + ) as jasmine.SpyObj<_CurrentRouteDataKeyPathMetadataStrategy> currentRouteDataKeyPathMetadataStrategy.resolve.and.returnValue( dummyMetadata, ) @@ -77,19 +79,19 @@ describe('DefaultOpenGraphRouteStrategy', () => { applicationName: 'general metadata application name', } let sut: DefaultOpenGraphRouteStrategy - let currentRouteDataKeyPathMetadataStrategy: jasmine.SpyObj + let currentRouteDataKeyPathMetadataStrategy: jasmine.SpyObj<_CurrentRouteDataKeyPathMetadataStrategy> beforeEach(() => { sut = makeSut({ generalMetadata: true }) const generalMetadataRouteDataService = TestBed.inject( - GeneralMetadataRouteDataService, - ) as jasmine.SpyObj + _GeneralMetadataRouteDataService, + ) as jasmine.SpyObj<_GeneralMetadataRouteDataService> generalMetadataRouteDataService.resolve.and.returnValue( compatibleGeneralMetadata, ) currentRouteDataKeyPathMetadataStrategy = TestBed.inject( - CurrentRouteDataKeyPathMetadataStrategy, - ) as jasmine.SpyObj + _CurrentRouteDataKeyPathMetadataStrategy, + ) as jasmine.SpyObj<_CurrentRouteDataKeyPathMetadataStrategy> }) describe('when no open graph data can be resolved', () => { @@ -171,13 +173,13 @@ describe('DefaultOpenGraphRouteStrategy', () => { function makeSut(opts: { generalMetadata?: boolean } = {}) { const providers: Provider[] = [ DefaultOpenGraphRouteStrategy, - MockProvider(CurrentRouteDataKeyPathMetadataStrategy), + MockProvider(_CurrentRouteDataKeyPathMetadataStrategy), _DefaultsService, MockProvider(OpenGraphService), ] if (opts.generalMetadata) { - providers.push(MockProvider(GeneralMetadataRouteDataService)) + providers.push(MockProvider(_GeneralMetadataRouteDataService)) } TestBed.configureTestingModule({ diff --git a/projects/ngx-metadata/src/lib/open-graph/routing/default-open-graph-route-strategy.ts b/projects/ngx-metadata/src/lib/open-graph/routing/default-open-graph-route-strategy.ts index 543dc95f..c306af7f 100644 --- a/projects/ngx-metadata/src/lib/open-graph/routing/default-open-graph-route-strategy.ts +++ b/projects/ngx-metadata/src/lib/open-graph/routing/default-open-graph-route-strategy.ts @@ -1,11 +1,11 @@ import { Injectable, Optional } from '@angular/core' import { OpenGraph } from '../open-graph' import { ActivatedRouteSnapshot } from '@angular/router' -import { GeneralMetadataRouteDataService } from '../../general-metadata/routing/general-metadata-route-data.service' import { _DefaultsService } from 'ngx-metadata/common' import { OpenGraphRouteStrategy } from './open-graph-route-strategy' -import { CurrentRouteDataKeyPathMetadataStrategy } from '../../routing/current-route-data-key-path-metadata-strategy' +import { _CurrentRouteDataKeyPathMetadataStrategy } from 'ngx-metadata/routing' import { OpenGraphService } from '../open-graph.service' +import { _GeneralMetadataRouteDataService } from 'ngx-metadata/general-metadata' export const KEY = 'openGraph' export const KEY_PATH = `${KEY}` @@ -13,9 +13,9 @@ export const KEY_PATH = `${KEY}` @Injectable() export class DefaultOpenGraphRouteStrategy implements OpenGraphRouteStrategy { constructor( - private readonly currentRouteDataKeyPathMetadataStrategy: CurrentRouteDataKeyPathMetadataStrategy, + private readonly currentRouteDataKeyPathMetadataStrategy: _CurrentRouteDataKeyPathMetadataStrategy, @Optional() - private readonly generalMetadataRouteData: GeneralMetadataRouteDataService | null, + private readonly generalMetadataRouteData: _GeneralMetadataRouteDataService | null, private readonly defaultsService: _DefaultsService, private readonly openGraphService: OpenGraphService, ) {} diff --git a/projects/ngx-metadata/src/lib/open-graph/routing/open-graph-route-strategy.ts b/projects/ngx-metadata/src/lib/open-graph/routing/open-graph-route-strategy.ts index d5b0f955..dee53046 100644 --- a/projects/ngx-metadata/src/lib/open-graph/routing/open-graph-route-strategy.ts +++ b/projects/ngx-metadata/src/lib/open-graph/routing/open-graph-route-strategy.ts @@ -1,4 +1,4 @@ -import { MetadataRouteStrategy } from '../../routing/metadata-route-strategy' +import { _MetadataRouteStrategy } from 'ngx-metadata/routing' import { OpenGraph } from '../open-graph' -export abstract class OpenGraphRouteStrategy extends MetadataRouteStrategy {} +export abstract class OpenGraphRouteStrategy extends _MetadataRouteStrategy {} diff --git a/projects/ngx-metadata/src/lib/routing/index.ts b/projects/ngx-metadata/src/lib/routing/index.ts deleted file mode 100644 index bd8987a7..00000000 --- a/projects/ngx-metadata/src/lib/routing/index.ts +++ /dev/null @@ -1 +0,0 @@ -export { RoutingModule as NgxMetadataRoutingModule } from './routing.module' diff --git a/projects/ngx-metadata/src/lib/twitter-card/routing/default-twitter-card-route-data.ts b/projects/ngx-metadata/src/lib/twitter-card/routing/default-twitter-card-route-data.ts index 52ce733e..201abb64 100644 --- a/projects/ngx-metadata/src/lib/twitter-card/routing/default-twitter-card-route-data.ts +++ b/projects/ngx-metadata/src/lib/twitter-card/routing/default-twitter-card-route-data.ts @@ -1,9 +1,9 @@ import { TwitterCard } from '../twitter-card' -import { MAIN_KEY } from '../../routing/current-route-data-key-path-metadata-strategy' +import { _MAIN_KEY } from 'ngx-metadata/routing' import { KEY } from './default-twitter-card-route-strategy' export interface DefaultTwitterCardRouteData { - [MAIN_KEY]: { + [_MAIN_KEY]: { [KEY]: TwitterCard } } diff --git a/projects/ngx-metadata/src/lib/twitter-card/routing/default-twitter-card-route-strategy.spec.ts b/projects/ngx-metadata/src/lib/twitter-card/routing/default-twitter-card-route-strategy.spec.ts index 8bad0968..98a60001 100644 --- a/projects/ngx-metadata/src/lib/twitter-card/routing/default-twitter-card-route-strategy.spec.ts +++ b/projects/ngx-metadata/src/lib/twitter-card/routing/default-twitter-card-route-strategy.spec.ts @@ -2,13 +2,15 @@ import { TestBed } from '@angular/core/testing' import { DefaultTwitterCardRouteStrategy } from './default-twitter-card-route-strategy' import { MockProvider, MockService } from 'ng-mocks' import { ActivatedRouteSnapshot } from '@angular/router' -import { GeneralMetadataRouteDataService } from '../../general-metadata/routing/general-metadata-route-data.service' +import { + _GeneralMetadataRouteDataService, + GeneralMetadata, +} from 'ngx-metadata/general-metadata' import { Provider } from '@angular/core' -import { GeneralMetadata } from '../../general-metadata' import { _DefaultsService } from 'ngx-metadata/common' import { TwitterCard } from '../twitter-card' import { TwitterCardType } from '../twitter-card-type' -import { CurrentRouteDataKeyPathMetadataStrategy } from '../../routing/current-route-data-key-path-metadata-strategy' +import { _CurrentRouteDataKeyPathMetadataStrategy } from 'ngx-metadata/routing' import { TwitterCardService } from '../twitter-card.service' import { enableAutoSpy } from 'ngx-metadata/__tests__/enable-auto-spy' @@ -27,8 +29,8 @@ describe('DefaultTwitterCardRouteStrategy', () => { it('should resolve route data using proper key path', () => { const sut = makeSut() const currentRouteDataKeyPathMetadataStrategy = TestBed.inject( - CurrentRouteDataKeyPathMetadataStrategy, - ) as jasmine.SpyObj + _CurrentRouteDataKeyPathMetadataStrategy, + ) as jasmine.SpyObj<_CurrentRouteDataKeyPathMetadataStrategy> currentRouteDataKeyPathMetadataStrategy.resolve.and.returnValue( dummyMetadata, ) @@ -44,8 +46,8 @@ describe('DefaultTwitterCardRouteStrategy', () => { it('should return metadata from route using simple strategy', () => { const sut = makeSut() const currentRouteDataKeyPathMetadataStrategy = TestBed.inject( - CurrentRouteDataKeyPathMetadataStrategy, - ) as jasmine.SpyObj + _CurrentRouteDataKeyPathMetadataStrategy, + ) as jasmine.SpyObj<_CurrentRouteDataKeyPathMetadataStrategy> currentRouteDataKeyPathMetadataStrategy.resolve.and.returnValue( dummyMetadata, ) @@ -68,19 +70,19 @@ describe('DefaultTwitterCardRouteStrategy', () => { }, } let sut: DefaultTwitterCardRouteStrategy - let currentRouteDataKeyPathMetadataStrategy: jasmine.SpyObj + let currentRouteDataKeyPathMetadataStrategy: jasmine.SpyObj<_CurrentRouteDataKeyPathMetadataStrategy> beforeEach(() => { sut = makeSut({ generalMetadata: true }) const generalMetadataRouteDataService = TestBed.inject( - GeneralMetadataRouteDataService, - ) as jasmine.SpyObj + _GeneralMetadataRouteDataService, + ) as jasmine.SpyObj<_GeneralMetadataRouteDataService> generalMetadataRouteDataService.resolve.and.returnValue( compatibleGeneralMetadata, ) currentRouteDataKeyPathMetadataStrategy = TestBed.inject( - CurrentRouteDataKeyPathMetadataStrategy, - ) as jasmine.SpyObj + _CurrentRouteDataKeyPathMetadataStrategy, + ) as jasmine.SpyObj<_CurrentRouteDataKeyPathMetadataStrategy> }) describe('when no twitter card data can be resolved', () => { @@ -150,13 +152,13 @@ describe('DefaultTwitterCardRouteStrategy', () => { function makeSut(opts: { generalMetadata?: boolean } = {}) { const providers: Provider[] = [ DefaultTwitterCardRouteStrategy, - MockProvider(CurrentRouteDataKeyPathMetadataStrategy), + MockProvider(_CurrentRouteDataKeyPathMetadataStrategy), _DefaultsService, MockProvider(TwitterCardService), ] if (opts.generalMetadata) { - providers.push(MockProvider(GeneralMetadataRouteDataService)) + providers.push(MockProvider(_GeneralMetadataRouteDataService)) } TestBed.configureTestingModule({ diff --git a/projects/ngx-metadata/src/lib/twitter-card/routing/default-twitter-card-route-strategy.ts b/projects/ngx-metadata/src/lib/twitter-card/routing/default-twitter-card-route-strategy.ts index 35d28113..ebd2c933 100644 --- a/projects/ngx-metadata/src/lib/twitter-card/routing/default-twitter-card-route-strategy.ts +++ b/projects/ngx-metadata/src/lib/twitter-card/routing/default-twitter-card-route-strategy.ts @@ -1,11 +1,11 @@ import { Injectable, Optional } from '@angular/core' import { ActivatedRouteSnapshot } from '@angular/router' -import { GeneralMetadataRouteDataService } from '../../general-metadata/routing/general-metadata-route-data.service' +import { _GeneralMetadataRouteDataService } from 'ngx-metadata/general-metadata' import { _DefaultsService } from 'ngx-metadata/common' import { TwitterCardRouteStrategy } from './twitter-card-route-strategy' import { TwitterCard } from '../twitter-card' -import { CurrentRouteDataKeyPathMetadataStrategy } from '../../routing/current-route-data-key-path-metadata-strategy' import { TwitterCardService } from '../twitter-card.service' +import { _CurrentRouteDataKeyPathMetadataStrategy } from 'ngx-metadata/routing' export const KEY = 'twitterCard' @@ -14,9 +14,9 @@ export class DefaultTwitterCardRouteStrategy implements TwitterCardRouteStrategy { constructor( - private readonly currentRouteDataKeyPathMetadataStrategy: CurrentRouteDataKeyPathMetadataStrategy, + private readonly currentRouteDataKeyPathMetadataStrategy: _CurrentRouteDataKeyPathMetadataStrategy, @Optional() - private readonly generalMetadataRouteData: GeneralMetadataRouteDataService | null, + private readonly generalMetadataRouteData: _GeneralMetadataRouteDataService | null, private readonly defaultsService: _DefaultsService, private readonly twitterCardService: TwitterCardService, ) {} diff --git a/projects/ngx-metadata/src/lib/twitter-card/routing/twitter-card-route-strategy.ts b/projects/ngx-metadata/src/lib/twitter-card/routing/twitter-card-route-strategy.ts index 9cd3d6a9..c6ffaec4 100644 --- a/projects/ngx-metadata/src/lib/twitter-card/routing/twitter-card-route-strategy.ts +++ b/projects/ngx-metadata/src/lib/twitter-card/routing/twitter-card-route-strategy.ts @@ -1,4 +1,4 @@ -import { MetadataRouteStrategy } from '../../routing/metadata-route-strategy' +import { _MetadataRouteStrategy } from 'ngx-metadata/routing' import { TwitterCard } from '../twitter-card' -export abstract class TwitterCardRouteStrategy extends MetadataRouteStrategy {} +export abstract class TwitterCardRouteStrategy extends _MetadataRouteStrategy {} diff --git a/projects/ngx-metadata/src/lib/twitter-card/twitter-card-general-metadata-listener.service.spec.ts b/projects/ngx-metadata/src/lib/twitter-card/twitter-card-general-metadata-listener.service.spec.ts index 9634ccac..f58f175a 100644 --- a/projects/ngx-metadata/src/lib/twitter-card/twitter-card-general-metadata-listener.service.spec.ts +++ b/projects/ngx-metadata/src/lib/twitter-card/twitter-card-general-metadata-listener.service.spec.ts @@ -2,9 +2,12 @@ import { TestBed } from '@angular/core/testing' import { TwitterCardGeneralMetadataListenerService } from './twitter-card-general-metadata-listener.service' import { EventEmitter, Provider } from '@angular/core' -import { GeneralMetadata, GeneralMetadataImage } from '../general-metadata' +import { + _GeneralMetadataAppliersService, + GeneralMetadata, + GeneralMetadataImage, +} from 'ngx-metadata/general-metadata' import { MockProvider } from 'ng-mocks' -import { GeneralMetadataAppliersService } from '../general-metadata/general-metadata-appliers.service' import { TwitterCardAppliersService } from './twitter-card-appliers.service' import { enableAutoSpy } from 'ngx-metadata/__tests__/enable-auto-spy' @@ -114,7 +117,7 @@ function makeSut( if (!opts.generalMetadataUnavailable) { providers.push( - MockProvider(GeneralMetadataAppliersService, { + MockProvider(_GeneralMetadataAppliersService, { changes$: opts.changes$ ?? new EventEmitter(), }), ) diff --git a/projects/ngx-metadata/src/lib/twitter-card/twitter-card-general-metadata-listener.service.ts b/projects/ngx-metadata/src/lib/twitter-card/twitter-card-general-metadata-listener.service.ts index afd040db..c8de0b2e 100644 --- a/projects/ngx-metadata/src/lib/twitter-card/twitter-card-general-metadata-listener.service.ts +++ b/projects/ngx-metadata/src/lib/twitter-card/twitter-card-general-metadata-listener.service.ts @@ -1,7 +1,9 @@ import { Injectable, OnDestroy, Optional } from '@angular/core' import { Subscription } from 'rxjs' -import { GeneralMetadataAppliersService } from '../general-metadata/general-metadata-appliers.service' -import { GeneralMetadata } from '../general-metadata' +import { + _GeneralMetadataAppliersService, + GeneralMetadata, +} from 'ngx-metadata/general-metadata' import { TwitterCardAppliersService } from './twitter-card-appliers.service' @Injectable() @@ -10,7 +12,7 @@ export class TwitterCardGeneralMetadataListenerService implements OnDestroy { constructor( @Optional() - private readonly generalMetadataAppliersService: GeneralMetadataAppliersService | null, + private readonly generalMetadataAppliersService: _GeneralMetadataAppliersService | null, private readonly appliers: TwitterCardAppliersService, ) {} diff --git a/projects/ngx-metadata/src/lib/twitter-card/twitter-card.module.ts b/projects/ngx-metadata/src/lib/twitter-card/twitter-card.module.ts index eef5d433..015be475 100644 --- a/projects/ngx-metadata/src/lib/twitter-card/twitter-card.module.ts +++ b/projects/ngx-metadata/src/lib/twitter-card/twitter-card.module.ts @@ -2,7 +2,7 @@ import { Inject, ModuleWithProviders, NgModule, Optional } from '@angular/core' import { TwitterCardService } from './twitter-card.service' import { TwitterCardApplierService } from './twitter-card-applier.service' import { TwitterCardAppliersService } from './twitter-card-appliers.service' -import { MetadataRouteStrategy } from '../routing/metadata-route-strategy' +import { _MetadataRouteStrategy } from 'ngx-metadata/routing' import { TwitterCardGeneralMetadataListenerService } from './twitter-card-general-metadata-listener.service' import { TwitterCardRouteStrategy } from './routing/twitter-card-route-strategy' import { DefaultTwitterCardRouteStrategy } from './routing/default-twitter-card-route-strategy' @@ -48,7 +48,7 @@ export class TwitterCardModule { useClass: DefaultTwitterCardRouteStrategy, }, { - provide: MetadataRouteStrategy, + provide: _MetadataRouteStrategy, useExisting: TwitterCardRouteStrategy, multi: true, },