update to use latest ncm2 api. closes #4 (#7)

* update to use latest ncm2 api. closes #4

* add .tree option

This allows passing in an universal-module-tree, which is useful
when you for example have the files already in memory and don't
want it to look at the file system.

Author: juliangruber

example.js

@@ -5,7 +5,7 @@ const analyze = require('.')
 const prefix = process.env.NS_ENV
   ? `${process.env.NS_ENV}.`
   : ''
-const url = `https://${prefix}api.nodesource.com/ncm2/api/v1`
+const url = `https://${prefix}api.nodesource.com/ncm2/api/v2/graphql`
 
 const dir = process.argv[2] || __dirname
 const token = process.env.NCM_TOKEN

index.js

@@ -6,14 +6,16 @@ const universalModuleTree = require('universal-module-tree')
 
 const analyze = async ({
   dir,
+  tree,
   token,
   pageSize: pageSize = 50,
   concurrency: concurrency = 5,
   onPkgs: onPkgs = () => {},
   filter: filter = () => true,
   url
 }) => {
-  const pkgs = filterPkgs(await readUniversalTree(dir), filter)
+  if (!tree) tree = await readUniversalTree(dir)
+  const pkgs = filterPkgs(tree, filter)
   onPkgs(pkgs)
   let data = new Set()
   const pages = splitSet(pkgs, pageSize)
@@ -49,46 +51,33 @@ const readUniversalTree = async dir => {
 }
 
 const fetchData = async ({ pkgs, token, url }) => {
-  const query = `{
-    ${[...pkgs].map((pkg, i) => `
-      pkg${i}: package(name: "${pkg.name}") {
+  const query = `
+    query getPackageVersions($packageVersions: [PackageVersionInput!]!) {
+      packageVersions(packageVersions: $packageVersions) {
         name
+        version
         published
-        versions(version: "${pkg.version}") {
-          version
-          score
-          publishedAt
-          results {
-            severity
-            pass
-            name
-            test
-            value
-          }
-          vulnerabilities {
-            id,
-            title,
-            semver {
-              vulnerable
-            },
-            severity
-          }
+        publishedAt
+        scores {
+          group
+          name
+          pass
+          severity
+          title
+          data
         }
       }
-    `).join('\n')}
-  }`
-  const res = await graphql({ token, url }, query)
+    }
+  `
+
+  const variables = {
+    packageVersions: [...pkgs].map(({ name, version }) => ({ name, version }))
+  }
+
+  const res = await graphql({ token, url }, query, variables)
   const data = new Set()
-  const values = Object.values(res)
-  for (let i = 0; i < values.length; i++) {
-    const pkg = values[i]
-    const datum = pkg.versions[0]
-    datum.name = pkg.name
-    datum.published = pkg.published
+  for (const [i, datum] of Object.entries(res.packageVersions)) {
     datum.paths = [...pkgs][i].paths
-    for (const result of datum.results) {
-      result.value = JSON.parse(result.value)
-    }
     data.add(datum)
   }
   return data