feat: convert nodejs to use multi format

snyk · Oct 2, 2019 · 468ec63 · 468ec63
1 parent c965884
commit 468ec63
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/lib/plugins/nodejs-plugin/index.ts b/src/lib/plugins/nodejs-plugin/index.ts
@@ -2,12 +2,13 @@ import * as modulesParser from './npm-modules-parser';
 import * as lockParser from './npm-lock-parser';
 import * as types from '../types';
 import { MissingTargetFileError } from '../../errors/missing-targetfile-error';
+import { MultiProjectResult } from '@snyk/cli-interface/legacy/plugin';
 
 export async function inspect(
   root: string,
   targetFile: string,
   options: types.Options = {},
-): Promise<types.InspectResult> {
+): Promise<MultiProjectResult> {
   if (!targetFile) {
     throw MissingTargetFileError(root);
   }
@@ -16,13 +17,15 @@ export async function inspect(
     targetFile.endsWith('yarn.lock');
 
   const getLockFileDeps = isLockFileBased && !options.traverseNodeModules;
+  const depTree: any = getLockFileDeps
+    ? await lockParser.parse(root, targetFile, options)
+    : await modulesParser.parse(root, targetFile, options);
+
   return {
     plugin: {
       name: 'snyk-nodejs-lockfile-parser',
       runtime: process.version,
     },
-    package: getLockFileDeps
-      ? await lockParser.parse(root, targetFile, options)
-      : await modulesParser.parse(root, targetFile, options),
+    scannedProjects: [{ depTree }],
   };
 }
diff --git a/src/lib/plugins/rubygems/index.ts b/src/lib/plugins/rubygems/index.ts
@@ -24,6 +24,7 @@ export async function inspect(
       name: 'bundled:rubygems',
       runtime: 'unknown',
     },
+    // TODO: must be a depTree!
     package: {
       name: specs.packageName,
       targetFile: specs.targetFile,