Skip to content

Commit

Permalink
fix: barrel import move exported directives in a specific file or in …
Browse files Browse the repository at this point in the history
…it's module
  • Loading branch information
alecarn committed May 15, 2024
1 parent 1e3d18f commit c955927
Show file tree
Hide file tree
Showing 42 changed files with 220 additions and 334 deletions.
11 changes: 11 additions & 0 deletions packages/common/form/src/form-field/form-field.directive.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { FormFieldSelectComponent } from './form-field-select.component';
import { FormFieldTextComponent } from './form-field-text.component';
import { FormFieldTextareaComponent } from './form-field-textarea.component';
import { FormFieldComponent } from './form-field.component';

export const FORM_FIELD_DIRECTIVES = [
FormFieldComponent,
FormFieldSelectComponent,
FormFieldTextComponent,
FormFieldTextareaComponent
] as const;
2 changes: 1 addition & 1 deletion packages/common/form/src/form-field/form-field.module.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { NgModule } from '@angular/core';

import { FORM_FIELD_DIRECTIVES } from '.';
import { FORM_FIELD_DIRECTIVES } from './form-field.directive';

/**
* @deprecated import the components directly or FORM_FIELD_DIRECTIVES for every components/directives
Expand Down
13 changes: 1 addition & 12 deletions packages/common/form/src/form-field/index.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,6 @@
import { FormFieldSelectComponent } from './form-field-select.component';
import { FormFieldTextComponent } from './form-field-text.component';
import { FormFieldTextareaComponent } from './form-field-textarea.component';
import { FormFieldComponent } from './form-field.component';

export * from './form-field.module';
export * from './form-field.component';
export * from './form-field-text.component';
export * from './form-field-select.component';
export * from './form-field-textarea.component';

export const FORM_FIELD_DIRECTIVES = [
FormFieldComponent,
FormFieldSelectComponent,
FormFieldTextComponent,
FormFieldTextareaComponent
] as const;
export * from './form-field.directive';
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
import {
ContextEditBindingDirective,
ContextEditComponent
} from './context-edit';
import { ContextFormComponent } from './context-form';
import { ContextItemComponent } from './context-item';
import {
ContextListBindingDirective,
ContextListComponent
} from './context-list';
import {
ContextPermissionsBindingDirective,
ContextPermissionsComponent
} from './context-permissions';
import { LayerContextDirective, MapContextDirective } from './shared';

export const CONTEXT_MANAGER_DIRECTIVES = [
ContextListComponent,
ContextListBindingDirective,
ContextItemComponent,
ContextFormComponent,
ContextEditComponent,
ContextEditBindingDirective,
ContextPermissionsComponent,
ContextPermissionsBindingDirective,
MapContextDirective,
LayerContextDirective
] as const;
30 changes: 1 addition & 29 deletions packages/context/src/lib/context-manager/index.ts
Original file line number Diff line number Diff line change
@@ -1,35 +1,7 @@
import {
ContextEditBindingDirective,
ContextEditComponent
} from './context-edit';
import { ContextFormComponent } from './context-form';
import { ContextItemComponent } from './context-item';
import {
ContextListBindingDirective,
ContextListComponent
} from './context-list';
import {
ContextPermissionsBindingDirective,
ContextPermissionsComponent
} from './context-permissions';
import { LayerContextDirective, MapContextDirective } from './shared';

export * from './shared';
export * from './context-list';
export * from './context-item';
export * from './context-form';
export * from './context-edit';
export * from './context-permissions';

export const CONTEXT_MANAGER_DIRECTIVES = [
ContextListComponent,
ContextListBindingDirective,
ContextItemComponent,
ContextFormComponent,
ContextEditComponent,
ContextEditBindingDirective,
ContextPermissionsComponent,
ContextPermissionsBindingDirective,
MapContextDirective,
LayerContextDirective
] as const;
export * from './context-manager.directive';
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import {
BookmarkButtonComponent,
BookmarkDialogComponent
} from './bookmark-button';
import { PoiButtonComponent } from './poi-button';
import { UserButtonComponent } from './user-button';

export const CONTEXT_MAP_BUTTON_DIRECTIVES = [
BookmarkButtonComponent,
BookmarkDialogComponent,
PoiButtonComponent,
UserButtonComponent
] as const;
15 changes: 1 addition & 14 deletions packages/context/src/lib/context-map-button/index.ts
Original file line number Diff line number Diff line change
@@ -1,17 +1,4 @@
import {
BookmarkButtonComponent,
BookmarkDialogComponent
} from './bookmark-button';
import { PoiButtonComponent } from './poi-button';
import { UserButtonComponent } from './user-button';

export * from './bookmark-button';
export * from './poi-button';
export * from './user-button';

export const CONTEXT_MAP_BUTTON_DIRECTIVES = [
BookmarkButtonComponent,
BookmarkDialogComponent,
PoiButtonComponent,
UserButtonComponent
] as const;
export * from './context-map-button.directive';
13 changes: 13 additions & 0 deletions packages/context/src/lib/context.directive.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { ContextImportExportComponent } from './context-import-export';
import { CONTEXT_MANAGER_DIRECTIVES } from './context-manager';
import { CONTEXT_MAP_BUTTON_DIRECTIVES } from './context-map-button';
import { SHARE_MAP_DIRECTIVES } from './share-map';
import { SidenavComponent } from './sidenav';

export const CONTEXT_DIRECTIVES = [
ContextImportExportComponent,
SidenavComponent,
...CONTEXT_MANAGER_DIRECTIVES,
...CONTEXT_MAP_BUTTON_DIRECTIVES,
...SHARE_MAP_DIRECTIVES
] as const;
15 changes: 1 addition & 14 deletions packages/context/src/lib/index.ts
Original file line number Diff line number Diff line change
@@ -1,20 +1,7 @@
import { ContextImportExportComponent } from './context-import-export';
import { CONTEXT_MANAGER_DIRECTIVES } from './context-manager';
import { CONTEXT_MAP_BUTTON_DIRECTIVES } from './context-map-button';
import { SHARE_MAP_DIRECTIVES } from './share-map';
import { SidenavComponent } from './sidenav';

export * from './context-import-export';
export * from './context-manager';
export * from './context-map-button';
export * from './share-map';
export * from './sidenav';
export * from './environment';

export const CONTEXT_DIRECTIVES = [
ContextImportExportComponent,
SidenavComponent,
...CONTEXT_MANAGER_DIRECTIVES,
...CONTEXT_MAP_BUTTON_DIRECTIVES,
...SHARE_MAP_DIRECTIVES
] as const;
export * from './context.directive';
11 changes: 1 addition & 10 deletions packages/context/src/lib/share-map/index.ts
Original file line number Diff line number Diff line change
@@ -1,14 +1,5 @@
import { ShareMapApiComponent } from './share-map/share-map-api.component';
import { ShareMapUrlComponent } from './share-map/share-map-url.component';
import { ShareMapComponent } from './share-map/share-map.component';

export * from './shared';
export * from './share-map.module';
export * from './share-map/share-map.component';
export * from './share-map/share-map-url.component';
export * from './share-map/share-map-api.component';

export const SHARE_MAP_DIRECTIVES = [
ShareMapComponent,
ShareMapUrlComponent,
ShareMapApiComponent
] as const;
6 changes: 6 additions & 0 deletions packages/context/src/lib/share-map/share-map.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,12 @@ import { ShareMapApiComponent } from './share-map/share-map-api.component';
import { ShareMapUrlComponent } from './share-map/share-map-url.component';
import { ShareMapComponent } from './share-map/share-map.component';

export const SHARE_MAP_DIRECTIVES = [
ShareMapComponent,
ShareMapUrlComponent,
ShareMapApiComponent
] as const;

/**
* @deprecated import the components/directives directly or SHARE_MAP_DIRECTIVES for the set
*/
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,11 @@ import { NgModule } from '@angular/core';
import { AddCatalogDialogComponent } from './add-catalog-dialog.component';
import { CatalogLibaryComponent } from './catalog-library.component';

