feat: package type config for multi-package dirs

src/cli/cmds/audit.js

@@ -47,6 +47,12 @@ exports.builder = (yargs) =>
       describe: 'The path to the application to audit',
       type: 'string',
     })
+    .option('pt', {
+      alias: 'package-type',
+      demandOption: false,
+      describe: 'The type of package to search for at the given path',
+      type: 'string',
+    })
     .option('md', {
       alias: 'max-depth',
       demandOption: false,
@@ -194,6 +200,7 @@ exports.handler = async (argv) => {
 
     const configuration = {
       appPath,
+      packageType: argv.packageType,
       includeDev:
         typeof fileConfig.includeDev !== 'undefined' ? fileConfig.includeDev : argv.includeDev,
       skipLicenseIssues:

src/files/lockfiles.js

@@ -123,9 +123,15 @@ const loadLockfiles = async (appPath) => {
   return lockfiles;
 };
 
-const loadLockfile = async (appPath) => {
+const loadLockfile = async (appPath, packageType) => {
   const lockfiles = await loadLockfiles(appPath);
 
+  if (packageType === 'npm') {
+    return lockfiles.npm || lockfiles.yarn || lockfiles.pnpm;
+  }
+  if (packageType === 'composer') {
+    return lockfiles.composer;
+  }
   return lockfiles.npm || lockfiles.yarn || lockfiles.pnpm || lockfiles.composer;
 };
 

src/graph/index.js

@@ -10,13 +10,20 @@ const generateComposerGraph = require('./generateComposerGraph');
 
 const generateGraphPromise = async (
   appPath,
-  {packageData, loadDataFrom = false, rootIsShell = false, includeDev = false, onProgress} = {},
+  {
+    packageData,
+    loadDataFrom = false,
+    rootIsShell = false,
+    includeDev = false,
+    packageType,
+    onProgress,
+  } = {},
 ) => {
   const workspace = await loadWorkspace(appPath);
-  let lockfile = await loadLockfile(appPath);
+  let lockfile = await loadLockfile(appPath, packageType);
 
   if (!lockfile && workspace) {
-    lockfile = await loadLockfile(workspace.path);
+    lockfile = await loadLockfile(workspace.path, packageType);
   }
 
   if (!lockfile) {
@@ -89,18 +96,9 @@ const generateGraphPromise = async (
   }
 
   if (loadDataFrom === 'disk') {
-    const managersToPackageType = {
-      npm: 'npm',
-      yarn: 'npm',
-      'yarn-classic': 'npm',
-      pnpm: 'npm',
-      composer: 'composer',
-    };
     const installedPackages = await loadInstalledPackages(workspace?.path || appPath);
     additionalPackageData = additionalPackageData.concat(
-      installedPackages.filter(
-        ({packageType}) => packageType === managersToPackageType[lockfile.manager],
-      ),
+      installedPackages.filter(({packageType: pt}) => packageType === pt),
     );
   }
 
@@ -147,13 +145,20 @@ const generateGraphAsync = (appPath, options, done = () => {}) => {
 
 const generateGraph = (
   appPath,
-  {packageData, loadDataFrom = false, rootIsShell = false, includeDev = false, onProgress} = {},
+  {
+    packageData,
+    loadDataFrom = false,
+    rootIsShell = false,
+    includeDev = false,
+    packageType,
+    onProgress,
+  } = {},
   done = undefined,
 ) => {
   if (typeof done === 'function') {
     return generateGraphAsync(
       appPath,
-      {packageData, loadDataFrom, rootIsShell, includeDev, onProgress},
+      {packageData, loadDataFrom, rootIsShell, includeDev, packageType, onProgress},
       done,
     );
   }
@@ -163,6 +168,7 @@ const generateGraph = (
     loadDataFrom,
     rootIsShell,
     includeDev,
+    packageType,
     onProgress,
   });
 };

src/index.js

@@ -12,6 +12,7 @@ const {getRegistryAudit, setupRegistries} = require('./registry');
 
 const getReport = async ({
   appPath,
+  packageType,
   dependencyGraph,
   includeDev = false,
   licensePolicy,
@@ -51,6 +52,7 @@ const getReport = async ({
       loadDataFrom,
       rootIsShell,
       includeDev,
+      packageType,
       onProgress: (progress) => onProgress({type: 'progress', stage: 'graph', progress}),
     }));
   const packageGraph = dGraph.root;