Skip to content

Commit be521d0

Browse files
committed
chore(*): commenting only at the start of the file
1 parent 1a50fb5 commit be521d0

File tree

2 files changed

+21
-28
lines changed

2 files changed

+21
-28
lines changed

projects/igniteui-angular/migrations/update-13_0_0/index.spec.ts

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -201,14 +201,14 @@ describe(`Update to ${version}`, () => {
201201
`.replace(lineBreaksAndSpaceRegex, ''));
202202
});
203203

204-
it('should remove exporter services from module.ts files', async () => {
204+
it('should insert a comment when exporter services are present in module.ts files', async () => {
205205
appTree.create('/testSrc/appPrefix/component/app.module.ts', `
206206
import { NgModule } from "@angular/core";
207207
import { FormsModule } from "@angular/forms";
208208
import { BrowserModule } from "@angular/platform-browser";
209209
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
210210
import { AppComponent } from "./app.component";
211-
import { IgxExcelExporterService, OtherService } from "igniteui-angular";
211+
import { IgxCsvExporterService, IgxExcelExporterService } from "igniteui-angular";
212212
import { ExcelExportComponent } from "./services/export-excel/excel-export.component";
213213
214214
@NgModule({
@@ -222,7 +222,10 @@ imports: [
222222
BrowserAnimationsModule,
223223
FormsModule
224224
],
225-
providers: [IgxExcelExporterService , OtherService],
225+
providers: [
226+
IgxCsvExporterService,
227+
IgxExcelExporterService
228+
],
226229
entryComponents: [],
227230
schemas: []
228231
})
@@ -235,14 +238,14 @@ export class AppModule {}
235238

236239
expect(
237240
tree.readContent('/testSrc/appPrefix/component/app.module.ts')
238-
).toEqual( `
241+
).toEqual(
242+
`// IgxCsvExporterService and IgxExcelExporterService no longer need to be manually provided and can be safely removed.
239243
import { NgModule } from "@angular/core";
240244
import { FormsModule } from "@angular/forms";
241245
import { BrowserModule } from "@angular/platform-browser";
242246
import { BrowserAnimationsModule } from "@angular/platform-browser/animations";
243247
import { AppComponent } from "./app.component";
244-
// IgxExcelExporterService has been removed. Exporter services can now be used without providing.
245-
import { /*IgxExcelExporterService,*/ OtherService } from "igniteui-angular";
248+
import { IgxCsvExporterService, IgxExcelExporterService } from "igniteui-angular";
246249
import { ExcelExportComponent } from "./services/export-excel/excel-export.component";
247250
248251
@NgModule({
@@ -256,8 +259,10 @@ imports: [
256259
BrowserAnimationsModule,
257260
FormsModule
258261
],
259-
// IgxExcelExporterService has been removed. Exporter services can now be used without providing.
260-
providers: [/*IgxExcelExporterService,*/ OtherService],
262+
providers: [
263+
IgxCsvExporterService,
264+
IgxExcelExporterService
265+
],
261266
entryComponents: [],
262267
schemas: []
263268
})

projects/igniteui-angular/migrations/update-13_0_0/index.ts

Lines changed: 8 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -66,30 +66,18 @@ export default (): Rule => (host: Tree, context: SchematicContext) => {
6666

6767
for (const path of moduleTsFiles) {
6868
let content = host.read(path)?.toString();
69+
const servicesInFile = [];
6970
SERVICES.forEach(service => {
7071
if (content.indexOf(service) > -1) {
71-
const commentedService = '/*' + service + '*/';
72-
const commentedServiceWithComa = '/*' + service + ',*/';
73-
content = content.replace(new RegExp(service, 'gi'), commentedService);
74-
content = content.replace(new RegExp('[/][*]' + service + '[*][/]\\s*[,]', 'gi'), commentedServiceWithComa);
75-
const indexes = getIndicesOf('/*' + service, content);
76-
indexes.reverse().forEach(index => {
77-
const preceedingContent = content.substring(0, index);
78-
const newLineIndex = preceedingContent.lastIndexOf('\n');
79-
const comment = '// ' + service + ' has been removed. Exporter services can now be used without providing.';
80-
if (newLineIndex > -1) {
81-
const newPreceedingContent =
82-
[preceedingContent.slice(0, newLineIndex), '\n' + comment, preceedingContent.slice(newLineIndex)].join('');
83-
content = content.replace(preceedingContent, newPreceedingContent);
84-
} else {
85-
// service is mentioned on the first row
86-
content = comment + '\n' + content;
87-
}
88-
});
89-
90-
host.overwrite(path, content);
72+
servicesInFile.push(service);
9173
}
9274
});
75+
76+
if (servicesInFile.length > 0) {
77+
const comment = '// ' + servicesInFile.join(' and ') + ' no longer need to be manually provided and can be safely removed.';
78+
content = comment + content;
79+
host.overwrite(path, content);
80+
}
9381
}
9482

9583
update.applyChanges();

0 commit comments

Comments
 (0)