Skip to content

Commit 5260687

Browse files
mistrykaran91spike-rabbit
mistrykaran91
authored and
spike-rabbit
committed
fix(schematics): add support for SimplElementNgModule imports and update mappings
1 parent 2a14283 commit 5260687

17 files changed

+806
-42
lines changed

‎projects/element-ng/schematics/migrations/element-migration/element-migration.spec.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import { Tree } from '@angular-devkit/schematics';
77
import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
8-
import { join } from '@angular/compiler-cli';
98
import { readFileSync } from 'fs';
109
import * as path from 'path';
1110
import { fileURLToPath } from 'url';
@@ -35,8 +34,8 @@ describe('to legacy migration', () => {
3534
appTree,
3635
Object.fromEntries(
3736
fileNames.map(fileName => [
38-
join(basePath, fileName),
39-
readFileSync(buildRelativeFromFile(join('files', fileName)), 'utf8')
37+
path.join(basePath, fileName),
38+
readFileSync(buildRelativeFromFile(path.join('files', fileName)), 'utf8')
4039
])
4140
)
4241
);
@@ -60,10 +59,10 @@ describe('to legacy migration', () => {
6059
);
6160
for (const fileName of fileNames) {
6261
const expected = readFileSync(
63-
buildRelativeFromFile(join('files', 'expected.' + fileName)),
62+
buildRelativeFromFile(path.join('files', 'expected.' + fileName)),
6463
'utf8'
6564
);
66-
const actual = tree.readContent(join(basePath, fileName));
65+
const actual = tree.readContent(path.join(basePath, fileName));
6766
expect(actual).toEqual(expected);
6867
}
6968
};

‎projects/element-ng/schematics/migrations/wizard-migration/index.spec.ts‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import { Tree } from '@angular-devkit/schematics';
77
import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
8-
import { join } from '@angular/compiler-cli';
98
import { readFileSync } from 'fs';
109
import * as path from 'path';
1110
import { fileURLToPath } from 'url';
@@ -35,8 +34,8 @@ describe('wizard migration', () => {
3534
appTree,
3635
Object.fromEntries(
3736
fileNames.map(fileName => [
38-
join(basePath, fileName),
39-
readFileSync(buildRelativeFromFile(join('files', fileName)), 'utf8')
37+
path.join(basePath, fileName),
38+
readFileSync(buildRelativeFromFile(path.join('files', fileName)), 'utf8')
4039
])
4140
)
4241
);
@@ -60,10 +59,10 @@ describe('wizard migration', () => {
6059
);
6160
for (const fileName of fileNames) {
6261
const expected = readFileSync(
63-
buildRelativeFromFile(join('files', 'expected.' + fileName)),
62+
buildRelativeFromFile(path.join('files', 'expected.' + fileName)),
6463
'utf8'
6564
);
66-
const actual = tree.readContent(join(basePath, fileName));
65+
const actual = tree.readContent(path.join(basePath, fileName));
6766
expect(actual).toEqual(expected);
6867
}
6968
};

‎projects/element-ng/schematics/ts-import-to-siemens-migration/files/component.simpl-element-ng-module-multiple-imports.ts‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
import { Component } from '@angular/core';
2+
import { SimplElementNgModule } from '@simpl/element-ng';
3+
import { SiAboutModule } from '@simpl/element-ng/about';
4+
import { SiAccordionModule } from '@simpl/element-ng/accordion';
5+
6+
@Component({
7+
selector: 'app-test',
8+
template: '',
9+
imports: [SimplElementNgModule, SiAboutModule, SiAccordionModule]
10+
})
11+
export class MyComponent {}

‎projects/element-ng/schematics/ts-import-to-siemens-migration/files/component.simpl-element-ng-module-multiple-symbol.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
import { Component } from '@angular/core';
2+
import { SimplElementNgModule, SiAboutModule, SiAccordionModule } from '@simpl/element-ng';
3+
4+
@Component({
5+
selector: 'app-test',
6+
template: '',
7+
imports:[SimplElementNgModule, SiAboutModule, SiAccordionModule]
8+
})
9+
export class MyComponent {}

‎projects/element-ng/schematics/ts-import-to-siemens-migration/files/component.simpl-element-ng-module.ts‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
import { Component } from '@angular/core';
2+
import { SimplElementNgModule } from '@simpl/element-ng';
3+
import { SomeOtherModule} from '@simpl/element-ng/some-other-module';
4+
5+
@Component({
6+
selector: 'app-test',
7+
imports: [SimplElementNgModule, SomeOtherModule],
8+
template: ''
9+
})
10+
export class MyComponent {}

‎projects/element-ng/schematics/ts-import-to-siemens-migration/files/expected.component.simpl-element-ng-module-multiple-imports.ts‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
import { Component } from '@angular/core';
2+
import { SiAboutModule } from '@siemens/element-ng/about';
3+
import { SiAccordionModule } from '@siemens/element-ng/accordion';
4+
import { SiBreadcrumbModule } from '@siemens/element-ng/breadcrumb';
5+
import { SiBreadcrumbRouterModule } from '@siemens/element-ng/breadcrumb-router';
6+
import { SiCardModule } from '@siemens/element-ng/card';
7+
import { SiCircleStatusModule } from '@siemens/element-ng/circle-status';
8+
import { SiConnectionStrengthModule } from '@siemens/element-ng/connection-strength';
9+
import { SiContentActionBarModule } from '@siemens/element-ng/content-action-bar';
10+
import { SiCopyrightNoticeModule } from '@siemens/element-ng/copyright-notice';
11+
import { SiDateRangeFilterModule } from '@siemens/element-ng/date-range-filter';
12+
import { SiDatepickerModule } from '@siemens/element-ng/datepicker';
13+
import { SiElectrontitlebarModule } from '@siemens/element-ng/electron-titlebar';
14+
import { SiEmptyStateModule } from '@siemens/element-ng/empty-state';
15+
import { SiFileUploaderModule } from '@siemens/element-ng/file-uploader';
16+
import { SiFilterBarModule } from '@siemens/element-ng/filter-bar';
17+
import { SiFilteredSearchModule } from '@siemens/element-ng/filtered-search';
18+
import { SiFooterModule } from '@siemens/element-ng/footer';
19+
import { SiFormModule } from '@siemens/element-ng/form';
20+
import { SiIconModule } from '@siemens/element-ng/icon';
21+
import { SiIconStatusModule } from '@siemens/element-ng/icon-status';
22+
import { SiInlineNotificationModule } from '@siemens/element-ng/inline-notification';
23+
import { SiLandingPageModule } from '@siemens/element-ng/landing-page';
24+
import { SiLanguageSwitcherModule } from '@siemens/element-ng/language-switcher';
25+
import { SiLinkModule } from '@siemens/element-ng/link';
26+
import { SiLoadingSpinnerModule } from '@siemens/element-ng/loading-spinner';
27+
import { SiMainDetailContainerModule } from '@siemens/element-ng/main-detail-container';
28+
import { SiNavbarModule } from '@siemens/element-ng/navbar';
29+
import { SiNavbarVerticalModule } from '@siemens/element-ng/navbar-vertical';
30+
import { SiNumberInputModule } from '@siemens/element-ng/number-input';
31+
import { SiPaginationModule } from '@siemens/element-ng/pagination';
32+
import { SiPasswordStrengthModule } from '@siemens/element-ng/password-strength';
33+
import { SiPasswordToggleModule } from '@siemens/element-ng/password-toggle';
34+
import { SiPillsInputModule } from '@siemens/element-ng/pills-input';
35+
import { SiPopoverLegacyModule } from '@siemens/element-ng/popover-legacy';
36+
import { SiProgressbarModule } from '@siemens/element-ng/progressbar';
37+
import { SiResizeObserverModule } from '@siemens/element-ng/resize-observer';
38+
import { SiResultDetailsListModule } from '@siemens/element-ng/result-details-list';
39+
import { SiSearchBarModule } from '@siemens/element-ng/search-bar';
40+
import { SiSelectModule } from '@siemens/element-ng/select';
41+
import { SiSidePanelModule } from '@siemens/element-ng/side-panel';
42+
import { SiSliderModule } from '@siemens/element-ng/slider';
43+
import { SiSortBarModule } from '@siemens/element-ng/sort-bar';
44+
import { SiSplitModule } from '@siemens/element-ng/split';
45+
import { SiStatusBarModule } from '@siemens/element-ng/status-bar';
46+
import { SiTabsLegacyModule } from '@siemens/element-ng/tabs-legacy';
47+
import { SiThresholdModule } from '@siemens/element-ng/threshold';
48+
import { SiTooltipModule } from '@siemens/element-ng/tooltip';
49+
import { SiTreeViewModule } from '@siemens/element-ng/tree-view';
50+
import { SiTypeaheadModule } from '@siemens/element-ng/typeahead';
51+
import { SiUnauthorizedPageModule } from '@siemens/element-ng/unauthorized-page';
52+
import { SiWizardModule } from '@siemens/element-ng/wizard';
53+
54+
@Component({
55+
selector: 'app-test',
56+
template: '',
57+
imports: [
58+
SiAboutModule,
59+
SiAccordionModule,
60+
SiBreadcrumbModule,
61+
SiBreadcrumbRouterModule,
62+
SiCardModule,
63+
SiCircleStatusModule,
64+
SiConnectionStrengthModule,
65+
SiContentActionBarModule,
66+
SiCopyrightNoticeModule,
67+
SiDatepickerModule,
68+
SiDateRangeFilterModule,
69+
SiElectrontitlebarModule,
70+
SiEmptyStateModule,
71+
SiFileUploaderModule,
72+
SiFilterBarModule,
73+
SiFilteredSearchModule,
74+
SiFooterModule,
75+
SiFormModule,
76+
SiIconModule,
77+
SiIconStatusModule,
78+
SiInlineNotificationModule,
79+
SiLandingPageModule,
80+
SiLanguageSwitcherModule,
81+
SiLinkModule,
82+
SiLoadingSpinnerModule,
83+
SiMainDetailContainerModule,
84+
SiNavbarModule,
85+
SiNavbarVerticalModule,
86+
SiNumberInputModule,
87+
SiPaginationModule,
88+
SiPasswordStrengthModule,
89+
SiPasswordToggleModule,
90+
SiPillsInputModule,
91+
SiPopoverLegacyModule,
92+
SiProgressbarModule,
93+
SiResizeObserverModule,
94+
SiResultDetailsListModule,
95+
SiSearchBarModule,
96+
SiSelectModule,
97+
SiSidePanelModule,
98+
SiSliderModule,
99+
SiSortBarModule,
100+
SiSplitModule,
101+
SiStatusBarModule,
102+
SiTabsLegacyModule,
103+
SiThresholdModule,
104+
SiTooltipModule,
105+
SiTreeViewModule,
106+
SiTypeaheadModule,
107+
SiUnauthorizedPageModule,
108+
SiWizardModule
109+
]
110+
})
111+
export class MyComponent {}

‎projects/element-ng/schematics/ts-import-to-siemens-migration/files/expected.component.simpl-element-ng-module-multiple-symbol.ts‎

Lines changed: 111 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,111 @@
1+
import { Component } from '@angular/core';
2+
import { SiAboutModule } from '@siemens/element-ng/about';
3+
import { SiAccordionModule } from '@siemens/element-ng/accordion';
4+
import { SiBreadcrumbModule } from '@siemens/element-ng/breadcrumb';
5+
import { SiBreadcrumbRouterModule } from '@siemens/element-ng/breadcrumb-router';
6+
import { SiCardModule } from '@siemens/element-ng/card';
7+
import { SiCircleStatusModule } from '@siemens/element-ng/circle-status';
8+
import { SiConnectionStrengthModule } from '@siemens/element-ng/connection-strength';
9+
import { SiContentActionBarModule } from '@siemens/element-ng/content-action-bar';
10+
import { SiCopyrightNoticeModule } from '@siemens/element-ng/copyright-notice';
11+
import { SiDateRangeFilterModule } from '@siemens/element-ng/date-range-filter';
12+
import { SiDatepickerModule } from '@siemens/element-ng/datepicker';
13+
import { SiElectrontitlebarModule } from '@siemens/element-ng/electron-titlebar';
14+
import { SiEmptyStateModule } from '@siemens/element-ng/empty-state';
15+
import { SiFileUploaderModule } from '@siemens/element-ng/file-uploader';
16+
import { SiFilterBarModule } from '@siemens/element-ng/filter-bar';
17+
import { SiFilteredSearchModule } from '@siemens/element-ng/filtered-search';
18+
import { SiFooterModule } from '@siemens/element-ng/footer';
19+
import { SiFormModule } from '@siemens/element-ng/form';
20+
import { SiIconModule } from '@siemens/element-ng/icon';
21+
import { SiIconStatusModule } from '@siemens/element-ng/icon-status';
22+
import { SiInlineNotificationModule } from '@siemens/element-ng/inline-notification';
23+
import { SiLandingPageModule } from '@siemens/element-ng/landing-page';
24+
import { SiLanguageSwitcherModule } from '@siemens/element-ng/language-switcher';
25+
import { SiLinkModule } from '@siemens/element-ng/link';
26+
import { SiLoadingSpinnerModule } from '@siemens/element-ng/loading-spinner';
27+
import { SiMainDetailContainerModule } from '@siemens/element-ng/main-detail-container';
28+
import { SiNavbarModule } from '@siemens/element-ng/navbar';
29+
import { SiNavbarVerticalModule } from '@siemens/element-ng/navbar-vertical';
30+
import { SiNumberInputModule } from '@siemens/element-ng/number-input';
31+
import { SiPaginationModule } from '@siemens/element-ng/pagination';
32+
import { SiPasswordStrengthModule } from '@siemens/element-ng/password-strength';
33+
import { SiPasswordToggleModule } from '@siemens/element-ng/password-toggle';
34+
import { SiPillsInputModule } from '@siemens/element-ng/pills-input';
35+
import { SiPopoverLegacyModule } from '@siemens/element-ng/popover-legacy';
36+
import { SiProgressbarModule } from '@siemens/element-ng/progressbar';
37+
import { SiResizeObserverModule } from '@siemens/element-ng/resize-observer';
38+
import { SiResultDetailsListModule } from '@siemens/element-ng/result-details-list';
39+
import { SiSearchBarModule } from '@siemens/element-ng/search-bar';
40+
import { SiSelectModule } from '@siemens/element-ng/select';
41+
import { SiSidePanelModule } from '@siemens/element-ng/side-panel';
42+
import { SiSliderModule } from '@siemens/element-ng/slider';
43+
import { SiSortBarModule } from '@siemens/element-ng/sort-bar';
44+
import { SiSplitModule } from '@siemens/element-ng/split';
45+
import { SiStatusBarModule } from '@siemens/element-ng/status-bar';
46+
import { SiTabsLegacyModule } from '@siemens/element-ng/tabs-legacy';
47+
import { SiThresholdModule } from '@siemens/element-ng/threshold';
48+
import { SiTooltipModule } from '@siemens/element-ng/tooltip';
49+
import { SiTreeViewModule } from '@siemens/element-ng/tree-view';
50+
import { SiTypeaheadModule } from '@siemens/element-ng/typeahead';
51+
import { SiUnauthorizedPageModule } from '@siemens/element-ng/unauthorized-page';
52+
import { SiWizardModule } from '@siemens/element-ng/wizard';
53+
54+
@Component({
55+
selector: 'app-test',
56+
template: '',
57+
imports: [
58+
SiAboutModule,
59+
SiAccordionModule,
60+
SiBreadcrumbModule,
61+
SiBreadcrumbRouterModule,
62+
SiCardModule,
63+
SiCircleStatusModule,
64+
SiConnectionStrengthModule,
65+
SiContentActionBarModule,
66+
SiCopyrightNoticeModule,
67+
SiDatepickerModule,
68+
SiDateRangeFilterModule,
69+
SiElectrontitlebarModule,
70+
SiEmptyStateModule,
71+
SiFileUploaderModule,
72+
SiFilterBarModule,
73+
SiFilteredSearchModule,
74+
SiFooterModule,
75+
SiFormModule,
76+
SiIconModule,
77+
SiIconStatusModule,
78+
SiInlineNotificationModule,
79+
SiLandingPageModule,
80+
SiLanguageSwitcherModule,
81+
SiLinkModule,
82+
SiLoadingSpinnerModule,
83+
SiMainDetailContainerModule,
84+
SiNavbarModule,
85+
SiNavbarVerticalModule,
86+
SiNumberInputModule,
87+
SiPaginationModule,
88+
SiPasswordStrengthModule,
89+
SiPasswordToggleModule,
90+
SiPillsInputModule,
91+
SiPopoverLegacyModule,
92+
SiProgressbarModule,
93+
SiResizeObserverModule,
94+
SiResultDetailsListModule,
95+
SiSearchBarModule,
96+
SiSelectModule,
97+
SiSidePanelModule,
98+
SiSliderModule,
99+
SiSortBarModule,
100+
SiSplitModule,
101+
SiStatusBarModule,
102+
SiTabsLegacyModule,
103+
SiThresholdModule,
104+
SiTooltipModule,
105+
SiTreeViewModule,
106+
SiTypeaheadModule,
107+
SiUnauthorizedPageModule,
108+
SiWizardModule
109+
]
110+
})
111+
export class MyComponent {}

0 commit comments

Comments
 (0)