Skip to content

Commit 596afce

Browse files
authored
feat(package): individual module imports for pipe directives (#384)
This allows components to be imported individually without having to install an unused, optional dependency. Deprecations - PipeModule: Use SearchHighlightModule, SortArrayModule, or TruncateModule
1 parent 17f80b5 commit 596afce

18 files changed

+115
-41
lines changed

src/app/filter/filter.component.spec.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@ import { FilterField } from './filter-field';
2020
import { FilterFieldsComponent } from './filter-fields.component';
2121
import { FilterResultsComponent } from './filter-results.component';
2222
import { FilterType } from './filter-type';
23-
import { PipeModule } from './../pipe/pipe.module';
23+
import { SearchHighlightPipeModule } from '../pipe/search-highlight/search-highlight.pipe.module';
24+
import { TruncatePipeModule } from '../pipe/truncate/truncate.pipe.module';
2425

2526
describe('Filter component - ', () => {
2627
let comp: FilterComponent;
@@ -125,9 +126,10 @@ describe('Filter component - ', () => {
125126
BsDropdownModule.forRoot(),
126127
BrowserAnimationsModule,
127128
FormsModule,
128-
PipeModule,
129129
PopoverModule.forRoot(),
130-
TooltipModule.forRoot()
130+
SearchHighlightPipeModule,
131+
TooltipModule.forRoot(),
132+
TruncatePipeModule
131133
],
132134
declarations: [FilterComponent, FilterFieldsComponent, FilterResultsComponent],
133135
providers: [BsDropdownConfig, TooltipConfig]

src/app/filter/filter.module.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ import { FilterFieldsComponent } from './filter-fields.component';
1515
import { FilterResultsComponent } from './filter-results.component';
1616
import { FilterQuery } from './filter-query';
1717
import { FilterType } from './filter-type';
18-
import { PipeModule } from './../pipe/pipe.module';
18+
import { SearchHighlightPipeModule } from '../pipe/search-highlight/search-highlight.pipe.module';
19+
import { TruncatePipeModule } from '../pipe/truncate/truncate.pipe.module';
1920

2021
export {
2122
Filter,
@@ -34,9 +35,10 @@ export {
3435
BsDropdownModule.forRoot(),
3536
CommonModule,
3637
FormsModule,
37-
PipeModule,
3838
PopoverModule.forRoot(),
39-
TooltipModule.forRoot()
39+
SearchHighlightPipeModule,
40+
TooltipModule.forRoot(),
41+
TruncatePipeModule
4042
],
4143
declarations: [FilterComponent, FilterFieldsComponent, FilterResultsComponent],
4244
exports: [FilterComponent, FilterFieldsComponent, FilterResultsComponent],

src/app/list/basic-list/example/list-example.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import { ListHeadingExampleComponent } from './list-heading-example.component';
1919
import { ListExampleComponent } from './list-example.component';
2020
import { ListPinExampleComponent } from './list-pin-example.component';
2121
import { NodesContentComponent } from './content/nodes-content.component';
22-
import { PipeModule } from '../../../pipe/pipe.module';
22+
import { SortArrayPipeModule } from '../../../pipe/sort-array';
2323

2424
@NgModule({
2525
declarations: [
@@ -41,7 +41,7 @@ import { PipeModule } from '../../../pipe/pipe.module';
4141
DemoComponentsModule,
4242
FormsModule,
4343
ListModule,
44-
PipeModule,
44+
SortArrayPipeModule,
4545
TabsModule.forRoot(),
4646
TooltipModule.forRoot()
4747
],

src/app/list/basic-list/list.component.spec.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import { EmptyStateConfig } from '../../empty-state/empty-state-config';
1313
import { EmptyStateModule } from '../../empty-state/empty-state.module';
1414
import { ListComponent } from './list.component';
1515
import { ListConfig } from './list-config';
16-
import { PipeModule } from '../../pipe/pipe.module';
16+
import { SortArrayPipeModule } from '../../pipe/sort-array/sort-array.pipe.module';
1717

1818
describe('List component - ', () => {
1919
let comp: ListComponent;
@@ -121,7 +121,7 @@ describe('List component - ', () => {
121121
BrowserAnimationsModule,
122122
EmptyStateModule,
123123
FormsModule,
124-
PipeModule
124+
SortArrayPipeModule
125125
],
126126
declarations: [ListComponent],
127127
providers: []

src/app/list/basic-list/list.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import { ListComponent } from './list.component';
77
import { ListConfig } from './list-config';
88
import { ListEvent } from '../list-event';
99
import { ListExpandToggleComponent } from './list-expand-toggle.component';
10-
import { PipeModule } from '../../pipe/pipe.module';
10+
import { SortArrayPipeModule } from '../../pipe/sort-array/sort-array.pipe.module';
1111

1212
export {
1313
ListConfig,
@@ -22,7 +22,7 @@ export {
2222
CommonModule,
2323
EmptyStateModule,
2424
FormsModule,
25-
PipeModule
25+
SortArrayPipeModule
2626
],
2727
declarations: [ListComponent, ListExpandToggleComponent],
2828
exports: [ListComponent, ListExpandToggleComponent]

src/app/pipe/index.ts

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
export { PipeModule } from './pipe.module';
2-
export { SearchHighlightPipe } from './search-highlight/search-highlight.pipe';
3-
export { SortArrayPipe } from './sort-array/sort-array.pipe';
4-
export { TruncatePipe } from './truncate/truncate.pipe';
2+
3+
export * from './search-highlight/index';
4+
export * from './sort-array/index';
5+
export * from './truncate/index';

src/app/pipe/pipe.module.ts

Lines changed: 28 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,39 @@
11
import { NgModule } from '@angular/core';
2+
3+
import { SearchHighlightPipeModule } from './search-highlight/search-highlight.pipe.module';
24
import { SearchHighlightPipe } from './search-highlight/search-highlight.pipe';
5+
import { SortArrayPipeModule } from './sort-array/sort-array.pipe.module';
36
import { SortArrayPipe } from './sort-array/sort-array.pipe';
7+
import { TruncatePipeModule } from './truncate/truncate.pipe.module';
48
import { TruncatePipe } from './truncate/truncate.pipe';
59

10+
export {
11+
SearchHighlightPipe,
12+
SortArrayPipe,
13+
TruncatePipe
14+
};
15+
616
/**
717
* A module containing objects associated with pipes
18+
*
19+
* @deprecated Use individual module imports
20+
*
21+
* import {
22+
* SearchHighlightModule,
23+
* SortArrayModule,
24+
* TruncateModule
25+
* } from 'patternfly-ng/pipe';
826
*/
927
@NgModule({
10-
declarations: [
11-
SearchHighlightPipe,
12-
SortArrayPipe,
13-
TruncatePipe
14-
],
15-
exports: [
16-
SearchHighlightPipe,
17-
SortArrayPipe,
18-
TruncatePipe
28+
imports: [
29+
SearchHighlightPipeModule,
30+
SortArrayPipeModule,
31+
TruncatePipeModule
1932
]
2033
})
21-
export class PipeModule { }
34+
export class PipeModule {
35+
constructor() {
36+
console.log('patternfly-ng: PipeModule is deprecated; use SearchHighlightModule, ' +
37+
'SortArrayModule, or TruncateModule');
38+
}
39+
}

src/app/pipe/search-highlight/example/search-highlight-example.module.ts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@ import { NgModule } from '@angular/core';
44
import { TabsetConfig, TabsModule } from 'ngx-bootstrap/tabs';
55

66
import { DemoComponentsModule } from '../../../../demo/components/demo-components.module';
7-
import { PipeModule } from '../../pipe.module';
87
import { SearchHighlightExampleComponent } from './search-highlight-example.component';
8+
import { SearchHighlightPipeModule } from '../search-highlight.pipe.module';
99

1010
@NgModule({
1111
declarations: [SearchHighlightExampleComponent],
1212
imports: [
1313
CommonModule,
1414
DemoComponentsModule,
1515
FormsModule,
16-
PipeModule,
16+
SearchHighlightPipeModule,
1717
TabsModule.forRoot(),
1818
],
1919
providers: [TabsetConfig]
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export { SearchHighlightPipeModule } from './search-highlight.pipe.module';
2+
export { SearchHighlightPipe } from './search-highlight.pipe';
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { NgModule } from '@angular/core';
2+
import { SearchHighlightPipe } from './search-highlight.pipe';
3+
4+
/**
5+
* A module containing objects associated with the search highlight pipe
6+
*/
7+
@NgModule({
8+
declarations: [
9+
SearchHighlightPipe
10+
],
11+
exports: [
12+
SearchHighlightPipe
13+
]
14+
})
15+
export class SearchHighlightPipeModule { }

src/app/pipe/sort-array/example/sort-array-example.module.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ import { NgModule } from '@angular/core';
44
import { TabsetConfig, TabsModule } from 'ngx-bootstrap/tabs';
55

66
import { DemoComponentsModule } from '../../../../demo/components/demo-components.module';
7-
import { PipeModule } from '../../pipe.module';
87
import { SortArrayExampleComponent } from './sort-array-example.component';
8+
import { SortArrayPipeModule } from '../sort-array.pipe.module';
99

1010
@NgModule({
11-
declarations: [ SortArrayExampleComponent ],
11+
declarations: [SortArrayExampleComponent],
1212
imports: [
1313
CommonModule,
1414
DemoComponentsModule,
1515
FormsModule,
16-
PipeModule,
16+
SortArrayPipeModule,
1717
TabsModule.forRoot()
1818
],
19-
providers: [ TabsetConfig ]
19+
providers: [TabsetConfig]
2020
})
2121
export class SortArrayExampleModule {
2222
constructor() {}

src/app/pipe/sort-array/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export { SortArrayPipeModule } from './sort-array.pipe.module';
2+
export { SortArrayPipe } from './sort-array.pipe';
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { NgModule } from '@angular/core';
2+
import { SortArrayPipe } from './sort-array.pipe';
3+
4+
/**
5+
* A module containing objects associated with the sort array pipe
6+
*/
7+
@NgModule({
8+
declarations: [
9+
SortArrayPipe
10+
],
11+
exports: [
12+
SortArrayPipe
13+
]
14+
})
15+
export class SortArrayPipeModule { }

src/app/pipe/truncate/example/truncate-example.module.ts

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,19 +4,19 @@ import { NgModule } from '@angular/core';
44
import { TabsetConfig, TabsModule } from 'ngx-bootstrap/tabs';
55

66
import { DemoComponentsModule } from '../../../../demo/components/demo-components.module';
7-
import { PipeModule } from '../../pipe.module';
87
import { TruncateExampleComponent } from './truncate-example.component';
8+
import { TruncatePipeModule } from '../truncate.pipe.module';
99

1010
@NgModule({
11-
declarations: [ TruncateExampleComponent ],
11+
declarations: [TruncateExampleComponent],
1212
imports: [
1313
CommonModule,
1414
DemoComponentsModule,
1515
FormsModule,
16-
PipeModule,
17-
TabsModule.forRoot()
16+
TabsModule.forRoot(),
17+
TruncatePipeModule
1818
],
19-
providers: [ TabsetConfig ]
19+
providers: [TabsetConfig]
2020
})
2121
export class TruncateExampleModule {
2222
constructor() {}

src/app/pipe/truncate/index.ts

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
export { TruncatePipeModule } from './truncate.pipe.module';
2+
export { TruncatePipe } from './truncate.pipe';
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
import { NgModule } from '@angular/core';
2+
import { TruncatePipe } from './truncate.pipe';
3+
4+
/**
5+
* A module containing objects associated with the truncate pipe
6+
*/
7+
@NgModule({
8+
declarations: [
9+
TruncatePipe
10+
],
11+
exports: [
12+
TruncatePipe
13+
]
14+
})
15+
export class TruncatePipeModule { }

src/app/table/basic-table/table.component.spec.ts

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,6 @@ import { FilterConfig } from '../../filter/filter-config';
2525
import { FilterField } from '../../filter/filter-field';
2626
import { FilterType } from '../../filter/filter-type';
2727
import { NgxDataTableDndDirective } from './ngx-datatable-dnd.directive';
28-
import { PipeModule } from './../../pipe/pipe.module';
2928
import { PaginationConfig } from './../../pagination/pagination-config';
3029
import { PaginationModule } from './../../pagination/pagination.module';
3130
import { SortConfig } from '../../sort/sort-config';
@@ -297,7 +296,6 @@ describe('Table component - ', () => {
297296
EmptyStateModule,
298297
FormsModule,
299298
PaginationModule,
300-
PipeModule,
301299
PopoverModule.forRoot(),
302300
NgxDatatableModule,
303301
ToolbarModule,

src/app/toolbar/toolbar.component.spec.ts

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,13 +22,14 @@ import { FilterField } from '../filter/filter-field';
2222
import { FilterFieldsComponent } from '../filter/filter-fields.component';
2323
import { FilterResultsComponent } from '../filter/filter-results.component';
2424
import { FilterType } from '../filter/filter-type';
25-
import { PipeModule } from './../pipe/pipe.module';
25+
import { SearchHighlightPipeModule } from '../pipe/search-highlight/search-highlight.pipe.module';
2626
import { SortComponent } from '../sort/sort.component';
2727
import { SortConfig } from '../sort/sort-config';
2828
import { SortEvent } from '../sort/sort-event';
2929
import { ToolbarComponent } from './toolbar.component';
3030
import { ToolbarConfig } from './toolbar-config';
3131
import { ToolbarView } from './toolbar-view';
32+
import { TruncatePipeModule } from '../pipe/truncate/truncate.pipe.module';
3233

3334
describe('Toolbar component - ', () => {
3435
let comp: ToolbarComponent;
@@ -182,9 +183,10 @@ describe('Toolbar component - ', () => {
182183
BsDropdownModule.forRoot(),
183184
BrowserAnimationsModule,
184185
FormsModule,
185-
PipeModule,
186186
PopoverModule.forRoot(),
187-
TooltipModule.forRoot()
187+
SearchHighlightPipeModule,
188+
TooltipModule.forRoot(),
189+
TruncatePipeModule
188190
],
189191
declarations: [
190192
ToolbarComponent, FilterFieldsComponent,

0 commit comments

Comments
 (0)