Adapt to am_list 0.3

Fixes #103

Author: Gerry Agbobada

dist/index.js

@@ -13,7 +13,6 @@ import * as semver from 'semver'
 // Removing false positive
 // eslint-disable-next-line import/no-unresolved
 import {components} from '@octokit/openapi-types'
-import {difference} from './utils'
 
 const execAsync = promisify(exec)
 
@@ -29,6 +28,27 @@ export type AmFunction = {
   function: string
 }
 
+export type AmLocation = {
+  file: string
+  range: AmRange
+}
+
+export type AmRange = {
+  start: AmPosition
+  end: AmPosition
+}
+
+export type AmPosition = {
+  line: number
+  column: number
+}
+
+export type AmListOutputFunction = {
+  id: AmFunction
+  definition?: AmLocation
+  instrumentation?: AmLocation
+}
+
 export type DataSet = {
   autometricizedFunctions: AmFunction[]
   otherFunctions: AmFunction[]
@@ -136,18 +156,20 @@ export async function computeDataSet(
     `${amList} list -a -l ${language} ${projectRoot}`
   )
 
-  const allFunctions: AmFunction[] = JSON.parse(allFns)
-
-  const {stdout: amFns} = await execAsync(
-    `${amList} list -l ${language} ${projectRoot}`
-  )
-
-  const amFunctions: AmFunction[] = JSON.parse(amFns)
+  const outputFunctions: AmListOutputFunction[] = JSON.parse(allFns)
+  const autometricizedFunctions = []
+  const otherFunctions = []
 
-  const otherFunctions = difference(allFunctions, amFunctions)
+  for (const fn of outputFunctions) {
+    if (fn.instrumentation) {
+      otherFunctions.push({...fn.id})
+    } else {
+      autometricizedFunctions.push({...fn.id})
+    }
+  }
 
   return {
-    autometricizedFunctions: amFunctions,
+    autometricizedFunctions,
     otherFunctions
   }
 }