export const CATALOG_LIBRARY_DIRECTIVES = [
CatalogLibaryComponent,
AddCatalogDialogComponent
] as const;

/**
* @deprecated import the CatalogLibaryComponent, AddCatalogDialogComponent directly
*/
Expand Down
9 changes: 1 addition & 8 deletions packages/geo/src/lib/catalog/catalog-library/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
import { AddCatalogDialogComponent } from './add-catalog-dialog.component';
import { CatalogLibaryComponent } from './catalog-library.component';

export * from './add-catalog-dialog.component';
export * from './catalog-library.component';

export const CATALOG_LIBRARY_DIRECTIVES = [
CatalogLibaryComponent,
AddCatalogDialogComponent
] as const;
export * from './catalog-library.module';
12 changes: 9 additions & 3 deletions packages/geo/src/lib/catalog/catalog.module.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import { NgModule } from '@angular/core';

import { IgoCatalogBrowserModule } from './catalog-browser/catalog-browser.module';
import { IgoCatalogLibraryModule } from './catalog-library/catalog-library.module';
import { CatalogBrowserComponent } from './catalog-browser/catalog-browser.component';
import { CATALOG_LIBRARY_DIRECTIVES } from './catalog-library';

export const CATALOG_DIRECTIVES = [
CatalogBrowserComponent,
...CATALOG_LIBRARY_DIRECTIVES
] as const;

