fix: typescriptify request and alerts

src/cli/commands/auth/index.ts

@@ -3,7 +3,7 @@ import * as open from 'opn';
 import * as snyk from '../../../lib';
 import * as config from '../../../lib/config';
 import {isCI} from '../../../lib/is-ci';
-import * as request from '../../../lib/request';
+import request = require('../../../lib/request');
 import * as url from 'url';
 import * as uuid from 'uuid';
 import * as spinner from '../../../lib/spinner';

src/cli/commands/auth/is-authed.ts

@@ -1,6 +1,6 @@
 import * as snyk from '../../../lib';
 import * as config from '../../../lib/config';
-import * as request from '../../../lib/request';
+import request = require('../../../lib/request');
 
 export function isAuthed() {
   const token = snyk.config.get('api');

src/cli/commands/monitor.ts

@@ -11,7 +11,7 @@ import chalk from 'chalk';
 import * as pathUtil from 'path';
 import * as spinner from '../../lib/spinner';
 
-import * as request from '../../lib/request';
+import request = require('../../lib/request');
 import * as detect from '../../lib/detect';
 import * as plugins from '../../lib/plugins';
 import {ModuleInfo} from '../../lib/module-info'; // TODO(kyegupov): fix import

src/lib/alerts.js → src/lib/alerts.ts

@@ -1,8 +1,16 @@
-const chalk = require('chalk');
+import chalk from 'chalk';
 
-const registeredAlerts = [];
+export type AlertType = 'info' | 'warning' | 'error';
 
-function registerAlerts(alerts) {
+export interface Alert {
+  type: AlertType;
+  name: string;
+  msg: string;
+}
+
+const registeredAlerts: Alert[] = [];
+
+function registerAlerts(alerts: Alert[]) {
   if (!alerts) {
     return;
   }
@@ -13,15 +21,8 @@ function registerAlerts(alerts) {
   });
 }
 
-function hasAlert(name) {
-  let alertFound = false;
-  for (let i = 0; i < registeredAlerts.length; i++) {
-    if (registeredAlerts[i].name === name) {
-      alertFound = true;
-      break;
-    }
-  }
-  return alertFound;
+function hasAlert(name: string) {
+  return registeredAlerts.find((a) => a.name === name);
 }
 
 function displayAlerts() {
@@ -39,8 +40,8 @@ function displayAlerts() {
   return res;
 }
 
-module.exports = {
-  registerAlerts: registerAlerts,
-  hasAlert: hasAlert,
-  displayAlerts: displayAlerts,
+export {
+  registerAlerts,
+  hasAlert,
+  displayAlerts,
 };

src/lib/monitor.ts

@@ -2,7 +2,7 @@ import * as Debug from 'debug';
 import * as depGraphLib from '@snyk/dep-graph';
 import * as snyk from '../lib';
 import {apiTokenExists} from './api-token';
-import * as request from './request';
+import request = require('./request');
 import * as config from './config';
 import * as os from 'os';
 import * as _ from 'lodash';

src/lib/request/index.ts

@@ -0,0 +1,22 @@
+import request = require('./request');
+import alerts = require('../alerts');
+
+// A hybrid async function: both returns a promise and takes a callback
+export = async (payload: any, callback?: (err: Error|null, res?, body?) => void) => {
+  try {
+    const result = await request(payload);
+    if (result.body.alerts) {
+      alerts.registerAlerts(result.body.alerts);
+    }
+    // make callbacks and promises work
+    if (callback) {
+      callback(null, result.res, result.body);
+    }
+    return result;
+  } catch (error) {
+    if (callback) {
+      return callback(error);
+    }
+    throw error;
+  }
+};

src/lib/request/request.ts

@@ -17,7 +17,7 @@ const snykDebug = debugModule('snyk');
 
 declare const global: Global;
 
-export = function makeRequest(payload: Payload) {
+export = function makeRequest(payload: Payload): Promise<{res: needle.NeedleResponse, body: any}> {
   return version().then((versionNumber) => (
     new Promise((resolve, reject) => {
       const body = payload.body;

test/alerts.test.ts

@@ -1,7 +1,7 @@
 import {test} from 'tap';
 import alerts = require('../src/lib/alerts');
 
-const exampleAlert = (id, type = 'info') => {
+const exampleAlert = (id, type: alerts.AlertType = 'info') => {
   return {
     msg: 'Example alert ' + id,
     name: 'example-' + id,