From b8de2b99f9b2d3b11a1276757ad6b9f7f83ca70b Mon Sep 17 00:00:00 2001 From: Liliana Kastilio Date: Mon, 20 May 2019 17:21:40 +0100 Subject: [PATCH] refactor: comvert module inffo to ts --- src/cli/commands/monitor.ts | 2 +- src/cli/commands/protect/wizard.js | 2 +- src/lib/module-info/{index.js => index.ts} | 12 ++++++------ src/lib/snyk-test/run-test.ts | 2 +- 4 files changed, 9 insertions(+), 9 deletions(-) rename src/lib/module-info/{index.js => index.ts} (65%) diff --git a/src/cli/commands/monitor.ts b/src/cli/commands/monitor.ts index f6b0d19fb5..49296acc17 100644 --- a/src/cli/commands/monitor.ts +++ b/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'; diff --git a/src/cli/commands/protect/wizard.js b/src/cli/commands/protect/wizard.js index 5bd8657c74..7d469503f5 100644 --- a/src/cli/commands/protect/wizard.js +++ b/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 unsupportedPackageManagers = { diff --git a/src/lib/module-info/index.js b/src/lib/module-info/index.ts similarity index 65% rename from src/lib/module-info/index.js rename to src/lib/module-info/index.ts index b93c9c4ed4..dd16b4703a 100644 --- a/src/lib/module-info/index.js +++ b/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); diff --git a/src/lib/snyk-test/run-test.ts b/src/lib/snyk-test/run-test.ts index 2a3d710c63..f7a8ea22ee 100644 --- a/src/lib/snyk-test/run-test.ts +++ b/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('../');