Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 26 additions & 7 deletions packages/angular/cli/src/package-managers/parsers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,13 +108,32 @@ export function parseNpmLikeDependencies(
return dependencies;
}

for (const dependencyMap of dependencyMaps) {
for (const [name, info] of Object.entries(dependencyMap as Record<string, NpmListDependency>)) {
dependencies.set(name, {
name,
version: info.version,
path: info.path,
});
// Perform a breadth-first traversal to collect dependencies.
// The queue size is bounded because `npm list` is executed with `--depth=0`,
// which limits the traversal to top-level dependencies of the workspaces.
const queue = [...dependencyMaps];
let index = 0;
while (index < queue.length) {
const currentMap = queue[index++] as Record<string, NpmListDependency> | undefined;
if (!currentMap) {
continue;
}
for (const [name, info] of Object.entries(currentMap)) {
if (info && typeof info === 'object') {
if (info.version && !dependencies.has(name)) {
dependencies.set(name, {
name,
version: info.version,
path: info.path,
});
}
const nestedMaps = [
info.dependencies,
info.devDependencies,
info.unsavedDependencies,
].filter((d) => !!d);
queue.push(...nestedMaps);
}
}
}
Comment thread
clydin marked this conversation as resolved.

Expand Down
38 changes: 38 additions & 0 deletions packages/angular/cli/src/package-managers/parsers_spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@

import {
parseBunDependencies,
parseNpmLikeDependencies,
parseNpmLikeError,
parseNpmLikeManifest,
parseYarnClassicDependencies,
Expand All @@ -16,6 +17,43 @@ import {
} from './parsers';

describe('parsers', () => {
describe('parseNpmLikeDependencies', () => {
it('should parse simple dependencies', () => {
const stdout = JSON.stringify({
dependencies: {
rxjs: {
version: '7.8.2',
},
},
});
const deps = parseNpmLikeDependencies(stdout);
expect(deps.size).toBe(1);
expect(deps.get('rxjs')).toEqual({ name: 'rxjs', version: '7.8.2', path: undefined });
});

it('should parse nested workspace dependencies for npm workspaces', () => {
const stdout = JSON.stringify({
version: '1.0.0',
name: 'npm-workspace-test',
dependencies: {
app: {
version: '1.0.0',
resolved: 'file:../packages/app',
dependencies: {
rxjs: {
version: '7.8.1',
},
},
},
},
});
const deps = parseNpmLikeDependencies(stdout);
expect(deps.size).toBe(2);
expect(deps.get('app')).toEqual({ name: 'app', version: '1.0.0', path: undefined });
expect(deps.get('rxjs')).toEqual({ name: 'rxjs', version: '7.8.1', path: undefined });
});
});

describe('parseNpmLikeError', () => {
it('should parse a structured JSON error from modern yarn', () => {
const stdout = JSON.stringify({
Expand Down
Loading