miel.truyen/nx
1
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

fix(schematics): handle projects that have similar names

Browse Source
This commit is contained in:
vsavkin 2018-01-05 10:35:57 -05:00 committed by Victor Savkin
parent 912fc81708
commit fe7032d29f
2 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
packages/schematics/src/command-line/affected-apps.spec.ts
View File

@ -153,6 +153,34 @@ describe('Calculates Dependencies Between Apps and Libs', () => {
expect(deps).toEqual({ app1: ['app1'] });
});
it('should handle projects with the names starting with the same string', () => {
const deps = dependencies(
'nrwl',
[
{
name: 'aa',
files: ['aa.ts'],
isApp: true
},
{
name: 'aa/bb',
files: ['bb.ts'],
isApp: true
}
],
file => {
switch (file) {
case 'aa.ts':
return `import '@nrwl/aa/bb'`;
case 'bb.ts':
return '';
}
}
);
expect(deps).toEqual({ aa: ['aa', 'aa/bb'], 'aa/bb': ['aa/bb'] });
});
});
describe('affectedApps', () => {
@ -236,7 +264,7 @@ describe('Calculates Dependencies Between Apps and Libs', () => {
['package.json']
);
expect(affected).toEqual(['app1', 'app2']);
expect(affected).toEqual(['app2', 'app1']);
});
it('should handle slashes', () => {
@ -289,7 +317,7 @@ describe('Calculates Dependencies Between Apps and Libs', () => {
['app1.ts']
);
expect(affected).toEqual(['app1', 'app2']);
expect(affected).toEqual(['app2', 'app1']);
});
});
});

8
packages/schematics/src/command-line/affected-apps.ts
View File

@ -51,7 +51,13 @@ export function dependencies(
class Deps {
private deps: { [appName: string]: string[] };
constructor(private npmScope: string, private projects: Project[], private fileRead: (s: string) => string) {}
constructor(private npmScope: string, private projects: Project[], private fileRead: (s: string) => string) {
this.projects.sort((a, b) => {
if (!a.name) return -1;
if (!b.name) return -1;
return a.name.length > b.name.length ? -1 : 1;
});
}
calculateDeps() {
this.deps = this.projects.reduce((m, c) => ({ ...m, [c.name]: [] }), {});