Merge pull request #526 from snyk/refactor/module-info

Refactor/module info

src/cli/commands/monitor.ts

@@ -13,7 +13,7 @@ import * as spinner from '../../lib/spinner';
 
 import * as detect from '../../lib/detect';
 import * as plugins from '../../lib/plugins';
-import ModuleInfo = require('../../lib/module-info'); // TODO(kyegupov): fix import
+import {ModuleInfo} from '../../lib/module-info'; // TODO(kyegupov): fix import
 import * as docker from '../../lib/docker-promotion';
 import {SingleDepRootResult, MultiDepRootsResult, isMultiResult, MonitorError } from '../../lib/types';
 

src/cli/commands/protect/wizard.js

@@ -31,7 +31,7 @@ const npm = require('../../../lib/npm');
 const cwd = process.cwd();
 const detect = require('../../../lib/detect');
 const plugins = require('../../../lib/plugins');
-const moduleInfo = require('../../../lib/module-info');
+const moduleInfo = require('../../../lib/module-info').ModuleInfo;
 const {MissingTargetFileError} = require('../../../lib/errors/missing-targetfile-error');
 const pm = require('../../../lib/package-managers');
 

src/lib/module-info/index.js → src/lib/module-info/index.ts

@@ -1,12 +1,12 @@
-var _ = require('lodash');
-const debug = require('debug')('snyk');
+import * as _ from 'lodash';
+import * as Debug from 'debug';
 
-module.exports = ModuleInfo;
+const debug = Debug('snyk-module-info');
 
-function ModuleInfo(plugin, policy) {
+export function ModuleInfo(plugin, policy) {
   return {
-    inspect: async function (root, targetFile, options) {
-      var pluginOptions = _.merge({
+    async inspect(root, targetFile, options) {
+      const pluginOptions = _.merge({
         args: options._doubleDashArgs,
       }, options);
 

src/lib/snyk-test/run-test.ts

@@ -8,7 +8,7 @@ import analytics = require('../analytics');
 import config = require('../config');
 import detect = require('../../lib/detect');
 import plugins = require('../plugins');
-import ModuleInfo = require('../module-info');
+import {ModuleInfo} from '../module-info';
 import {isCI} from '../is-ci';
 import request = require('../request');
 import snyk = require('../');