/**
* @deprecated import the components directly or the CATALOG_DIRECTIVES
*/
@NgModule({
exports: [IgoCatalogBrowserModule, IgoCatalogLibraryModule]
imports: [...CATALOG_DIRECTIVES],
exports: [...CATALOG_DIRECTIVES]
})
export class IgoCatalogModule {}
9 changes: 1 addition & 8 deletions packages/geo/src/lib/catalog/index.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,5 @@
import { CatalogBrowserComponent } from './catalog-browser/catalog-browser.component';
import { CATALOG_LIBRARY_DIRECTIVES } from './catalog-library';

export * from './shared';
export * from './catalog.module';
export * from './catalog-browser/catalog-browser.component';
export * from './catalog-library/catalog-library.component';
export * from './catalog-library/add-catalog-dialog.component';

export const CATALOG_DIRECTIVES = [
...CATALOG_LIBRARY_DIRECTIVES,
CatalogBrowserComponent
] as const;
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,16 @@ import { NgModule } from '@angular/core';
import { FeatureDetailsComponent } from './feature-details.component';
import { FeatureDetailsDirective } from './feature-details.directive';

export const FEATURE_DETAILS_DIRECTIVES = [
FeatureDetailsComponent,
FeatureDetailsDirective
] as const;

/**
* @deprecated import the FeatureDetailsComponent, FeatureDetailsDirective directly or the FEATURE_DETAILS_DIRECTIVES for all
*/
@NgModule({
imports: [FeatureDetailsComponent, FeatureDetailsDirective],
exports: [FeatureDetailsComponent, FeatureDetailsDirective]
imports: [...FEATURE_DETAILS_DIRECTIVES],
exports: [...FEATURE_DETAILS_DIRECTIVES]
})
export class IgoFeatureDetailsModule {}
9 changes: 1 addition & 8 deletions packages/geo/src/lib/feature/feature-details/index.ts
Original file line number Diff line number Diff line change
@@ -1,10 +1,3 @@
import { FeatureDetailsComponent } from './feature-details.component';
import { FeatureDetailsDirective } from './feature-details.directive';

export * from './feature-details.module';
export * from './feature-details.component';
export * from './feature-details.directive';

export const FEATURE_DETAILS_DIRECTIVES = [
FeatureDetailsComponent,
FeatureDetailsDirective
] as const;
12 changes: 9 additions & 3 deletions packages/geo/src/lib/feature/feature.module.ts
Original file line number Diff line number Diff line change
@@ -1,12 +1,18 @@
import { NgModule } from '@angular/core';

import { IgoFeatureDetailsModule } from './feature-details/feature-details.module';
import { IgoFeatureFormModule } from './feature-form/feature-form.module';
import { FEATURE_DETAILS_DIRECTIVES } from './feature-details';
import { FeatureFormComponent } from './feature-form/feature-form.component';

export const FEATURE_DIRECTIVES = [
...FEATURE_DETAILS_DIRECTIVES,
FeatureFormComponent
] as const;

/**
* @deprecated import the components directly or the FEATURE_DIRECTIVES for the set
*/
@NgModule({
exports: [IgoFeatureDetailsModule, IgoFeatureFormModule]
imports: [...FEATURE_DIRECTIVES],
exports: [...FEATURE_DIRECTIVES]
})
export class IgoFeatureModule {}
9 changes: 1 addition & 8 deletions packages/geo/src/lib/feature/index.ts
Original file line number Diff line number Diff line change
@@ -1,11 +1,4 @@
import { FEATURE_DETAILS_DIRECTIVES } from './feature-details';
import { FeatureFormComponent } from './feature-form/feature-form.component';

export * from './shared';
export * from './feature.module';
export * from './feature-details';
export * from './feature-form/feature-form.component';

export const FEATURE_DIRECTIVES = [
...FEATURE_DETAILS_DIRECTIVES,
FeatureFormComponent
] as const;
9 changes: 5 additions & 4 deletions packages/geo/src/lib/filter/filter.module.ts
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ import { TimeFilterItemComponent } from './time-filter-item/time-filter-item.com
import { TimeFilterListBindingDirective } from './time-filter-list/time-filter-list-binding.directive';
import { TimeFilterListComponent } from './time-filter-list/time-filter-list.component';

const DIRECTIVES = [
export const FILTER_DIRECTIVES = [
FilterableDataSourcePipe,
TimeFilterButtonComponent,
TimeFilterFormComponent,
Expand All @@ -43,13 +43,14 @@ const DIRECTIVES = [
SpatialFilterItemComponent,
OgcFilterTimeComponent,
OgcFilterTimeSliderComponent
];
] as const;

/**
* @deprecated import the components directly or the FILTER_DIRECTIVES for the set
*/
@NgModule({
imports: DIRECTIVES,
exports: DIRECTIVES,
imports: [...FILTER_DIRECTIVES],
exports: [...FILTER_DIRECTIVES],
providers: [
TimeFilterService,
OGCFilterService,
Expand Down
Loading

0 comments on commit c955927

Please sign in to comment.