fix: npmDependencies returns dependencies from .nx/installation/node_modules if node_modules is a file

libs/shared/file-system/src/index.ts

@@ -5,4 +5,5 @@ export { readAndCacheJsonFile } from './lib/cache-json';
 export { clearJsonCache } from './lib/cache-json';
 export { readAndParseJson } from './lib/cache-json';
 export { listFiles } from './lib/list-files';
+export { readDirectory } from './lib/read-directory';
 export { readFile } from './lib/read-file';

libs/shared/file-system/src/lib/read-directory.ts

@@ -0,0 +1,9 @@
+import { readdir } from 'fs/promises';
+
+export async function readDirectory(path: string): Promise<string[]> {
+ try {
+ return readdir(path);
+ } catch {
+ return [];
+ }
+}

libs/shared/npm/src/lib/npm-dependencies.spec.ts

@@ -0,0 +1,105 @@
+import { npmDependencies } from './npm-dependencies';
+import { directoryExists, readDirectory } from '@nx-console/shared/file-system';
+
+jest.mock('@nx-console/shared/file-system');
+
+describe('npmDependencies', () => {
+ beforeEach(() => {
+ jest.resetAllMocks();
+ });
+
+ it('should return no dependencies if `node_modules` and `.nx/installation/node_modules` do not exist', async () => {
+ jest.mocked(directoryExists).mockResolvedValue(false);
+
+ expect(await npmDependencies('workspace')).toEqual([]);
+ });
+
+ it('should return dependencies from `node_modules` if `node_modules` exists', async () => {
+ jest
+ .mocked(directoryExists)
+ .mockImplementation((filePath) =>
+ Promise.resolve(
+ [
+ 'workspace/node_modules',
+ 'workspace/node_modules/package-foo',
+ 'workspace/node_modules/package-bar',
+ ].includes(filePath)
+ )
+ );
+ jest
+ .mocked(readDirectory)
+ .mockResolvedValue(['package-foo', 'package-bar']);
+
+ expect(await npmDependencies('workspace')).toEqual([
+ 'workspace/node_modules/package-foo',
+ 'workspace/node_modules/package-bar',
+ ]);
+ });
+
+ it('should return dependencies from `.nx/installation/node_modules` if only `.nx/installation/node_modules` exists', async () => {
+ jest
+ .mocked(directoryExists)
+ .mockImplementation((filePath) =>
+ Promise.resolve(
+ [
+ 'workspace/.nx/installation/node_modules',
+ 'workspace/.nx/installation/node_modules/package-foo',
+ 'workspace/.nx/installation/node_modules/package-bar',
+ ].includes(filePath)
+ )
+ );
+ jest
+ .mocked(readDirectory)
+ .mockResolvedValue(['package-foo', 'package-bar']);
+
+ expect(await npmDependencies('workspace')).toEqual([
+ 'workspace/.nx/installation/node_modules/package-foo',
+ 'workspace/.nx/installation/node_modules/package-bar',
+ ]);
+ });
+
+ it('should return packages from `node_modules` if `node_modules` and `.nx/installation/node_modules` exist', async () => {
+ jest
+ .mocked(directoryExists)
+ .mockImplementation((filePath) =>
+ Promise.resolve(
+ [
+ 'workspace/node_modules',
+ 'workspace/node_modules/package-foo',
+ 'workspace/node_modules/package-bar',
+ 'workspace/.nx/installation/node_modules',
+ ].includes(filePath)
+ )
+ );
+ jest
+ .mocked(readDirectory)
+ .mockResolvedValue(['package-foo', 'package-bar']);
+
+ expect(await npmDependencies('workspace')).toEqual([
+ 'workspace/node_modules/package-foo',
+ 'workspace/node_modules/package-bar',
+ ]);
+ });
+
+ it('should return scoped packages starting with @', async () => {
+ jest
+ .mocked(directoryExists)
+ .mockImplementation((filePath) =>
+ Promise.resolve(
+ [
+ 'workspace/node_modules',
+ 'workspace/node_modules/@scope',
+ 'workspace/.nx/installation/node_modules',
+ ].includes(filePath)
+ )
+ );
+ jest
+ .mocked(readDirectory)
+ .mockResolvedValueOnce(['@scope'])
+ .mockResolvedValueOnce(['package-foo']);
+
+ expect(await npmDependencies('workspace')).toEqual([
+ 'workspace/node_modules/@scope/package-foo',
+ ]);
+ });
+});

libs/shared/npm/src/lib/npm-dependencies.ts

@@ -1,5 +1,5 @@
-import { stat, readdir } from 'fs/promises';
 import { join } from 'path';
+import { directoryExists, readDirectory } from '@nx-console/shared/file-system';
 
 /**
  * Get a flat list of all node_modules folders in the workspace.
@@ -20,48 +20,35 @@ export async function npmDependencies(workspacePath: string) {
  let nodeModulesDir = nodeModules;
 
  const res: string[] = [];
- try {
- if (!(await stat(nodeModules)).isDirectory()) {
- return res;
- }
- } catch {
- try {
- if (!(await stat(nodeModulesEncapsulated)).isDirectory()) {
- return res;
- } else {
- nodeModulesDir = nodeModulesEncapsulated;
- }
- } catch {
+
+ if (!(await directoryExists(nodeModules))) {
+ if (!(await directoryExists(nodeModulesEncapsulated))) {
  return res;
+ } else {
+ nodeModulesDir = nodeModulesEncapsulated;
  }
  }
 
- const dirContents = await readdir(nodeModulesDir);
+ const dirContents = await readDirectory(nodeModulesDir);
 
  for (const npmPackageOrScope of dirContents) {
- try {
- if (npmPackageOrScope.startsWith('.')) {
- continue;
- }
-
- const packageStats = await stat(join(nodeModulesDir, npmPackageOrScope));
- if (!packageStats.isDirectory()) {
- continue;
- }
+ if (npmPackageOrScope.startsWith('.')) {
+ continue;
+ }
 
- if (npmPackageOrScope.startsWith('@')) {
- (await readdir(join(nodeModulesDir, npmPackageOrScope))).forEach(
- (p) => {
- res.push(`${nodeModulesDir}/${npmPackageOrScope}/${p}`);
- }
- );
- } else {
- res.push(`${nodeModulesDir}/${npmPackageOrScope}`);
- }
- } catch (e) {
- // ignore packages where reading them causes an error
+ if (!(await directoryExists(join(nodeModulesDir, npmPackageOrScope)))) {
  continue;
  }
+
+ if (npmPackageOrScope.startsWith('@')) {
+ (await readDirectory(join(nodeModulesDir, npmPackageOrScope))).forEach(
+ (p) => {
+ res.push(`${nodeModulesDir}/${npmPackageOrScope}/${p}`);
+ }
+ );
+ } else {
+ res.push(`${nodeModulesDir}/${npmPackageOrScope}`);
+ }
  }
 
  return res;